[Emacs-diffs] Changes to emacs/lisp/replace.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/01/12 22:32:47

Index: replace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/replace.el,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- replace.el  7 Jan 2007 18:43:16 -0000       1.246
+++ replace.el  12 Jan 2007 22:32:46 -0000      1.247
@@ -1406,6 +1406,8 @@
        (search-string from-string)
        (real-match-data nil)           ; the match data for the current match
        (next-replacement nil)
+       ;; This is non-nil if we know there is nothing for the user
+       ;; to edit in the replacement.
        (noedit nil)
        (keep-going t)
        (stack nil)
@@ -1517,8 +1519,7 @@
              (set-match-data real-match-data)
              (setq next-replacement
                    (funcall (car replacements) (cdr replacements)
-                            replace-count)
-                   noedit nil))
+                            replace-count) nil))
            (if (not query-flag)
                (let ((inhibit-read-only
                       query-replace-skip-read-only))