Merge from trunk

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index c56f0b6c9df42a5f1801dd063d092e291e1bfdfa..834321108b544e54343c7882587a32686567ca7f 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -729,7 +729,7 @@ a new string, without any text properties, is returned.  */)
      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 STRING itself..  */
-  keymap = current_kboard->Voverriding_terminal_local_map;
+  keymap = KVAR (current_kboard, Voverriding_terminal_local_map);
   if (NILP (keymap))
     keymap = Voverriding_local_map;