From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 10 May 2006 03:32:06 +0000 (+0000)
Subject: * keymap.c (describe_map): Avoid generating duplicate entries if
X-Git-Tag: emacs-pretest-22.0.90~2652
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3ee989e859e0a610527c18113edc1c51d77a429;p=emacs.git

* keymap.c (describe_map): Avoid generating duplicate entries if
	the shadowed binding has the same definition.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 89147db983f..7a5c3c71dcd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09  Chong Yidong  <cyd@stupidchicken.com>
+
+	* keymap.c (describe_map): Avoid generating duplicate entries if
+	the shadowed binding has the same definition.
+
 2006-05-09  Kenichi Handa  <handa@m17n.org>
 
 	* keymap.c (push_key_description): Handle invalid character key.
diff --git a/src/keymap.c b/src/keymap.c
index c8158a3a691..ecc2f7b2944 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3297,7 +3297,9 @@ describe_map (map, prefix, elt_describer, partial, shadow,
 	      tem = shadow_lookup (shadow, kludge, Qt);
 	      if (!NILP (tem))
 		{
-		  if (mention_shadow)
+		  /* Avoid generating duplicate entries if the
+		     shadowed binding has the same definition. */
+		  if (mention_shadow && !EQ (tem, definition))
 		    this_shadowed = 1;
 		  else
 		    continue;