aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-12-12 22:06:30 +0000
committerJuri Linkov2004-12-12 22:06:30 +0000
commit15fd7d5da5b7001337c87edd795c747e61894a81 (patch)
tree3eddf27a3b991a03b462f0d40d33f2c0e2ffef7b
parent98e008e989666a119f20fb43da0fdc13f5dbc53e (diff)
downloademacs-15fd7d5da5b7001337c87edd795c747e61894a81.tar.gz
emacs-15fd7d5da5b7001337c87edd795c747e61894a81.zip
(replace-match-maybe-edit): Doc fix.
(perform-replace): Don't call `replace-highlight' when automatic replacement is requested in literal mode, since it is intended only to highlight words during entering a new replacement string for \? in non-literal mode.
-rw-r--r--lisp/replace.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index 8a5c0a9680c..933a0004ce2 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1214,7 +1214,7 @@ but coerced to the correct value of INTEGERS."
1214 1214
1215(defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data) 1215(defun replace-match-maybe-edit (newtext fixedcase literal noedit match-data)
1216 "Make a replacement with `replace-match', editing `\\?'. 1216 "Make a replacement with `replace-match', editing `\\?'.
1217NEXTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no 1217NEWTEXT, FIXEDCASE, LITERAL are just passed on. If NOEDIT is true, no
1218check for `\\?' is made to save time. MATCH-DATA is used for the 1218check for `\\?' is made to save time. MATCH-DATA is used for the
1219replacement. In case editing is done, it is changed to use markers. 1219replacement. In case editing is done, it is changed to use markers.
1220 1220
@@ -1380,7 +1380,7 @@ make, or the user didn't cancel the call."
1380 (if (not query-flag) 1380 (if (not query-flag)
1381 (let ((inhibit-read-only 1381 (let ((inhibit-read-only
1382 query-replace-skip-read-only)) 1382 query-replace-skip-read-only))
1383 (unless noedit 1383 (unless (or literal noedit)
1384 (replace-highlight (nth 0 real-match-data) 1384 (replace-highlight (nth 0 real-match-data)
1385 (nth 1 real-match-data))) 1385 (nth 1 real-match-data)))
1386 (setq noedit 1386 (setq noedit