(query-replace, query-replace-regexp)

(replace-string, replace-regexp): When operating on region, make
the minibuffer prompt say so.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 547ccce92929a4a8770b0f9b11ea39cc5f8b8a9d..dea9dea526c7bc2e34b9e97d909e1368d2ba487d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-02-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * replace.el (query-replace, query-replace-regexp)
+       (replace-string, replace-regexp): When operating on region, make
+       the minibuffer prompt say so.
+
        * isearch.el (isearch-forward): Document isearch-query-replace and
        isearch-query-replace-regexp keybindings.
        

diff --git a/lisp/replace.el b/lisp/replace.el
index eb9f592f01dd56b0d5893833007ee604dea0ac74..2c60cd006f143600727aa4850bb8f256596f54e0 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -217,7 +217,11 @@ Fourth and fifth arg START and END specify the region to operate on.
 
 To customize possible responses, change the \"bindings\" in `query-replace-map'."
   (interactive (let ((common
-                     (query-replace-read-args "Query replace" nil)))
+                     (query-replace-read-args 
+                      (if (and transient-mark-mode mark-active)
+                        "Query replace in region"
+                        "Query replace")
+                        nil)))
                 (list (nth 0 common) (nth 1 common) (nth 2 common)
                       ;; These are done separately here
                       ;; so that command-history will record these expressions
@@ -277,7 +281,11 @@ text, TO-STRING is actually made a list instead of a string.
 Use \\[repeat-complex-command] after this command for details."
   (interactive
    (let ((common
-         (query-replace-read-args "Query replace regexp" t)))
+         (query-replace-read-args 
+          (if (and transient-mark-mode mark-active)
+              "Query replace regexp in region"
+            "Query replace regexp")
+          t)))
      (list (nth 0 common) (nth 1 common) (nth 2 common)
           ;; These are done separately here
           ;; so that command-history will record these expressions
@@ -423,7 +431,11 @@ which will run faster and will not set the mark or print anything.
 and TO-STRING is also null.)"
   (interactive
    (let ((common
-         (query-replace-read-args "Replace string" nil)))
+         (query-replace-read-args 
+          (if (and transient-mark-mode mark-active)
+              "Replace string in region"
+            "Replace string")
+          nil)))
      (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
               (region-beginning))
@@ -477,7 +489,11 @@ What you probably want is a loop like this:
 which will run faster and will not set the mark or print anything."
   (interactive
    (let ((common
-         (query-replace-read-args "Replace regexp" t)))
+         (query-replace-read-args 
+          (if (and transient-mark-mode mark-active)
+              "Replace regexp in region" 
+            "Replace regexp") 
+          t)))
      (list (nth 0 common) (nth 1 common) (nth 2 common)
           (if (and transient-mark-mode mark-active)
               (region-beginning))