From: Stefan Monnier Date: Sat, 12 Oct 2013 01:10:25 +0000 (-0400) Subject: * lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1284^2~12 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b12c797ae831037abaa8470a394fa26edeadb64;p=emacs.git * lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about internals of universal-argument. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3de056a26d3..20271be89b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-10-12 Stefan Monnier + + * isearch.el (isearch-pre-command-hook): Don't build in knowledge about + internals of universal-argument. + 2013-10-11 Eli Zaretskii * menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit. diff --git a/lisp/isearch.el b/lisp/isearch.el index 9a1729ac7e6..3abb03a084a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -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)