(while): Comment out converter.

[gnu-emacs] / lisp / replace.el

diff --git a/lisp/replace.el b/lisp/replace.el
index a3e2f03a5faf536461ba122d62839cb24af6637c..49f3920dded301a6b7b34f5b434eef9a58e1ea20 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -152,7 +152,7 @@ which will run faster and will not set the mark or print anything."
 A match split across lines preserves all the lines it lies in.
 Applies to all lines after point."
   (interactive (list (read-from-minibuffer
-                     "sKeep lines (containing match for regexp): "
+                     "Keep lines (containing match for regexp): "
                      nil nil nil 'regexp-history)))
   (save-excursion
     (or (bolp) (forward-line 1))
@@ -179,7 +179,7 @@ Applies to all lines after point."
 If a match is split across lines, all the lines it lies in are deleted.
 Applies to lines after point."
   (interactive (list (read-from-minibuffer
-                     "sFlush lines (containing match for regexp): "
+                     "Flush lines (containing match for regexp): "
                      nil nil nil 'regexp-history)))
   (save-excursion
     (while (and (not (eobp))
@@ -193,7 +193,7 @@ Applies to lines after point."
 (defun how-many (regexp)
   "Print number of matches for REGEXP following point."
   (interactive (list (read-from-minibuffer
-                     "sHow many matches for (regexp): "
+                     "How many matches for (regexp): "
                      nil nil nil 'regexp-history)))
   (let ((count 0) opoint)
     (save-excursion
@@ -393,7 +393,10 @@ The valid answers include `act', `skip', `act-and-show',
 (define-key query-replace-map "n" 'skip)
 (define-key query-replace-map "," 'act-and-show)
 (define-key query-replace-map "\e" 'exit)
+(define-key query-replace-map [escape] 'exit)
 (define-key query-replace-map "q" 'exit)
+(define-key query-replace-map "\r" 'exit)
+(define-key query-replace-map [return] 'exit)
 (define-key query-replace-map "." 'act-and-exit)
 (define-key query-replace-map "\C-r" 'edit)
 (define-key query-replace-map "\C-w" 'delete-and-edit)