Change key-translation-map to be terminal-local.

* src/keymap.c (Vkey_translation_map): Remove.
  (syms_of_keymap): Remove DEFVAR for key-translation-map.
  (Fdescribe_buffer_bindings): Update for terminal-local key-translation-map.
  

* src/keyboard.h (kboard): Add Vkey_translation_map field.
  (Vglobal_key_translation_map): Declare.

* src/keyboard.c (Vglobal_key_translation_map): New variable.
  (syms_of_keyboard): DEFVAR it and Vkey_translation_map.
  (mark_kboards): Mark key-translation-map.
  (read_key_sequence): Update for terminal-local key-translation-map.

* src/emacs.c (main): Call syms_of_keymap before syms_of_keyboard.

* lisp/term/mac-win.el (mac-handle-language-change): Use
  global-key-translation-map instead of key-translation-map.
* lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto.
* lisp/international/iso-transl.el (iso-transl-ctl-x-8-map): Ditto.
* lisp/double.el (double-setup): Ditto.


git-archimport-id: [email protected]/emacs--multi-tty--0--patch-359

1 files changed, 2 insertions, 11 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 1734ac1baa..a8d197208b 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -79,9 +79,6 @@ Lisp_Object Vminor_mode_overriding_map_alist;
 /* List of emulation mode keymap alists.  */
 Lisp_Object Vemulation_mode_map_alists;
 
-/* Keymap mapping ASCII function key sequences onto their preferred forms.  */
-Lisp_Object Vkey_translation_map;
-
 /* A list of all commands given new bindings since a certain time
    when nil was stored here.
    This is used to speed up recomputation of menu key equivalents
@@ -2844,8 +2841,8 @@ You type        Translation\n\
       insert ("\n", 1);
     }
 
-  if (!NILP (Vkey_translation_map))
-    describe_map_tree (Vkey_translation_map, 0, Qnil, prefix,
+  if (!NILP (current_kboard->Vkey_translation_map))
+    describe_map_tree (current_kboard->Vkey_translation_map, 0, Qnil, prefix,
 		       "Key translations", nomenu, 1, 0, 0);
 
 
@@ -3797,12 +3794,6 @@ the same way.  The "active" keymaps in each alist are used before
 `minor-mode-map-alist' and `minor-mode-overriding-map-alist'.  */);
   Vemulation_mode_map_alists = Qnil;
 
-  DEFVAR_LISP ("key-translation-map", &Vkey_translation_map,
-	       doc: /* Keymap of key translations that can override keymaps.
-This keymap works like `function-key-map', but comes after that,
-and its non-prefix bindings override ordinary bindings.  */);
-  Vkey_translation_map = Qnil;
-
   staticpro (&Vmouse_events);
   Vmouse_events = Fcons (intern ("menu-bar"),
 		  Fcons (intern ("tool-bar"),