changeset 7258:68c7b93914fe

(perform-replace): Call substitute-command-keys just once and only if querying.
author Richard M. Stallman <rms@gnu.org>
date Sun, 01 May 1994 22:56:54 +0000
parents 3759ad84023b
children 5a03fc943b38
files lisp/replace.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/replace.el	Sun May 01 22:09:01 1994 +0000
+++ b/lisp/replace.el	Sun May 01 22:56:54 1994 +0000
@@ -467,7 +467,11 @@
 	(next-rotate-count 0)
 	(replace-count 0)
 	(lastrepl nil)			;Position after last match considered.
-	(match-again t))
+	(match-again t)
+	(message
+	 (if query-flag
+	     (substitute-command-keys
+	      "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) "))))
     (if (stringp replacements)
 	(setq next-replacement replacements)
       (or repeat-count (setq repeat-count 1)))
@@ -525,9 +529,7 @@
 	      ;; which means it has finished handling this occurrence.
 	      (while (not done)
 		(replace-highlight (match-beginning 0) (match-end 0))
-		(message (substitute-command-keys
-			  "Query replacing %s with %s: (\\<query-replace-map>\\[help] for help) ")
-			 from-string next-replacement)
+		(message message from-string next-replacement)
 		(setq key (read-event))
 		(setq key (vector key))
 		(setq def (lookup-key map key))