Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map.

* src/keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to
  'Vlocal_function_key_map', and 'Vkey_translation_map' to
  'Vlocal_key_translation_map'.
  (Vfunction_key_map, Vkey_translation_map): New declarations.

* src/keyboard.c (Vfunction_key_map): New variable.
  (Vglobal_key_translation_map): Rename to Vglobal_key_translation_map.
  (read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards): Update.
* src/keymap.c (Fdescribe_buffer_bindings): Update.
* src/term.c (term_get_fkeys_1): Update.

* lisp/double.el (double-setup): Replace global-key-translation-map with key-translation-map.
* lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
* lisp/international/iso-transl.el: Ditto.
* lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto.

* lisp/edmacro.el (edmacro-format-keys): Use terminal-local binding of
  local-function-key-map instead of function-key-map.
* lisp/emulation/cua-base.el (cua--pre-command-handler): Ditto.
* lisp/isearch.el (isearch-other-meta-char): Ditto.
* lisp/subr.el (read-quoted-char): Ditto.
* lisp/term/vt200.el: Ditto.
* lisp/term/vt201.el: Ditto.
* lisp/term/vt220.el: Ditto.
* lisp/term/vt240.el: Ditto.
* lisp/term/vt300.el: Ditto.
* lisp/term/vt320.el: Ditto.
* lisp/term/vt400.el: Ditto.
* lisp/term/vt420.el: Ditto.

* lisp/simple.el (normal-erase-is-backspace-mode): Add todo note.
* lisp/xt-mouse.el: Ditto.

* lisp/term/AT386.el: Adapt for renaming of function-key-map to local-function-key-map.
* lisp/term/internal.el: Ditto.
* lisp/term/iris-ansi.el: Ditto.
* lisp/term/lk201.el: Ditto.
* lisp/term/mac-win.el: Ditto.
* lisp/term/news.el: Ditto.
* lisp/term/rxvt.el: Ditto.
* lisp/term/sun.el: Ditto.
* lisp/term/tvi970.el: Ditto.
* lisp/term/wyse50.el: Ditto.
* lisp/term/x-win.el (x-setup-function-keys): Ditto.
* lisp/term/xterm.el: Ditto.

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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/term.c b/src/term.c
index 14396a0c1d2..e340edb6c17 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1350,13 +1350,13 @@ term_get_fkeys_1 ()
   
   /* This can happen if CANNOT_DUMP or with strange options.  */
   if (!initialized)
-    kboard->Vfunction_key_map = Fmake_sparse_keymap (Qnil);
+    kboard->Vlocal_function_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 (kboard->Vfunction_key_map, build_string (sequence),
+        Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence),
                      Fmake_vector (make_number (1),
                                    intern (keys[i].name)));
     }
@@ -1376,13 +1376,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 (kboard->Vfunction_key_map, build_string (k0),
+          Fdefine_key (kboard->Vlocal_function_key_map, build_string (k0),
                        Fmake_vector (make_number (1), intern ("f0")));
-        Fdefine_key (kboard->Vfunction_key_map, build_string (k_semi),
+        Fdefine_key (kboard->Vlocal_function_key_map, build_string (k_semi),
                      Fmake_vector (make_number (1), intern ("f10")));
       }
     else if (k0)
-      Fdefine_key (kboard->Vfunction_key_map, build_string (k0),
+      Fdefine_key (kboard->Vlocal_function_key_map, build_string (k0),
                    Fmake_vector (make_number (1), intern (k0_name)));
   }
 
@@ -1405,7 +1405,7 @@ term_get_fkeys_1 ()
           if (sequence)
             {
               sprintf (fkey, "f%d", i);
-              Fdefine_key (kboard->Vfunction_key_map, build_string (sequence),
+              Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence),
                            Fmake_vector (make_number (1),
                                          intern (fkey)));
             }
@@ -1422,7 +1422,7 @@ term_get_fkeys_1 ()
         {                                                               \
           char *sequence = tgetstr (cap2, address);                     \
           if (sequence)                                                 \
-            Fdefine_key (kboard->Vfunction_key_map, build_string (sequence), \
+            Fdefine_key (kboard->Vlocal_function_key_map, build_string (sequence), \
                          Fmake_vector (make_number (1),                 \
                                        intern (sym)));                  \
         }