Make function-key-map a terminal-local variable (move it inside the kboard struct).

* src/keyboard.h (kboard): Move Vfunction_key_map inside the kboard struct.

* src/keyboard.c (Vfunction_key_map): Remove declaration.
  (read_key_sequence, init_kboard): Update references to Vfunction_key_map.
  (syms_of_keyboard): Declare function-key-map as a terminal-local variable.
  (mark_kboards): Mark Vfunction_key_map.

* src/keymap.c (Vfunction_key_map): Remove.
  (Fdescribe_buffer_bindings): Update references to Vfunction_key_map.
  (syms_of_keymap): Remove DEFVAR for Vfunction_key_map.

* src/term.c (term_get_fkeys_1): Update references to Vfunction_key_map.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-355

1 files changed, 7 insertions, 7 deletions

diff --git a/src/term.c b/src/term.c
index 774373e82f9..51d191a3bfc 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1344,13 +1344,13 @@ term_get_fkeys_1 ()
 
   /* This can happen if CANNOT_DUMP or with strange options.  */
   if (!initialized)
-    Vfunction_key_map = Fmake_sparse_keymap (Qnil);
+    current_kboard->Vfunction_key_map = Fmake_sparse_keymap (Qnil);
 
   for (i = 0; i < (sizeof (keys)/sizeof (keys[0])); i++)
     {
       char *sequence = tgetstr (keys[i].cap, address);
       if (sequence)
-        Fdefine_key (Vfunction_key_map, build_string (sequence),
+        Fdefine_key (current_kboard->Vfunction_key_map, build_string (sequence),
                      Fmake_vector (make_number (1),
                                    intern (keys[i].name)));
     }
@@ -1370,13 +1370,13 @@ term_get_fkeys_1 ()
         if (k0)
           /* Define f0 first, so that f10 takes precedence in case the
              key sequences happens to be the same.  */
-          Fdefine_key (Vfunction_key_map, build_string (k0),
+          Fdefine_key (current_kboard->Vfunction_key_map, build_string (k0),
                        Fmake_vector (make_number (1), intern ("f0")));
-        Fdefine_key (Vfunction_key_map, build_string (k_semi),
+        Fdefine_key (current_kboard->Vfunction_key_map, build_string (k_semi),
                      Fmake_vector (make_number (1), intern ("f10")));
       }
     else if (k0)
-      Fdefine_key (Vfunction_key_map, build_string (k0),
+      Fdefine_key (current_kboard->Vfunction_key_map, build_string (k0),
                    Fmake_vector (make_number (1), intern (k0_name)));
   }
 
@@ -1399,7 +1399,7 @@ term_get_fkeys_1 ()
           if (sequence)
             {
               sprintf (fkey, "f%d", i);
-              Fdefine_key (Vfunction_key_map, build_string (sequence),
+              Fdefine_key (current_kboard->Vfunction_key_map, build_string (sequence),
                            Fmake_vector (make_number (1),
                                          intern (fkey)));
             }
@@ -1416,7 +1416,7 @@ term_get_fkeys_1 ()
         {                                                               \
           char *sequence = tgetstr (cap2, address);                     \
           if (sequence)                                                 \
-            Fdefine_key (Vfunction_key_map, build_string (sequence),    \
+            Fdefine_key (current_kboard->Vfunction_key_map, build_string (sequence),    \
                          Fmake_vector (make_number (1), \
                                        intern (sym)));  \
         }