[Emacs-diffs] trunk r114633: * lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about

[Stefan Monnier]

------------------------------------------------------------
revno: 114633
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-11 21:10:25 -0400
message:
  * lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about
  internals of universal-argument.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/isearch.el                isearch.el-20091113204419-o5vbwnq5f7feedwu-486

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-11 18:20:08 +0000
+++ b/lisp/ChangeLog    2013-10-12 01:10:25 +0000
@@ -1,3 +1,8 @@
+2013-10-12  Stefan Monnier  <address@hidden>
+
+       * isearch.el (isearch-pre-command-hook): Don't build in knowledge about
+       internals of universal-argument.
+
 2013-10-11  Eli Zaretskii  <address@hidden>
 
        * menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit.

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2013-10-09 23:52:46 +0000
+++ b/lisp/isearch.el   2013-10-12 01:10:25 +0000
@@ -2233,6 +2233,9 @@
   (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 @@
      ;; 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)