aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1996-01-24 23:26:25 +0000
committerKarl Heuer1996-01-24 23:26:25 +0000
commit3f866b532489c24e9de7a7477a35fa8b2332a59a (patch)
treea7bc3154c50b5053907899284be51f48a5ba2134
parentba369f54e016e2475d73abeae2ff355485f42325 (diff)
downloademacs-3f866b532489c24e9de7a7477a35fa8b2332a59a.tar.gz
emacs-3f866b532489c24e9de7a7477a35fa8b2332a59a.zip
* isearch.el (isearch-other-meta-char): Avoid error if lookup in
function-key-map gives another keymap.
-rw-r--r--lisp/isearch.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6fb53604b42..2b0783805fe 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1004,7 +1004,8 @@ and the meta character is unread so that it applies to editing the string."
1004 (keylist (listify-key-sequence key))) 1004 (keylist (listify-key-sequence key)))
1005 (cond ((and (= (length key) 1) 1005 (cond ((and (= (length key) 1)
1006 (let ((lookup (lookup-key function-key-map key))) 1006 (let ((lookup (lookup-key function-key-map key)))
1007 (not (or (null lookup) (integerp lookup))))) 1007 (not (or (null lookup) (integerp lookup)
1008 (keymapp lookup)))))
1008 ;; Handle a function key that translates into something else. 1009 ;; Handle a function key that translates into something else.
1009 ;; If the key has a global definition too, 1010 ;; If the key has a global definition too,
1010 ;; exit and unread the key itself, so its global definition runs. 1011 ;; exit and unread the key itself, so its global definition runs.