Much whitespace and capitalization change.

[gnu-emacs] / lisp / replace.el

diff --git a/lisp/replace.el b/lisp/replace.el
index 5976a1bcb91ee58ffe05e4f300c4e541e2f6fccc..97b05cbc80ab2883192c57f10f6673ade61f055e 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -92,7 +92,7 @@ wants to replace FROM with TO."
                 (format "%s: " string))
               nil nil nil
               query-replace-from-history-variable
-              nil t))))
+              nil t t))))
       (if (and (zerop (length from)) lastto lastfrom)
          (cons lastfrom
                (query-replace-compile-replacement lastto regexp-flag))
@@ -156,7 +156,7 @@ the original string if not."
      (read-from-minibuffer
       (format "%s %s with: " string (query-replace-descr from))
       nil nil nil
-      query-replace-to-history-variable from t))
+      query-replace-to-history-variable from t t))
    regexp-flag))
 
 (defun query-replace-read-args (string regexp-flag &optional noerror)
@@ -618,7 +618,7 @@ end of the buffer."
     (define-key map "g" 'revert-buffer)
     (define-key map "q" 'quit-window)
     (define-key map "z" 'kill-this-buffer)
-    (define-key map "\C-c\C-f" 'next-error-follow-mode)
+    (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     map)
   "Keymap for `occur-mode'.")
 
@@ -1393,7 +1393,9 @@ make, or the user didn't cancel the call."
                  ;; Bind message-log-max so we don't fill up the message log
                  ;; with a bunch of identical messages.
                  (let ((message-log-max nil))
-                   (message message from-string next-replacement))
+                   (message message
+                             (query-replace-descr from-string)
+                             (query-replace-descr next-replacement)))
                  (setq key (read-event))
                  ;; Necessary in case something happens during read-event
                  ;; that clobbers the match data.