[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 149acb9 07/24: Improve documentation and argument names of
From: |
Michael Heerdegen |
Subject: |
[elpa] master 149acb9 07/24: Improve documentation and argument names of el-search-query-replace |
Date: |
Thu, 19 May 2016 20:46:37 +0000 (UTC) |
branch: master
commit 149acb9fc154d61f8536a395947db1a5ef65dc4b
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
Improve documentation and argument names of el-search-query-replace
---
packages/el-search/el-search.el | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index 9f115e0..f0d7416 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -1023,19 +1023,26 @@ Hit any key to proceed."
(defun el-search-query-replace-read-args ()
(barf-if-buffer-read-only)
- (let* ((from (el-search--read-pattern "Replace from: "))
+ (let* ((from (el-search--read-pattern "Query replace pattern: "))
(to (let ((el-search--initial-mb-contents nil))
(el-search--read-pattern "Replace with result of evaluation
of: " from))))
(list (el-search--wrap-pattern (read from)) (read to) to)))
;;;###autoload
-(defun el-search-query-replace (from to &optional to-input-string)
- "Replace some occurrences of FROM pattern with evaluated TO."
+(defun el-search-query-replace (from-pattern to-expr &optional textual-to)
+ "Replace some matches of \"el-search\" pattern FROM-PATTERN.
+
+TO-EXPR is an Elisp expression that is evaluated repeatedly for
+each match with bindings created in FROM-PATTERN in effect to
+produce a replacement expression.
+
+As each match is found, the user must type a character saying
+what to do with it. For directions, type ? at that time."
(interactive (el-search-query-replace-read-args))
(setq this-command 'el-search-query-replace) ;in case we come from isearch
- (setq el-search-current-pattern from)
+ (setq el-search-current-pattern from-pattern)
(barf-if-buffer-read-only)
- (el-search-search-and-replace-pattern from to nil to-input-string))
+ (el-search-search-and-replace-pattern from-pattern to-expr nil textual-to))
(defun el-search--take-over-from-isearch (&optional goto-left-end)
(let ((other-end (and goto-left-end isearch-other-end))
- [elpa] master updated (24ce066 -> c835174), Michael Heerdegen, 2016/05/19
- [elpa] master f9980f6 05/24: Replacing: make C-g an alternative key for quitting, Michael Heerdegen, 2016/05/19
- [elpa] master f178717 12/24: Clarify the operation scope of replacing, Michael Heerdegen, 2016/05/19
- [elpa] master 91192f5 10/24: Add patterns for character properties, Michael Heerdegen, 2016/05/19
- [elpa] master 246e1ff 17/24: Small fix in el-search--setup-minibuffer, Michael Heerdegen, 2016/05/19
- [elpa] master 098582b 20/24: Reduce duration of a `sit-for', Michael Heerdegen, 2016/05/19
- [elpa] master 01e5bcd 22/24: Clean up el-search-read-expression-map; add some doc, Michael Heerdegen, 2016/05/19
- [elpa] master 0b9fe9c 23/24: Set initial input for replace when coming from el-search-pattern, Michael Heerdegen, 2016/05/19
- [elpa] master c0d9ca7 14/24: Make el-search-pattern accept an optional NO-ERROR arg, Michael Heerdegen, 2016/05/19
- [elpa] master 41fc28b 01/24: New user option: el-search-use-sloppy-strings, Michael Heerdegen, 2016/05/19
- [elpa] master 149acb9 07/24: Improve documentation and argument names of el-search-query-replace,
Michael Heerdegen <=
- [elpa] master 3d0a12e 13/24: Fix el-search--ensure-sexp-start error at bob, Michael Heerdegen, 2016/05/19
- [elpa] master 03dd4e7 06/24: Comment and whitespace changes only, Michael Heerdegen, 2016/05/19
- [elpa] master b885ef1 03/24: el-search--check-pattern-args: make arg TYPE a string, Michael Heerdegen, 2016/05/19
- [elpa] master 3d72d1d 11/24: Address compiler warnings, Michael Heerdegen, 2016/05/19
- [elpa] master 536fab6 15/24: Give el-search--s a more meaningful name, Michael Heerdegen, 2016/05/19
- [elpa] master 4b11cb8 09/24: Rename two functions, Michael Heerdegen, 2016/05/19
- [elpa] master 8d7b29c 21/24: Make sure not to lose the minibuffer-prompt face, Michael Heerdegen, 2016/05/19
- [elpa] master c356b2d 19/24: Rename a local variable, Michael Heerdegen, 2016/05/19
- [elpa] master bb98a1d 04/24: Rewrite replacement layout restoration, Michael Heerdegen, 2016/05/19
- [elpa] master 5f9accc 18/24: Make query-replace accept FROM -> TO style input, Michael Heerdegen, 2016/05/19