Fix isearch handling of C-u C-u...

* lisp/isearch.el: Add `isearch-scroll' property to
universal-argument-more so that `isearch-allow-scroll' will apply to it
as well.
(isearch-pre-command-hook): Let `isearch-allow-prefix' apply to
`universal-argument-more' as well (Bug#25302).

diff --git a/lisp/isearch.el b/lisp/isearch.el
index b890cc49c0d02f8482da69e6b391cdea09ff5243..5c48c30daa9b307f6f247c84be5ae7087ac838f5 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2297,6 +2297,7 @@ to the barrier."
 
 ;; Universal argument commands
 (put 'universal-argument 'isearch-scroll t)
+(put 'universal-argument-more 'isearch-scroll t)
 (put 'negative-argument 'isearch-scroll t)
 (put 'digit-argument 'isearch-scroll t)
 
@@ -2389,7 +2390,7 @@ before the command is executed globally with terminated Isearch."
       (setq this-command 'isearch-edit-string))
      ;; Handle a scrolling function or prefix argument.
      ((or (and isearch-allow-prefix
-              (memq this-command '(universal-argument
+               (memq this-command '(universal-argument universal-argument-more
                                    digit-argument negative-argument)))
          (and isearch-allow-scroll
               (symbolp this-command)