From: Kim F. Storm <storm@cua.dk>
Date: Wed, 24 Jan 2007 00:26:30 +0000 (+0000)
Subject: (describe_map): Don't consider prefix keys to be shadowed.
X-Git-Tag: emacs-pretest-22.0.94~636
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0af1451662ff7dbb89720e1905730edb38af9b05;p=emacs.git

(describe_map): Don't consider prefix keys to be shadowed.
---

diff --git a/src/keymap.c b/src/keymap.c
index 20e01759f8d..6b4b8536fe1 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3455,9 +3455,13 @@ describe_map (map, prefix, elt_describer, partial, shadow,
 	      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;