diff options
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 610fd9d2e9f..12a99d72b9b 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1,7 +1,7 @@ ;;; replace.el --- replace commands for Emacs ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001, -;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Maintainer: FSF @@ -467,10 +467,9 @@ at the given position for each replacement. In interactive calls, the replacement text may contain `\\,' followed by a Lisp expression used as part of the replacement text. Inside of that expression, `\\&' is a string denoting the -whole match, `\\N' a partial matches, `\\#&' and `\\#N' the -respective numeric values from `string-to-number', and `\\#' -itself for `replace-count', the number of replacements occured so -far. +whole match, `\\N' a partial match, `\\#&' and `\\#N' the respective +numeric values from `string-to-number', and `\\#' itself for +`replace-count', the number of replacements occurred so far. If your Lisp expression is an identifier and the next letter in the replacement string would be interpreted as part of it, you @@ -1407,6 +1406,8 @@ make, or the user didn't cancel the call." (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) @@ -1518,8 +1519,7 @@ make, or the user didn't cancel the call." (set-match-data real-match-data) (setq next-replacement (funcall (car replacements) (cdr replacements) - replace-count) - noedit nil)) + replace-count))) (if (not query-flag) (let ((inhibit-read-only query-replace-skip-read-only)) |