diff options
| author | Richard M. Stallman <[email protected]> | 1995-09-18 14:45:44 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1995-09-18 14:45:44 +0000 |
| commit | afd9831b8da5745a247670158486003b9c7eac6d (patch) | |
| tree | 16f335b9754736bd7ea505d01f57084aad0c802d /lisp/subr.el | |
| parent | 08a1c178150de10637d0d151e32a7e88e5a9760f (diff) | |
(substitute-key-definition): Do recursively scan
where KEYMAP has nothing at all.
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 970ba2ee4f..fdf189c685 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -129,7 +129,9 @@ in KEYMAP as NEWDEF those chars which are defined as OLDDEF in OLDMAP." (if (and (keymapp defn) ;; Avoid recursively scanning ;; where KEYMAP does not have a submap. - (keymapp (lookup-key keymap prefix1)) + (let ((elt (lookup-key keymap prefix1))) + (or (null elt) + (keymapp elt))) ;; Avoid recursively rescanning keymap being scanned. (not (memq inner-def key-substitution-in-progress))) @@ -163,7 +165,9 @@ in KEYMAP as NEWDEF those chars which are defined as OLDDEF in OLDMAP." (define-key keymap prefix1 (nconc (nreverse skipped) newdef)) (if (and (keymapp defn) - (keymapp (lookup-key keymap prefix1)) + (let ((elt (lookup-key keymap prefix1))) + (or (null elt) + (keymapp elt))) (not (memq inner-def key-substitution-in-progress))) (substitute-key-definition olddef newdef keymap |