diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-10-29 11:50:12 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-10-29 11:50:12 +0000 |
| commit | c40bb1ba81a5df164f0b9b61e3480c55808717b7 (patch) | |
| tree | b7ce7860f839f249aee9f251507aa9e6ab5345be /lisp/term | |
| parent | 1d33157fbfbb14905fcc88f627f15dd2732cc569 (diff) | |
| download | emacs-c40bb1ba81a5df164f0b9b61e3480c55808717b7.tar.gz emacs-c40bb1ba81a5df164f0b9b61e3480c55808717b7.tar.bz2 emacs-c40bb1ba81a5df164f0b9b61e3480c55808717b7.zip | |
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
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/AT386.el | 4 | ||||
| -rw-r--r-- | lisp/term/internal.el | 29 | ||||
| -rw-r--r-- | lisp/term/iris-ansi.el | 4 | ||||
| -rw-r--r-- | lisp/term/lk201.el | 4 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 29 | ||||
| -rw-r--r-- | lisp/term/news.el | 2 | ||||
| -rw-r--r-- | lisp/term/rxvt.el | 65 | ||||
| -rw-r--r-- | lisp/term/sun.el | 2 | ||||
| -rw-r--r-- | lisp/term/tvi970.el | 16 | ||||
| -rw-r--r-- | lisp/term/vt200.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt201.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt220.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt240.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt300.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt320.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt400.el | 2 | ||||
| -rw-r--r-- | lisp/term/vt420.el | 2 | ||||
| -rw-r--r-- | lisp/term/wyse50.el | 4 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 34 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 109 |
20 files changed, 157 insertions, 161 deletions
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el index 7e3ed15ce2e..fda2da44ac8 100644 --- a/lisp/term/AT386.el +++ b/lisp/term/AT386.el @@ -33,7 +33,7 @@ (if (boundp 'AT386-keypad-map) nil ;; The terminal initialization should already have set up some keys - (setq AT386-keypad-map (lookup-key (terminal-local-value 'local-function-key-map nil) "\e[")) + (setq AT386-keypad-map (lookup-key local-function-key-map "\e[")) (if (not (keymapp AT386-keypad-map)) (error "What? Your AT386 termcap/terminfo has no keycaps in it")) @@ -56,7 +56,7 @@ (define-key AT386-keypad-map "T" [kp-add]) ;; Arrange for the ALT key to be equivalent to ESC - (define-key (terminal-local-value 'local-function-key-map nil) "\eN" [27]) ; ALT map + (define-key local-function-key-map "\eN" [27]) ; ALT map )) ;;; arch-tag: abec1b03-582f-49f8-b8cb-e2fd52ea4bd7 diff --git a/lisp/term/internal.el b/lisp/term/internal.el index bbc19bb1b3c..e9de649158a 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -29,21 +29,20 @@ ;; --------------------------------------------------------------------------- ;; keyboard setup -- that's simple! (set-input-mode nil nil 0) -(let (m (terminal-local-value 'local-function-key-map nil)) - (define-key m [backspace] "\177") ; Normal behaviour for BS - (define-key m [delete] "\C-d") ; ... and Delete - (define-key m [tab] [?\t]) - (define-key m [linefeed] [?\n]) - (define-key m [clear] [11]) - (define-key m [return] [13]) - (define-key m [escape] [?\e]) - (define-key m [M-backspace] [?\M-\d]) - (define-key m [M-delete] [?\M-d]) - (define-key m [M-tab] [?\M-\t]) - (define-key m [M-linefeed] [?\M-\n]) - (define-key m [M-clear] [?\M-\013]) - (define-key m [M-return] [?\M-\015]) - (define-key m [M-escape] [?\M-\e])) +(define-key local-function-key-map [backspace] "\177") ; Normal behaviour for BS +(define-key local-function-key-map [delete] "\C-d") ; ... and Delete +(define-key local-function-key-map [tab] [?\t]) +(define-key local-function-key-map [linefeed] [?\n]) +(define-key local-function-key-map [clear] [11]) +(define-key local-function-key-map [return] [13]) +(define-key local-function-key-map [escape] [?\e]) +(define-key local-function-key-map [M-backspace] [?\M-\d]) +(define-key local-function-key-map [M-delete] [?\M-d]) +(define-key local-function-key-map [M-tab] [?\M-\t]) +(define-key local-function-key-map [M-linefeed] [?\M-\n]) +(define-key local-function-key-map [M-clear] [?\M-\013]) +(define-key local-function-key-map [M-return] [?\M-\015]) +(define-key local-function-key-map [M-escape] [?\M-\e])) (put 'backspace 'ascii-character 127) (put 'delete 'ascii-character 127) (put 'tab 'ascii-character ?\t) diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index d751ca69057..1a3a65fa716 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -338,8 +338,8 @@ ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. (let ((m (copy-keymap iris-function-map))) - (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) - (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m)))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m)))) ;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b ;;; iris-ansi.el ends here diff --git a/lisp/term/lk201.el b/lisp/term/lk201.el index 4eb84b65702..45271bca700 100644 --- a/lisp/term/lk201.el +++ b/lisp/term/lk201.el @@ -84,8 +84,8 @@ ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. (let ((m (copy-keymap lk201-function-map))) - (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) - (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m)))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m)))) ;;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d ;;; lk201.el ends here diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index f7782433fdc..7912bb1a4d6 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -1060,21 +1060,20 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp") ;; Map certain keypad keys into ASCII characters ;; that people usually expect. -(let ((m (terminal-local-value 'local-function-key-map nil))) - (define-key m [backspace] [?\d]) - (define-key m [delete] [?\d]) - (define-key m [tab] [?\t]) - (define-key m [linefeed] [?\n]) - (define-key m [clear] [?\C-l]) - (define-key m [return] [?\C-m]) - (define-key m [escape] [?\e]) - (define-key m [M-backspace] [?\M-\d]) - (define-key m [M-delete] [?\M-\d]) - (define-key m [M-tab] [?\M-\t]) - (define-key m [M-linefeed] [?\M-\n]) - (define-key m [M-clear] [?\M-\C-l]) - (define-key m [M-return] [?\M-\C-m]) - (define-key m [M-escape] [?\M-\e])) +(define-key local-function-key-map [backspace] [?\d]) +(define-key local-function-key-map [delete] [?\d]) +(define-key local-function-key-map [tab] [?\t]) +(define-key local-function-key-map [linefeed] [?\n]) +(define-key local-function-key-map [clear] [?\C-l]) +(define-key local-function-key-map [return] [?\C-m]) +(define-key local-function-key-map [escape] [?\e]) +(define-key local-function-key-map [M-backspace] [?\M-\d]) +(define-key local-function-key-map [M-delete] [?\M-\d]) +(define-key local-function-key-map [M-tab] [?\M-\t]) +(define-key local-function-key-map [M-linefeed] [?\M-\n]) +(define-key local-function-key-map [M-clear] [?\M-\C-l]) +(define-key local-function-key-map [M-return] [?\M-\C-m]) +(define-key local-function-key-map [M-escape] [?\M-\e]) ;; These tell read-char how to convert ;; these special chars to ASCII. diff --git a/lisp/term/news.el b/lisp/term/news.el index 2a62a85d5b7..ab2d10158c8 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el @@ -34,7 +34,7 @@ (if (boundp 'news-fkey-prefix) nil ;; The terminal initialization should already have set up some keys - (setq news-fkey-prefix (lookup-key (terminal-local-value 'local-function-key-map nil) "\eO")) + (setq news-fkey-prefix (lookup-key local-function-key-map "\eO")) (if (not (keymapp news-fkey-prefix)) (error "What? Your news termcap/terminfo has no keycaps in it")) diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 2c629fba29c..cb3d019d640 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -132,46 +132,45 @@ ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. - (let ((m (terminal-local-value 'local-function-key-map nil))) - (substitute-key-definition [f11] [S-f1] m) - (substitute-key-definition [f12] [S-f2] m) - (substitute-key-definition [f13] [S-f3] m) - (substitute-key-definition [f14] [S-f4] m) - (substitute-key-definition [f15] [S-f5] m) - (substitute-key-definition [f16] [S-f6] m) - (substitute-key-definition [f17] [S-f7] m) - (substitute-key-definition [f18] [S-f8] m) - (substitute-key-definition [f19] [S-f9] m) - (substitute-key-definition [f20] [S-f10] m) + (substitute-key-definition [f11] [S-f1] local-function-key-map) + (substitute-key-definition [f12] [S-f2] local-function-key-map) + (substitute-key-definition [f13] [S-f3] local-function-key-map) + (substitute-key-definition [f14] [S-f4] local-function-key-map) + (substitute-key-definition [f15] [S-f5] local-function-key-map) + (substitute-key-definition [f16] [S-f6] local-function-key-map) + (substitute-key-definition [f17] [S-f7] local-function-key-map) + (substitute-key-definition [f18] [S-f8] local-function-key-map) + (substitute-key-definition [f19] [S-f9] local-function-key-map) + (substitute-key-definition [f20] [S-f10] local-function-key-map) - (substitute-key-definition [f23] [C-f1] m) - (substitute-key-definition [f24] [C-f2] m) - (substitute-key-definition [f25] [C-f3] m) - (substitute-key-definition [f26] [C-f4] m) - (substitute-key-definition [f27] [C-f5] m) - (substitute-key-definition [f28] [C-f6] m) - (substitute-key-definition [f29] [C-f7] m) - (substitute-key-definition [f30] [C-f8] m) - (substitute-key-definition [f31] [C-f9] m) - (substitute-key-definition [f32] [C-f10] m) + (substitute-key-definition [f23] [C-f1] local-function-key-map) + (substitute-key-definition [f24] [C-f2] local-function-key-map) + (substitute-key-definition [f25] [C-f3] local-function-key-map) + (substitute-key-definition [f26] [C-f4] local-function-key-map) + (substitute-key-definition [f27] [C-f5] local-function-key-map) + (substitute-key-definition [f28] [C-f6] local-function-key-map) + (substitute-key-definition [f29] [C-f7] local-function-key-map) + (substitute-key-definition [f30] [C-f8] local-function-key-map) + (substitute-key-definition [f31] [C-f9] local-function-key-map) + (substitute-key-definition [f32] [C-f10] local-function-key-map) - (substitute-key-definition [f33] [C-S-f1] m) - (substitute-key-definition [f34] [C-S-f2] m) - (substitute-key-definition [f35] [C-S-f3] m) - (substitute-key-definition [f36] [C-S-f4] m) - (substitute-key-definition [f37] [C-S-f5] m) - (substitute-key-definition [f38] [C-S-f6] m) - (substitute-key-definition [f39] [C-S-f7] m) - (substitute-key-definition [f40] [C-S-f8] m) - (substitute-key-definition [f41] [C-S-f9] m) - (substitute-key-definition [f42] [C-S-f10] m)) + (substitute-key-definition [f33] [C-S-f1] local-function-key-map) + (substitute-key-definition [f34] [C-S-f2] local-function-key-map) + (substitute-key-definition [f35] [C-S-f3] local-function-key-map) + (substitute-key-definition [f36] [C-S-f4] local-function-key-map) + (substitute-key-definition [f37] [C-S-f5] local-function-key-map) + (substitute-key-definition [f38] [C-S-f6] local-function-key-map) + (substitute-key-definition [f39] [C-S-f7] local-function-key-map) + (substitute-key-definition [f40] [C-S-f8] local-function-key-map) + (substitute-key-definition [f41] [C-S-f9] local-function-key-map) + (substitute-key-definition [f42] [C-S-f10] local-function-key-map) ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. (let ((m (copy-keymap rxvt-function-map))) - (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) - (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m))) ;; Initialize colors and background mode. (rxvt-register-default-colors) diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 38134d2cd49..99e3ec28c7c 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -150,7 +150,7 @@ (defun terminal-init-sun () "Terminal initialization function for sun." - (define-key (terminal-local-value 'local-function-key-map nil) "\e[" sun-raw-prefix) + (define-key local-function-key-map "\e[" sun-raw-prefix) (define-key sun-raw-prefix "210z" [r3]) (define-key sun-raw-prefix "213z" [r6]) diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index 8d8ef51c4a1..647e4cc2745 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -30,14 +30,14 @@ (defun terminal-init-tvi970 () "Terminal initialization function for tvi970." - (or (lookup-key (terminal-local-value 'local-function-key-map nil) "\e[") - (define-key (terminal-local-value 'local-function-key-map nil) "\e[" (make-keymap))) - ;; (or (lookup-key (terminal-local-value 'local-function-key-map nil) "\eO") - ;; (define-key (terminal-local-value 'local-function-key-map nil) "\eO" (make-keymap))) + (or (lookup-key local-function-key-map "\e[") + (define-key local-function-key-map "\e[" (make-keymap))) + ;; (or (lookup-key local-function-key-map "\eO") + ;; (define-key local-function-key-map "\eO" (make-keymap))) ;; Miscellaneous keys (mapcar (function (lambda (key-binding) - (define-key (terminal-local-value 'local-function-key-map nil) + (define-key local-function-key-map (car key-binding) (nth 1 key-binding)))) '( ;; These are set up by termcap or terminfo @@ -86,17 +86,17 @@ ;; The numeric keypad keys. (let ((i 0)) (while (< i 10) - (define-key (terminal-local-value 'local-function-key-map nil) + (define-key local-function-key-map (format "\eO%c" (+ i ?p)) (vector (intern (format "kp-%d" i)))) (setq i (1+ i)))) ;; The numbered function keys. (let ((i 0)) (while (< i 16) - (define-key (terminal-local-value 'local-function-key-map nil) + (define-key local-function-key-map (format "\e?%c" (+ i ?a)) (vector (intern (format "f%d" (1+ i))))) - (define-key (terminal-local-value 'local-function-key-map nil) + (define-key local-function-key-map (format "\e?%c" (+ i ?A)) (vector (intern (format "S-f%d" (1+ i))))) (setq i (1+ i)))) diff --git a/lisp/term/vt200.el b/lisp/term/vt200.el index 1d62e34759e..fd31fd11263 100644 --- a/lisp/term/vt200.el +++ b/lisp/term/vt200.el @@ -5,7 +5,7 @@ "Terminal initialization function for vt200." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 0f78f583-9f32-4237-b106-28bcfff21d89 ;;; vt200.el ends here diff --git a/lisp/term/vt201.el b/lisp/term/vt201.el index c98b98ba8c0..95243322403 100644 --- a/lisp/term/vt201.el +++ b/lisp/term/vt201.el @@ -5,7 +5,7 @@ "Terminal initialization function for vt201." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: a6abb38f-60ea-449e-a9e9-3fb8572c52ae ;;; vt201.el ends here diff --git a/lisp/term/vt220.el b/lisp/term/vt220.el index a2a374692cb..7264b7d94a2 100644 --- a/lisp/term/vt220.el +++ b/lisp/term/vt220.el @@ -5,7 +5,7 @@ "Terminal initialization function for vt220." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 98fc4867-a20d-46a1-a276-d7be31e49871 ;;; vt220.el ends here diff --git a/lisp/term/vt240.el b/lisp/term/vt240.el index 808cc072041..725e323c00c 100644 --- a/lisp/term/vt240.el +++ b/lisp/term/vt240.el @@ -5,7 +5,7 @@ "Terminal initialization function for vt240." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: d9f88e9c-02dc-49ff-871c-a415f08e4eb7 ;;; vt240.el ends here diff --git a/lisp/term/vt300.el b/lisp/term/vt300.el index 593daf55249..fb749277d50 100644 --- a/lisp/term/vt300.el +++ b/lisp/term/vt300.el @@ -3,7 +3,7 @@ "Terminal initialization function for vt300." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: 876831c9-a6f2-444a-b033-706e6fbc149f ;;; vt300.el ends here diff --git a/lisp/term/vt320.el b/lisp/term/vt320.el index a4d2186080e..3e52d27193b 100644 --- a/lisp/term/vt320.el +++ b/lisp/term/vt320.el @@ -3,7 +3,7 @@ "Terminal initialization function for vt320." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: f9f4c954-0b9e-45f9-b450-a320d32abd9c ;;; vt320.el ends here diff --git a/lisp/term/vt400.el b/lisp/term/vt400.el index bb0afeef0b7..f1c7e3732d3 100644 --- a/lisp/term/vt400.el +++ b/lisp/term/vt400.el @@ -3,7 +3,7 @@ "Terminal initialization function for vt400." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: a70809c5-6b21-42cc-ba20-536683e5e7d5 ;;; vt400.el ends here diff --git a/lisp/term/vt420.el b/lisp/term/vt420.el index b67b25b7bd9..4d3206cbca1 100644 --- a/lisp/term/vt420.el +++ b/lisp/term/vt420.el @@ -3,7 +3,7 @@ "Terminal initialization function for vt420." (terminal-init-vt100) ;; Make F11 an escape key. - (define-key (terminal-local-value 'local-function-key-map nil) "\e[23~" [?\e])) + (define-key local-function-key-map "\e[23~" [?\e])) ;;; arch-tag: df2f897c-3a12-4b3c-9259-df089f96c160 ;;; vt420.el ends here diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el index 9ab9cb0f6ed..d561329d9c6 100644 --- a/lisp/term/wyse50.el +++ b/lisp/term/wyse50.el @@ -40,9 +40,9 @@ (defun terminal-init-wyse50 () "Terminal initialization function for wyse50." - (define-key (terminal-local-value 'local-function-key-map nil) "\C-a" (make-keymap)) + (define-key local-function-key-map "\C-a" (make-keymap)) (mapcar (function (lambda (key-definition) - (define-key (terminal-local-value 'local-function-key-map nil) + (define-key local-function-key-map (car key-definition) (nth 1 key-definition)))) '( ;; These might be set up by termcap and terminfo diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d1ddc97b7ba..fef67eae258 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1173,23 +1173,23 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp") (defun x-setup-function-keys (frame) "Set up `function-key-map' on FRAME for the X window system." ;; Map certain keypad keys into ASCII characters that people usually expect. - (let ((m (terminal-local-value 'local-function-key-map frame))) - (define-key m [backspace] [127]) - (define-key m [delete] [127]) - (define-key m [tab] [?\t]) - (define-key m [linefeed] [?\n]) - (define-key m [clear] [?\C-l]) - (define-key m [return] [?\C-m]) - (define-key m [escape] [?\e]) - (define-key m [M-backspace] [?\M-\d]) - (define-key m [M-delete] [?\M-\d]) - (define-key m [M-tab] [?\M-\t]) - (define-key m [M-linefeed] [?\M-\n]) - (define-key m [M-clear] [?\M-\C-l]) - (define-key m [M-return] [?\M-\C-m]) - (define-key m [M-escape] [?\M-\e]) - (define-key m [iso-lefttab] [backtab]) - (define-key m [S-iso-lefttab] [backtab]))) + (with-selected-frame frame + (define-key local-function-key-map [backspace] [127]) + (define-key local-function-key-map [delete] [127]) + (define-key local-function-key-map [tab] [?\t]) + (define-key local-function-key-map [linefeed] [?\n]) + (define-key local-function-key-map [clear] [?\C-l]) + (define-key local-function-key-map [return] [?\C-m]) + (define-key local-function-key-map [escape] [?\e]) + (define-key local-function-key-map [M-backspace] [?\M-\d]) + (define-key local-function-key-map [M-delete] [?\M-\d]) + (define-key local-function-key-map [M-tab] [?\M-\t]) + (define-key local-function-key-map [M-linefeed] [?\M-\n]) + (define-key local-function-key-map [M-clear] [?\M-\C-l]) + (define-key local-function-key-map [M-return] [?\M-\C-m]) + (define-key local-function-key-map [M-escape] [?\M-\e]) + (define-key local-function-key-map [iso-lefttab] [backtab]) + (define-key local-function-key-map [S-iso-lefttab] [backtab]))) ;; These tell read-char how to convert ;; these special chars to ASCII. diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 1c1e4edb3c9..aeaaeeba1ae 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -211,70 +211,69 @@ ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. - (let ((m (terminal-local-value 'local-function-key-map nil))) - (substitute-key-definition [f13] [S-f1] m) - (substitute-key-definition [f14] [S-f2] m) - (substitute-key-definition [f15] [S-f3] m) - (substitute-key-definition [f16] [S-f4] m) - (substitute-key-definition [f17] [S-f5] m) - (substitute-key-definition [f18] [S-f6] m) - (substitute-key-definition [f19] [S-f7] m) - (substitute-key-definition [f20] [S-f8] m) - (substitute-key-definition [f21] [S-f9] m) - (substitute-key-definition [f22] [S-f10] m) - (substitute-key-definition [f23] [S-f11] m) - (substitute-key-definition [f24] [S-f12] m) - - (substitute-key-definition [f25] [C-f1] m) - (substitute-key-definition [f26] [C-f2] m) - (substitute-key-definition [f27] [C-f3] m) - (substitute-key-definition [f28] [C-f4] m) - (substitute-key-definition [f29] [C-f5] m) - (substitute-key-definition [f30] [C-f6] m) - (substitute-key-definition [f31] [C-f7] m) - (substitute-key-definition [f32] [C-f8] m) - (substitute-key-definition [f33] [C-f9] m) - (substitute-key-definition [f34] [C-f10] m) - (substitute-key-definition [f35] [C-f11] m) - (substitute-key-definition [f36] [C-f12] m) - - (substitute-key-definition [f37] [C-S-f1] m) - (substitute-key-definition [f38] [C-S-f2] m) - (substitute-key-definition [f39] [C-S-f3] m) - (substitute-key-definition [f40] [C-S-f4] m) - (substitute-key-definition [f41] [C-S-f5] m) - (substitute-key-definition [f42] [C-S-f6] m) - (substitute-key-definition [f43] [C-S-f7] m) - (substitute-key-definition [f44] [C-S-f8] m) - (substitute-key-definition [f45] [C-S-f9] m) - (substitute-key-definition [f46] [C-S-f10] m) - (substitute-key-definition [f47] [C-S-f11] m) - (substitute-key-definition [f48] [C-S-f12] m) - - (substitute-key-definition [f49] [A-f1] m) - (substitute-key-definition [f50] [A-f2] m) - (substitute-key-definition [f51] [A-f3] m) - (substitute-key-definition [f52] [A-f4] m) - (substitute-key-definition [f53] [A-f5] m) - (substitute-key-definition [f54] [A-f6] m) - (substitute-key-definition [f55] [A-f7] m) - (substitute-key-definition [f56] [A-f8] m) - (substitute-key-definition [f57] [A-f9] m) - (substitute-key-definition [f58] [A-f10] m) - (substitute-key-definition [f59] [A-f11] m) - (substitute-key-definition [f60] [A-f12] m)) + (substitute-key-definition [f13] [S-f1] local-function-key-map) + (substitute-key-definition [f14] [S-f2] local-function-key-map) + (substitute-key-definition [f15] [S-f3] local-function-key-map) + (substitute-key-definition [f16] [S-f4] local-function-key-map) + (substitute-key-definition [f17] [S-f5] local-function-key-map) + (substitute-key-definition [f18] [S-f6] local-function-key-map) + (substitute-key-definition [f19] [S-f7] local-function-key-map) + (substitute-key-definition [f20] [S-f8] local-function-key-map) + (substitute-key-definition [f21] [S-f9] local-function-key-map) + (substitute-key-definition [f22] [S-f10] local-function-key-map) + (substitute-key-definition [f23] [S-f11] local-function-key-map) + (substitute-key-definition [f24] [S-f12] local-function-key-map) + + (substitute-key-definition [f25] [C-f1] local-function-key-map) + (substitute-key-definition [f26] [C-f2] local-function-key-map) + (substitute-key-definition [f27] [C-f3] local-function-key-map) + (substitute-key-definition [f28] [C-f4] local-function-key-map) + (substitute-key-definition [f29] [C-f5] local-function-key-map) + (substitute-key-definition [f30] [C-f6] local-function-key-map) + (substitute-key-definition [f31] [C-f7] local-function-key-map) + (substitute-key-definition [f32] [C-f8] local-function-key-map) + (substitute-key-definition [f33] [C-f9] local-function-key-map) + (substitute-key-definition [f34] [C-f10] local-function-key-map) + (substitute-key-definition [f35] [C-f11] local-function-key-map) + (substitute-key-definition [f36] [C-f12] local-function-key-map) + + (substitute-key-definition [f37] [C-S-f1] local-function-key-map) + (substitute-key-definition [f38] [C-S-f2] local-function-key-map) + (substitute-key-definition [f39] [C-S-f3] local-function-key-map) + (substitute-key-definition [f40] [C-S-f4] local-function-key-map) + (substitute-key-definition [f41] [C-S-f5] local-function-key-map) + (substitute-key-definition [f42] [C-S-f6] local-function-key-map) + (substitute-key-definition [f43] [C-S-f7] local-function-key-map) + (substitute-key-definition [f44] [C-S-f8] local-function-key-map) + (substitute-key-definition [f45] [C-S-f9] local-function-key-map) + (substitute-key-definition [f46] [C-S-f10] local-function-key-map) + (substitute-key-definition [f47] [C-S-f11] local-function-key-map) + (substitute-key-definition [f48] [C-S-f12] local-function-key-map) + + (substitute-key-definition [f49] [A-f1] local-function-key-map) + (substitute-key-definition [f50] [A-f2] local-function-key-map) + (substitute-key-definition [f51] [A-f3] local-function-key-map) + (substitute-key-definition [f52] [A-f4] local-function-key-map) + (substitute-key-definition [f53] [A-f5] local-function-key-map) + (substitute-key-definition [f54] [A-f6] local-function-key-map) + (substitute-key-definition [f55] [A-f7] local-function-key-map) + (substitute-key-definition [f56] [A-f8] local-function-key-map) + (substitute-key-definition [f57] [A-f9] local-function-key-map) + (substitute-key-definition [f58] [A-f10] local-function-key-map) + (substitute-key-definition [f59] [A-f11] local-function-key-map) + (substitute-key-definition [f60] [A-f12] local-function-key-map)) ;; Use inheritance to let the main keymap override those defaults. ;; This way we don't override terminfo-derived settings or settings ;; made in the .emacs file. (let ((m (copy-keymap xterm-function-map))) - (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) - (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))) + (set-keymap-parent m (keymap-parent local-function-key-map)) + (set-keymap-parent local-function-key-map m))) ;; Do it! (xterm-register-default-colors) ;; This recomputes all the default faces given the colors we've just set up. - (tty-set-up-initial-frame-faces))) + (tty-set-up-initial-frame-faces)) ;; Set up colors, for those versions of xterm that support it. (defvar xterm-standard-colors |