1 files changed, 7 insertions, 1 deletions

diff --git a/src/keymap.c b/src/keymap.c
index f74ee61a08c..f2370225ab8 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2377,7 +2377,13 @@ shadow_lookup (shadow, key, flag)
   for (tail = shadow; CONSP (tail); tail = XCDR (tail))
     {
       value = Flookup_key (XCAR (tail), key, flag);
-      if (!NILP (value) && !NATNUMP (value))
+      if (NATNUMP (value))
+        {
+          value = Flookup_key (XCAR (tail), Fsubstring (key, 0, value), flag);
+          if (!NILP (value))
+            return Qnil;
+        }
+      else if (!NILP (value))
         return value;
     }
   return Qnil;