[Emacs-diffs] /srv/bzr/emacs/trunk r105664: isearch.el (isearch-other-meta-char): Wherever a key list is unread,

[Alan Mackenzie]

------------------------------------------------------------
revno: 105664
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-06 01:01:46 +0000
message:
  isearch.el (isearch-other-meta-char): Wherever a key list is unread,
  "unread" the prefix arg, too.  This fixes bug #8901.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-05 09:55:11 +0000
+++ b/lisp/ChangeLog    2011-09-06 01:01:46 +0000
@@ -1,3 +1,8 @@
+2011-09-06  Alan Mackenzie  <address@hidden>
+
+       * isearch.el (isearch-other-meta-char): Wherever a key list is
+       unread, "unread" the prefix arg, too.  This fixes bug #8901.
+
 2011-09-05  Oleksandr Gavenko  <address@hidden>  (tiny change)
 
        * progmodes/grep.el (rgrep): Add "-type d" (bug#9414).

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-08-29 20:22:44 +0000
+++ b/lisp/isearch.el   2011-09-06 01:01:46 +0000
@@ -1920,6 +1920,7 @@
           (if (lookup-key global-map key)
               (progn
                 (isearch-done)
+                (setq prefix-arg arg)
                 (apply 'isearch-unread keylist))
             (setq keylist
                   (listify-key-sequence (lookup-key local-function-key-map 
key)))
@@ -1935,6 +1936,7 @@
                     (setq keylist (cdr keylist)))
                 ;; As the remaining keys in KEYLIST can't be handled
                 ;; here, we must reread them.
+                (setq prefix-arg arg)
                 (apply 'isearch-unread keylist)
                 (setq keylist nil)))))
          (
@@ -1957,8 +1959,10 @@
                               isearch-other-control-char)))))
           (setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
           (cancel-kbd-macro-events)
+          (setq prefix-arg arg)
           (apply 'isearch-unread keylist))
          ((eq search-exit-option 'edit)
+          (setq prefix-arg arg)
           (apply 'isearch-unread keylist)
           (isearch-edit-string))
           ;; Handle a scrolling function.
@@ -1987,6 +1991,7 @@
           (isearch-edit-string))
          (search-exit-option
           (let (window)
+            (setq prefix-arg arg)
              (isearch-unread-key-sequence keylist)
              (setq main-event (car unread-command-events))