Mercurial > emacs
diff lisp/double.el @ 83319:8f5787c83345
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 26 Jun 2005 21:06:46 +0000 |
| parents | 789a36c2bc56 |
| children | 6c13700d1c13 |
line wrap: on
line diff
--- a/lisp/double.el Sun Jun 26 04:35:44 2005 +0000 +++ b/lisp/double.el Sun Jun 26 21:06:46 2005 +0000 @@ -144,17 +144,18 @@ (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