summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2011-09-06 01:01:46 +0000
committerAlan Mackenzie <acm@muc.de>2011-09-06 01:01:46 +0000
commitd809b8eb5eb739839063fb9af1dc3ac593a0a560 (patch)
tree5593016786f0aaa787a6edcedfdd154fec95a767 /lisp/isearch.el
parentbbd6590c364daad8ac9f7c3b3a31bc9d32ada3e3 (diff)
downloademacs-d809b8eb5eb739839063fb9af1dc3ac593a0a560.tar.gz
emacs-d809b8eb5eb739839063fb9af1dc3ac593a0a560.tar.bz2
emacs-d809b8eb5eb739839063fb9af1dc3ac593a0a560.zip
isearch.el (isearch-other-meta-char): Wherever a key list is unread,
"unread" the prefix arg, too. This fixes bug #8901.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6eab3dbcbc4..7f54067f9aa 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1920,6 +1920,7 @@ Isearch mode."
(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 @@ Isearch mode."
(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 mode."
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 mode."
(isearch-edit-string))
(search-exit-option
(let (window)
+ (setq prefix-arg arg)
(isearch-unread-key-sequence keylist)
(setq main-event (car unread-command-events))