From d809b8eb5eb739839063fb9af1dc3ac593a0a560 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Tue, 6 Sep 2011 01:01:46 +0000 Subject: [PATCH] isearch.el (isearch-other-meta-char): Wherever a key list is unread, "unread" the prefix arg, too. This fixes bug #8901. --- lisp/ChangeLog | 5 +++++ lisp/isearch.el | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a922e002d7..d82391d691a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-09-06 Alan Mackenzie + + * 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 (tiny change) * progmodes/grep.el (rgrep): Add "-type d" (bug#9414). 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)) -- 2.39.2