(query-replace-map): Don't bind ESC.

(query-replace-help): Changed accordingly.

diff --git a/lisp/replace.el b/lisp/replace.el
index 2678e20c26d737d3e36f2c5962fa877940190b5c..ad0c17246081378da4458e62f2a16f50fa542f7d 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -374,7 +374,7 @@ It serves as a menu to find any of the occurrences in this buffer.
 ;; to make that display both SPC and Y.
 (defconst query-replace-help
   "Type Space or `y' to replace one match, Delete or `n' to skip to next,
-ESC or `q' to exit, Period to replace one match and exit,
+RET or `q' to exit, Period to replace one match and exit,
 Comma to replace but not move point immediately,
 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again),
 C-w to delete match and recursive edit,
@@ -397,8 +397,6 @@ The valid answers include `act', `skip', `act-and-show',
 (define-key query-replace-map "y" 'act)
 (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)