* 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 3de056a26d3556b3d1d4e31c3b314f4332eed1a1..20271be89b0aad06b137ede410e5fb7465f48517 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 9a1729ac7e6c2ff1e6821b0079300324320a9fc5..3abb03a084a0e24e6946f1db1896278a1bff08c9 100644 (file)
--- 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)