changeset 75393:42d89518722a

(describe_map): Don't consider prefix keys to be shadowed.
author Kim F. Storm <storm@cua.dk>
date Wed, 24 Jan 2007 00:26:30 +0000
parents 496d2145a60d
children 74b0e3bbd6d9
files src/keymap.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/keymap.c	Wed Jan 24 00:26:20 2007 +0000
+++ b/src/keymap.c	Wed Jan 24 00:26:30 2007 +0000
@@ -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))
+		     shadowed binding has the same definition.  */
+		  else if (mention_shadow && !EQ (tem, definition))
 		    this_shadowed = 1;
 		  else
 		    continue;