Merge from trunk

1 files changed, 102 insertions, 91 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 001f7d1a78d..e714015fccf 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -62,6 +62,10 @@ no default value.")
 (defvar query-replace-interactive nil
   "Non-nil means `query-replace' uses the last search string.
 That becomes the \"string to replace\".")
+(make-obsolete-variable 'query-replace-interactive
+                        "use `M-n' to pull the last incremental search string
+to the minibuffer that reads the string to replace, or invoke replacements
+from Isearch by using a key sequence like `C-s C-s M-%'." "24.3")
 
 (defcustom query-replace-from-history-variable 'query-replace-history
   "History list to use for the FROM argument of `query-replace' commands.
@@ -128,20 +132,22 @@ wants to replace FROM with TO."
   (if query-replace-interactive
       (car (if regexp-flag regexp-search-ring search-ring))
     (let* ((history-add-new-input nil)
+           (prompt
+            (if query-replace-defaults
+                (format "%s (default %s -> %s): " prompt
+                        (query-replace-descr (car query-replace-defaults))
+                        (query-replace-descr (cdr query-replace-defaults)))
+              (format "%s: " prompt)))
            (from
             ;; The save-excursion here is in case the user marks and copies
             ;; a region in order to specify the minibuffer input.
             ;; That should not clobber the region for the query-replace itself.
             (save-excursion
-              (read-from-minibuffer
-               (if query-replace-defaults
-                   (format "%s (default %s -> %s): " prompt
-                           (query-replace-descr (car query-replace-defaults))
-                           (query-replace-descr (cdr query-replace-defaults)))
-                 (format "%s: " prompt))
-               nil nil nil
-               query-replace-from-history-variable
-               nil t))))
+              (if regexp-flag
+                  (read-regexp prompt nil query-replace-from-history-variable)
+                (read-from-minibuffer
+                 prompt nil nil nil query-replace-from-history-variable
+                 (car (if regexp-flag regexp-search-ring search-ring)) t)))))
       (if (and (zerop (length from)) query-replace-defaults)
           (cons (car query-replace-defaults)
                 (query-replace-compile-replacement
@@ -230,9 +236,11 @@ what to do with it.  For directions, type \\[help-command] at that time.
 In Transient Mark mode, if the mark is active, operate on the contents
 of the region.  Otherwise, operate from point to the end of the buffer.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-string is used as FROM-STRING--you don't have to specify it with the
-minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search string to the minibuffer
+that reads FROM-STRING, or invoke replacements from
+incremental search with a key sequence like `C-s C-s M-%'
+to use its current search string as the string to replace.
 
 Matching is independent of case if `case-fold-search' is non-nil and
 FROM-STRING has no uppercase letters.  Replacement transfers the case
@@ -278,9 +286,11 @@ what to do with it.  For directions, type \\[help-command] at that time.
 In Transient Mark mode, if the mark is active, operate on the contents
 of the region.  Otherwise, operate from point to the end of the buffer.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-regexp is used as REGEXP--you don't have to specify it with the
-minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search regexp to the minibuffer
+that reads REGEXP, or invoke replacements from
+incremental search with a key sequence like `C-M-s C-M-s C-M-%'
+to use its current search regexp as the regexp to replace.
 
 Matching is independent of case if `case-fold-search' is non-nil and
 REGEXP has no uppercase letters.  Replacement transfers the case
@@ -363,9 +373,9 @@ In interactive use, `\\#' in itself stands for `replace-count'.
 In Transient Mark mode, if the mark is active, operate on the contents
 of the region.  Otherwise, operate from point to the end of the buffer.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-regexp is used as REGEXP--you don't have to specify it with the
-minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search regexp to the minibuffer
+that reads REGEXP.
 
 Preserves case in each replacement if `case-replace' and `case-fold-search'
 are non-nil and REGEXP has no uppercase letters.
@@ -377,35 +387,33 @@ regexp in `search-whitespace-regexp'.
 Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
 only matches that are surrounded by word boundaries.
 Fourth and fifth arg START and END specify the region to operate on."
+  (declare (obsolete "use the `\\,' feature of `query-replace-regexp'
+for interactive calls, and `search-forward-regexp'/`replace-match'
+for Lisp calls." "22.1"))
   (interactive
    (progn
-   (barf-if-buffer-read-only)
-   (let* ((from
-           ;; Let-bind the history var to disable the "foo -> bar" default.
-           ;; Maybe we shouldn't disable this default, but for now I'll
-           ;; leave it off.  --Stef
-           (let ((query-replace-to-history-variable nil))
-             (query-replace-read-from "Query replace regexp" t)))
-          (to (list (read-from-minibuffer
-                     (format "Query replace regexp %s with eval: "
-                             (query-replace-descr from))
-                     nil nil t query-replace-to-history-variable from t))))
-     ;; We make TO a list because replace-match-string-symbols requires one,
-     ;; and the user might enter a single token.
-     (replace-match-string-symbols to)
-     (list from (car to) current-prefix-arg
-           (if (and transient-mark-mode mark-active)
-               (region-beginning))
-           (if (and transient-mark-mode mark-active)
-               (region-end))))))
+     (barf-if-buffer-read-only)
+     (let* ((from
+             ;; Let-bind the history var to disable the "foo -> bar"
+             ;; default.  Maybe we shouldn't disable this default, but
+             ;; for now I'll leave it off.  --Stef
+             (let ((query-replace-to-history-variable nil))
+               (query-replace-read-from "Query replace regexp" t)))
+            (to (list (read-from-minibuffer
+                       (format "Query replace regexp %s with eval: "
+                               (query-replace-descr from))
+                       nil nil t query-replace-to-history-variable from t))))
+       ;; We make TO a list because replace-match-string-symbols requires one,
+       ;; and the user might enter a single token.
+       (replace-match-string-symbols to)
+       (list from (car to) current-prefix-arg
+             (if (and transient-mark-mode mark-active)
+                 (region-beginning))
+             (if (and transient-mark-mode mark-active)
+                 (region-end))))))
   (perform-replace regexp (cons 'replace-eval-replacement to-expr)
                    t 'literal delimited nil nil start end))
 
-(make-obsolete 'query-replace-regexp-eval
-  "for interactive use, use the special `\\,' feature of
-`query-replace-regexp' instead.  Non-interactively, a loop
-using `search-forward-regexp' and `replace-match' is preferred." "22.1")
-
 (defun map-query-replace-regexp (regexp to-strings &optional n start end)
   "Replace some matches for REGEXP with various strings, in rotation.
 The second argument TO-STRINGS contains the replacement strings, separated
@@ -418,19 +426,16 @@ of the region.  Otherwise, operate from point to the end of the buffer.
 
 Non-interactively, TO-STRINGS may be a list of replacement strings.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-regexp is used as REGEXP--you don't have to specify it with the minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search regexp to the minibuffer
+that reads REGEXP.
 
 A prefix argument N says to use each replacement string N times
 before rotating to the next.
 Fourth and fifth arg START and END specify the region to operate on."
   (interactive
-   (let* ((from (if query-replace-interactive
-                    (car regexp-search-ring)
-                  (read-from-minibuffer "Map query replace (regexp): "
-                                        nil nil nil
-                                        query-replace-from-history-variable
-                                        nil t)))
+   (let* ((from (read-regexp "Map query replace (regexp): " nil
+                             query-replace-from-history-variable))
           (to (read-from-minibuffer
                (format "Query replace %s with (space-separated strings): "
                        (query-replace-descr from))
@@ -476,9 +481,9 @@ Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
 only matches surrounded by word boundaries.
 Fourth and fifth arg START and END specify the region to operate on.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-string is used as FROM-STRING--you don't have to specify it with the
-minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search string to the minibuffer
+that reads FROM-STRING.
 
 This function is usually the wrong thing to use in a Lisp program.
 What you probably want is a loop like this:
@@ -541,8 +546,9 @@ When using those Lisp features interactively in the replacement
 text, TO-STRING is actually made a list instead of a string.
 Use \\[repeat-complex-command] after this command for details.
 
-If `query-replace-interactive' is non-nil, the last incremental search
-regexp is used as REGEXP--you don't have to specify it with the minibuffer.
+Use \\<minibuffer-local-map>\\[next-history-element] \
+to pull the last incremental search regexp to the minibuffer
+that reads REGEXP.
 
 This function is usually the wrong thing to use in a Lisp program.
 What you probably want is a loop like this:
@@ -574,38 +580,47 @@ of `history-length', which see.")
 (defvar occur-collect-regexp-history '("\\1")
   "History of regexp for occur's collect operation")
 
-(defun read-regexp (prompt &optional default-value)
-  "Read regexp as a string using the regexp history and some useful defaults.
-Prompt for a regular expression with PROMPT (without a colon and
-space) in the minibuffer.  The optional argument DEFAULT-VALUE
-provides the value to display in the minibuffer prompt that is
-returned if the user just types RET.
-Values available via M-n are the string at point, the last isearch
-regexp, the last isearch string, and the last replacement regexp."
-  (let* ((defaults
-           (list (regexp-quote
-                  (or (funcall (or find-tag-default-function
-                                   (get major-mode 'find-tag-default-function)
-                                   'find-tag-default))
-                      ""))
-                 (car regexp-search-ring)
-                 (regexp-quote (or (car search-ring) ""))
-                 (car (symbol-value
-                       query-replace-from-history-variable))))
+(defun read-regexp (prompt &optional defaults history)
+  "Read and return a regular expression as a string.
+When PROMPT doesn't end with a colon and space, it adds a final \": \".
+If DEFAULTS is non-nil, it displays the first default in the prompt.
+
+Non-nil optional arg DEFAULTS is a string or a list of strings that
+are prepended to a list of standard default values, which include the
+string at point, the last isearch regexp, the last isearch string, and
+the last replacement regexp.
+
+Non-nil HISTORY is a symbol to use for the history list.
+If HISTORY is nil, `regexp-history' is used."
+  (let* ((default (if (consp defaults) (car defaults) defaults))
+         (defaults
+           (append
+            (if (listp defaults) defaults (list defaults))
+            (list (regexp-quote
+                   (or (funcall (or find-tag-default-function
+                                    (get major-mode 'find-tag-default-function)
+                                    'find-tag-default))
+                       ""))
+                  (car regexp-search-ring)
+                  (regexp-quote (or (car search-ring) ""))
+                  (car (symbol-value
+                        query-replace-from-history-variable)))))
          (defaults (delete-dups (delq nil (delete "" defaults))))
-         ;; Don't add automatically the car of defaults for empty input
+         ;; Do not automatically add default to the history for empty input.
          (history-add-new-input nil)
-         (input
-          (read-from-minibuffer
-           (if default-value
-               (format "%s (default %s): " prompt
-                       (query-replace-descr default-value))
-             (format "%s: " prompt))
-           nil nil nil 'regexp-history defaults t)))
+         (input (read-from-minibuffer
+                 (cond ((string-match-p ":[ \t]*\\'" prompt)
+                        prompt)
+                       (default
+                         (format "%s (default %s): " prompt
+                                 (query-replace-descr default)))
+                       (t
+                        (format "%s: " prompt)))
+                 nil nil nil (or history 'regexp-history) defaults t)))
     (if (equal input "")
-        (or default-value input)
+        (or default input)
       (prog1 input
-        (add-to-history 'regexp-history input)))))
+        (add-to-history (or history 'regexp-history) input)))))
 
 
 (defalias 'delete-non-matching-lines 'keep-lines)
@@ -1130,9 +1145,9 @@ which means to discard all text properties."
                   "\\&"
                 ;; Get the regexp for collection pattern.
                 (let ((default (car occur-collect-regexp-history)))
-                  (read-string
+                  (read-regexp
                    (format "Regexp to collect (default %s): " default)
-                   nil 'occur-collect-regexp-history default)))
+                   default 'occur-collect-regexp-history)))
             ;; Otherwise normal occur takes numerical prefix argument.
             (when current-prefix-arg
               (prefix-numeric-value current-prefix-arg))))))
@@ -1219,14 +1234,10 @@ See also `multi-occur'."
    (cons
     (let* ((default (car regexp-history))
            (input
-            (read-from-minibuffer
+            (read-regexp
              (if current-prefix-arg
                  "List lines in buffers whose names match regexp: "
-               "List lines in buffers whose filenames match regexp: ")
-             nil
-             nil
-             nil
-             'regexp-history)))
+               "List lines in buffers whose filenames match regexp: "))))
       (if (equal input "")
           default
         input))