1 files changed, 3 insertions, 0 deletions

diff --git a/src/intervals.c b/src/intervals.c
index 00c7395cbb0..0cc28ac2751 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1789,6 +1789,9 @@ get_local_map (position, buffer)
   BUF_ZV (buffer) = old_zv;
 
   /* Use the local map only if it is valid.  */
+  /* Do allow symbols that are defined as keymaps.  */
+  if (SYMBOLP (prop) && !NILP (prop))
+    prop = Findirect_function (prop);
   if (!NILP (prop)
       && (tem = Fkeymapp (prop), !NILP (tem)))
     return prop;