(Fsubstitute_command_keys):

Check Voverriding_terminal_local_map before Voverriding_local_map.

diff --git a/src/doc.c b/src/doc.c
index f022396eff3df7d88777b80cf22ea583cabe4c2f..8fcf91e1be735a15b56f2183be578402ffc07d1b 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -553,7 +553,9 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
      or a specified local map (which means search just that and the
      global map).  If non-nil, it might come from Voverriding_local_map,
      or from a \\<mapname> construct in STR itself..  */
-  keymap = Voverriding_local_map;
+  keymap = current_kboard->Voverriding_terminal_local_map;
+  if (NILP (keymap))
+    keymap = Voverriding_local_map;
 
   bsize = XSTRING (str)->size;
   bufp = buf = (unsigned char *) xmalloc (bsize);