diff options
| author | Karoly Lorentey <[email protected]> | 2005-11-18 13:13:34 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2005-11-18 13:13:34 +0000 |
| commit | bffa514a8b8c947c655b463e8073e8e5ac061bc7 (patch) | |
| tree | 0c51140f31c86667569ab1ddba534a16152cd13d /src/keymap.c | |
| parent | f5100f05486a36a443aa021b1a418e4b55988571 (diff) | |
| parent | 1135363e9a6fd149e8f95bfa76421549697a0df0 (diff) | |
Merged from [email protected] (patch 152-156, 642-654)
Patches applied:
* [email protected]/emacs--cvs-trunk--0--patch-642
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-643
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-644
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-645
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-646
Merge from gnus--rel--5.10
* [email protected]/emacs--cvs-trunk--0--patch-647
lisp/gnus/ChangeLog: Remove duplicate entry
* [email protected]/emacs--cvs-trunk--0--patch-648
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-649
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-650
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-651
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-652
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-653
Update from CVS
* [email protected]/emacs--cvs-trunk--0--patch-654
Update from CVS
* [email protected]/gnus--rel--5.10--patch-152
Update from CVS: lisp/mml.el (mml-preview): Doc fix.
* [email protected]/gnus--rel--5.10--patch-153
Update from CVS
* [email protected]/gnus--rel--5.10--patch-154
Update from CVS
* [email protected]/gnus--rel--5.10--patch-155
Update from CVS
* [email protected]/gnus--rel--5.10--patch-156
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-440
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index 7e5b00bc77..a19b010212 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -2370,7 +2370,13 @@ shadow_lookup (shadow, key, flag) for (tail = shadow; CONSP (tail); tail = XCDR (tail)) { value = Flookup_key (XCAR (tail), key, flag); - if (!NILP (value) && !NATNUMP (value)) + if (NATNUMP (value)) + { + value = Flookup_key (XCAR (tail), Fsubstring (key, 0, value), flag); + if (!NILP (value)) + return Qnil; + } + else if (!NILP (value)) return value; } return Qnil; |