changeset 70554:e1a064810f6f

* keymap.c (describe_map): Avoid generating duplicate entries if the shadowed binding has the same definition.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 10 May 2006 03:32:06 +0000
parents 09d3b5632463
children 4ff0c9f3ea31
files src/ChangeLog src/keymap.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed May 10 02:07:12 2006 +0000
+++ b/src/ChangeLog	Wed May 10 03:32:06 2006 +0000
@@ -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.
--- a/src/keymap.c	Wed May 10 02:07:12 2006 +0000
+++ b/src/keymap.c	Wed May 10 03:32:06 2006 +0000
@@ -3297,7 +3297,9 @@
 	      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;