diff options
| author | Chong Yidong | 2012-10-30 07:20:24 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-10-30 07:20:24 +0800 |
| commit | b5dd9a779bafdbac1658b7e610ec04c195a7f21c (patch) | |
| tree | 3ab6feb5fbfe2e0e829068a5a34524d508fff196 | |
| parent | 748b0d840fea13e0b6ba36341873dc68e57f5bc5 (diff) | |
| download | emacs-b5dd9a779bafdbac1658b7e610ec04c195a7f21c.tar.gz emacs-b5dd9a779bafdbac1658b7e610ec04c195a7f21c.zip | |
Fix isearch handling of keypad characters with kmacros.
* isearch.el (isearch-other-meta-char): Ensure that a reprocessed
function key is stored in a keyboard macro.
Fixes: debbugs:4894
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/isearch.el | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2474574de92..bd57e7dc5f0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-10-29 Chong Yidong <cyd@gnu.org> | 1 | 2012-10-29 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * isearch.el (isearch-other-meta-char): Ensure that a reprocessed | ||
| 4 | function key is stored in a keyboard macro (Bug#4894). | ||
| 5 | |||
| 3 | * thingatpt.el (number-at-point): Apply a thing-at-point property. | 6 | * thingatpt.el (number-at-point): Apply a thing-at-point property. |
| 4 | 7 | ||
| 5 | 2012-10-29 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2012-10-29 Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/lisp/isearch.el b/lisp/isearch.el index 37993767013..ead6f88cb97 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -2149,7 +2149,8 @@ Isearch mode." | |||
| 2149 | (setq prefix-arg arg) | 2149 | (setq prefix-arg arg) |
| 2150 | (apply 'isearch-unread keylist)) | 2150 | (apply 'isearch-unread keylist)) |
| 2151 | (setq keylist | 2151 | (setq keylist |
| 2152 | (listify-key-sequence (lookup-key local-function-key-map key))) | 2152 | (listify-key-sequence |
| 2153 | (lookup-key local-function-key-map key))) | ||
| 2153 | (while keylist | 2154 | (while keylist |
| 2154 | (setq key (car keylist)) | 2155 | (setq key (car keylist)) |
| 2155 | ;; If KEY is a printing char, we handle it here | 2156 | ;; If KEY is a printing char, we handle it here |
| @@ -2158,6 +2159,7 @@ Isearch mode." | |||
| 2158 | (if (and (integerp key) | 2159 | (if (and (integerp key) |
| 2159 | (>= key ?\s) (/= key 127) (< key 256)) | 2160 | (>= key ?\s) (/= key 127) (< key 256)) |
| 2160 | (progn | 2161 | (progn |
| 2162 | (store-kbd-macro-event key) | ||
| 2161 | (isearch-process-search-char key) | 2163 | (isearch-process-search-char key) |
| 2162 | (setq keylist (cdr keylist))) | 2164 | (setq keylist (cdr keylist))) |
| 2163 | ;; As the remaining keys in KEYLIST can't be handled | 2165 | ;; As the remaining keys in KEYLIST can't be handled |