diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-06-26 21:06:46 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-06-26 21:06:46 +0000 |
| commit | 4ea81208d4c43df774e540a603be8f68cb470466 (patch) | |
| tree | 27b139cd84bc56386476cf9af68225b44de136b3 /lisp/double.el | |
| parent | 1fb8c4adcbf2d3c833b3e6bbb86211109085fa86 (diff) | |
| download | emacs-4ea81208d4c43df774e540a603be8f68cb470466.tar.gz | |
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: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-359
Diffstat (limited to 'lisp/double.el')
| -rw-r--r-- | lisp/double.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/double.el b/lisp/double.el index c9c27203344..db3eb6db79e 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -144,17 +144,18 @@ but not `C-u X' or `ESC X' since the X is not the prefix key." (if enable-flag (progn ;; Set up key-translation-map as indicated by `double-map'. - (kill-local-variable 'key-translation-map) - (make-local-variable 'key-translation-map) - (setq key-translation-map (if (keymapp key-translation-map) - (copy-keymap key-translation-map) - (make-sparse-keymap))) + ;; XXX I don't think global-key-translation-map should be made local here. -- Lorentey + (kill-local-variable 'global-key-translation-map) + (make-local-variable 'global-key-translation-map) + (setq global-key-translation-map (if (keymapp global-key-translation-map) + (copy-keymap global-key-translation-map) + (make-sparse-keymap))) (mapcar (function (lambda (entry) - (define-key key-translation-map + (define-key global-key-translation-map (vector (nth 0 entry)) 'double-translate-key))) (append double-map '((magic-start) (magic-end))))) - (kill-local-variable 'key-translation-map))) + (kill-local-variable 'global-key-translation-map))) ;;; Mode |