1 files changed, 25 insertions, 5 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 181dcdad3ad..e22eb411f63 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3085,6 +3085,7 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
   for (i = from; ; i++)
     {
       bool this_shadowed = 0;
+      Lisp_Object shadowed_by = Qnil;
       int range_beg, range_end;
       Lisp_Object val;
 
@@ -3127,11 +3128,9 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
       /* If this binding is shadowed by some other map, ignore it.  */
       if (!NILP (shadow))
         {
-          Lisp_Object tem;
-
-          tem = shadow_lookup (shadow, kludge, Qt, 0);
+          shadowed_by = shadow_lookup (shadow, kludge, Qt, 0);
 
-          if (!NILP (tem))
+          if (!NILP (shadowed_by) && !EQ (shadowed_by, definition))
             {
               if (mention_shadow)
                 this_shadowed = 1;
@@ -3186,6 +3185,21 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
                && !NILP (Fequal (tem2, definition)))
           i++;
 
+      /* Make sure found consecutive keys are either not shadowed or,
+         if they are, that they are shadowed by the same command.  */
+      if (CHAR_TABLE_P (vector) && i != starting_i)
+        {
+          Lisp_Object tem;
+          Lisp_Object key = make_nil_vector (1);
+          for (int j = starting_i + 1; j <= i; j++)
+            {
+              ASET (key, 0, make_fixnum (j));
+              tem = shadow_lookup (shadow, key, Qt, 0);
+              if (NILP (Fequal (tem, shadowed_by)))
+                i = j - 1;
+            }
+        }
+
       /* If we have a range of more than one character,
          print where the range reaches to.  */
 
@@ -3209,7 +3223,13 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix, Lisp_Object args,
       if (this_shadowed)
         {
           SET_PT (PT - 1);
-          insert_string ("  (binding currently shadowed)");
+          static char const fmt[] = "  (currently shadowed by `%s')";
+          USE_SAFE_ALLOCA;
+          char *buffer = SAFE_ALLOCA (sizeof fmt +
+                                      SBYTES (SYMBOL_NAME (shadowed_by)));
+          esprintf (buffer, fmt, SDATA (SYMBOL_NAME (shadowed_by)));
+          insert_string (buffer);
+          SAFE_FREE();
           SET_PT (PT + 1);
         }
     }