* 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 89147db..7a5c3c7 100644 (file)
--- 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 c8158a3..ecc2f7b 100644 (file)
--- 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;