[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keymap.c,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/keymap.c,v |
Date: |
Wed, 24 Jan 2007 00:26:30 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 07/01/24 00:26:30
Index: keymap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keymap.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -b -r1.344 -r1.345
--- keymap.c 21 Jan 2007 04:18:15 -0000 1.344
+++ keymap.c 24 Jan 2007 00:26:30 -0000 1.345
@@ -3455,9 +3455,13 @@
tem = shadow_lookup (shadow, kludge, Qt);
if (!NILP (tem))
{
+ /* If both bindings are keymaps, this key is a prefix key,
+ so don't say it is shadowed. */
+ if (KEYMAPP (definition) && KEYMAPP (tem))
+ ;
/* Avoid generating duplicate entries if the
shadowed binding has the same definition. */
- if (mention_shadow && !EQ (tem, definition))
+ else if (mention_shadow && !EQ (tem, definition))
this_shadowed = 1;
else
continue;