Commit 1b12c797 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about

internals of universal-argument.
parent 55ee77a3
2013-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* isearch.el (isearch-pre-command-hook): Don't build in knowledge about
internals of universal-argument.
2013-10-11 Eli Zaretskii <eliz@gnu.org>
* menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit.
......
......@@ -2233,6 +2233,9 @@ before the command is executed globally with terminated Isearch."
(let* ((key (this-single-command-keys))
(main-event (aref key 0)))
(cond
;; Don't exit Isearch if we're in the middle of some
;; set-temporary-overlay-map thingy like universal-argument--mode.
((not (eq overriding-terminal-local-map isearch-mode-map)))
;; Don't exit Isearch for isearch key bindings.
((commandp (lookup-key isearch-mode-map key nil)))
;; Optionally edit the search string instead of exiting.
......@@ -2241,8 +2244,6 @@ before the command is executed globally with terminated Isearch."
;; Handle a scrolling function or prefix argument.
((or (and isearch-allow-prefix
(memq this-command '(universal-argument
universal-argument-more
universal-argument-minus
digit-argument negative-argument)))
(and isearch-allow-scroll
(or (eq (get this-command 'isearch-scroll) t)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment