mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 18:37:33 +00:00
(query-replace-map): Define \e and escape as exit-prefix.
(perform-replace): When exiting and rereading, set this-command to mode-exit.
This commit is contained in:
parent
5b3dd5e8b8
commit
d9121bc0e6
1 changed files with 7 additions and 1 deletions
|
|
@ -446,7 +446,7 @@ C-l to clear the screen, redisplay, and offer same replacement again,
|
|||
The \"bindings\" in this map are not commands; they are answers.
|
||||
The valid answers include `act', `skip', `act-and-show',
|
||||
`exit', `act-and-exit', `edit', `delete-and-edit', `recenter',
|
||||
`automatic', `backup', and `help'.")
|
||||
`automatic', `backup', `exit-prefix', and `help'.")
|
||||
|
||||
(define-key query-replace-map " " 'act)
|
||||
(define-key query-replace-map "\d" 'skip)
|
||||
|
|
@ -470,6 +470,8 @@ The valid answers include `act', `skip', `act-and-show',
|
|||
(define-key query-replace-map "?" 'help)
|
||||
(define-key query-replace-map "\C-g" 'quit)
|
||||
(define-key query-replace-map "\C-]" 'quit)
|
||||
(define-key query-replace-map "\e" 'exit-prefix)
|
||||
(define-key query-replace-map [escape] 'exit-prefix)
|
||||
|
||||
(defun perform-replace (from-string replacements
|
||||
query-flag regexp-flag delimited-flag
|
||||
|
|
@ -626,7 +628,11 @@ which will run faster and probably do exactly what you want."
|
|||
(prog1 (match-data)
|
||||
(save-excursion (recursive-edit))))
|
||||
(setq replaced t))
|
||||
;; Note: we do not need to treat `exit-prefix'
|
||||
;; specially here, since we reread
|
||||
;; any unrecognized character.
|
||||
(t
|
||||
(setq this-command 'mode-exited)
|
||||
(setq keep-going nil)
|
||||
(setq unread-command-events
|
||||
(append (listify-key-sequence key)
|
||||
|
|
|
|||
Loading…
Reference in a new issue