Mercurial > emacs
diff lisp/international/encoded-kb.el @ 83394:7d093d9d4479
Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.
* src/data.c (do_symval_forwarding, store_symval_forwarding)
(find_symbol_value): Use the selected frame's keyboard, not
current_kboard.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value): Disable
these functions.
* src/data.c (syms_of_data): Don't defsubr them.
* lisp/edmacro.el (edmacro-format-keys): Remove terminal-local-value calls.
* lisp/emulation/cua-base.el (cua--pre-command-handler-1): Ditto.
* lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
* lisp/isearch.el (isearch-other-meta-char): Ditto.
* lisp/obsolete/keyswap.el (the-table): Ditto.
* lisp/simple.el (normal-erase-is-backspace-mode): Ditto.
* lisp/subr.el (keyboard-translate, read-quoted-char): Ditto.
* lisp/term/AT386.el (terminal-init-AT386): Ditto.
* lisp/term/internal.el: Ditto.
* lisp/term/iris-ansi.el (terminal-init-iris-ansi): Ditto.
* lisp/term/lk201.el (terminal-init-lk201): Ditto.
* lisp/term/mac-win.el: Ditto.
* lisp/term/news.el (terminal-init-news): Ditto.
* lisp/term/rxvt.el (terminal-init-rxvt): Ditto.
* lisp/term/sun.el (terminal-init-sun): Ditto.
* lisp/term/tvi970.el (terminal-init-tvi970): Ditto.
* lisp/term/vt200.el (terminal-init-vt200): Ditto.
* lisp/term/vt201.el (terminal-init-vt201): Ditto.
* lisp/term/vt220.el (terminal-init-vt220): Ditto.
* lisp/term/vt240.el (terminal-init-vt240): Ditto.
* lisp/term/vt300.el (terminal-init-vt300): Ditto.
* lisp/term/vt320.el (terminal-init-vt320): Ditto.
* lisp/term/vt400.el (terminal-init-vt400): Ditto.
* lisp/term/vt420.el (terminal-init-vt420): Ditto.
* lisp/term/wyse50.el (terminal-init-wyse50): Ditto.
* lisp/term/x-win.el (x-setup-function-keys): Ditto.
* lisp/term/xterm.el (terminal-init-xterm): Ditto.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-434
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 29 Oct 2005 11:50:12 +0000 |
parents | 4835a94a6cc5 |
children | fe870a866ce7 |
line wrap: on
line diff
--- a/lisp/international/encoded-kb.el Sat Oct 29 11:43:13 2005 +0000 +++ b/lisp/international/encoded-kb.el Sat Oct 29 11:50:12 2005 +0000 @@ -260,9 +260,9 @@ (when frame (with-selected-frame frame ;; Remove any previous encoded-kb keymap from key-translation-map. - (let ((m (terminal-local-value 'local-key-translation-map frame))) + (let ((m local-key-translation-map)) (if (equal (keymap-prompt m) "encoded-kb") - (set-terminal-local-value 'local-key-translation-map frame (keymap-parent m)) + (setq local-key-translation-map (keymap-parent m)) (while (keymap-parent m) (if (equal (keymap-prompt (keymap-parent m)) "encoded-kb") (set-keymap-parent m (keymap-parent (keymap-parent m)))) @@ -274,8 +274,8 @@ (keymap (make-sparse-keymap "encoded-kb")) (cim (current-input-mode)) result) - (set-keymap-parent keymap (terminal-local-value 'local-key-translation-map frame)) - (set-terminal-local-value 'local-key-translation-map frame keymap) + (set-keymap-parent keymap local-key-translation-map) + (setq local-key-translation-map keymap) (unless (terminal-parameter nil 'encoded-kbd-saved-input-mode) (set-terminal-parameter nil 'encoded-kbd-saved-input-mode cim)) (setq result (and coding (encoded-kbd-setup-keymap keymap coding))) @@ -287,7 +287,7 @@ (nth 1 cim) 'use-8th-bit (nth 3 cim))) - (set-terminal-local-value nil 'encoded-kbd-saved-input-mode nil) + (set-terminal-parameter nil 'encoded-kbd-saved-input-mode nil) (error "Unsupported coding system in Encoded-kbd mode: %S" coding))) ;; We are turning off Encoded-kbd mode.