1 files changed, 25 insertions, 6 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index de3577913c1..2c60cd006f1 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -115,8 +115,11 @@ wants to replace FROM with TO."
                query-replace-from-history-variable
                nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
-          (cons lastfrom
-                (query-replace-compile-replacement lastto regexp-flag))
+          (progn
+            (cons lastfrom
+                  (query-replace-compile-replacement lastto regexp-flag))
+            (set query-replace-from-history-variable
+                 (cdr (symbol-value query-replace-from-history-variable))))
         ;; Warn if user types \n or \t, but don't reject the input.
         (and regexp-flag
              (string-match "\\(\\`\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\[nt]\\)" from)
@@ -214,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
@@ -274,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
@@ -420,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))
@@ -474,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))