Mercurial > emacs
comparison lisp/term/xterm.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 | 2a679c81f552 |
| children | 51eb0aa362f3 |
comparison
equal
deleted
inserted
replaced
| 83393:38af4e693f4e | 83394:7d093d9d4479 |
|---|---|
| 209 ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The | 209 ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The |
| 210 ;; code here subsitutes the corresponding defintions in | 210 ;; code here subsitutes the corresponding defintions in |
| 211 ;; function-key-map. This substitution is needed because if a key | 211 ;; function-key-map. This substitution is needed because if a key |
| 212 ;; definition if found in function-key-map, there are no further | 212 ;; definition if found in function-key-map, there are no further |
| 213 ;; lookups in other keymaps. | 213 ;; lookups in other keymaps. |
| 214 (let ((m (terminal-local-value 'local-function-key-map nil))) | 214 (substitute-key-definition [f13] [S-f1] local-function-key-map) |
| 215 (substitute-key-definition [f13] [S-f1] m) | 215 (substitute-key-definition [f14] [S-f2] local-function-key-map) |
| 216 (substitute-key-definition [f14] [S-f2] m) | 216 (substitute-key-definition [f15] [S-f3] local-function-key-map) |
| 217 (substitute-key-definition [f15] [S-f3] m) | 217 (substitute-key-definition [f16] [S-f4] local-function-key-map) |
| 218 (substitute-key-definition [f16] [S-f4] m) | 218 (substitute-key-definition [f17] [S-f5] local-function-key-map) |
| 219 (substitute-key-definition [f17] [S-f5] m) | 219 (substitute-key-definition [f18] [S-f6] local-function-key-map) |
| 220 (substitute-key-definition [f18] [S-f6] m) | 220 (substitute-key-definition [f19] [S-f7] local-function-key-map) |
| 221 (substitute-key-definition [f19] [S-f7] m) | 221 (substitute-key-definition [f20] [S-f8] local-function-key-map) |
| 222 (substitute-key-definition [f20] [S-f8] m) | 222 (substitute-key-definition [f21] [S-f9] local-function-key-map) |
| 223 (substitute-key-definition [f21] [S-f9] m) | 223 (substitute-key-definition [f22] [S-f10] local-function-key-map) |
| 224 (substitute-key-definition [f22] [S-f10] m) | 224 (substitute-key-definition [f23] [S-f11] local-function-key-map) |
| 225 (substitute-key-definition [f23] [S-f11] m) | 225 (substitute-key-definition [f24] [S-f12] local-function-key-map) |
| 226 (substitute-key-definition [f24] [S-f12] m) | 226 |
| 227 | 227 (substitute-key-definition [f25] [C-f1] local-function-key-map) |
| 228 (substitute-key-definition [f25] [C-f1] m) | 228 (substitute-key-definition [f26] [C-f2] local-function-key-map) |
| 229 (substitute-key-definition [f26] [C-f2] m) | 229 (substitute-key-definition [f27] [C-f3] local-function-key-map) |
| 230 (substitute-key-definition [f27] [C-f3] m) | 230 (substitute-key-definition [f28] [C-f4] local-function-key-map) |
| 231 (substitute-key-definition [f28] [C-f4] m) | 231 (substitute-key-definition [f29] [C-f5] local-function-key-map) |
| 232 (substitute-key-definition [f29] [C-f5] m) | 232 (substitute-key-definition [f30] [C-f6] local-function-key-map) |
| 233 (substitute-key-definition [f30] [C-f6] m) | 233 (substitute-key-definition [f31] [C-f7] local-function-key-map) |
| 234 (substitute-key-definition [f31] [C-f7] m) | 234 (substitute-key-definition [f32] [C-f8] local-function-key-map) |
| 235 (substitute-key-definition [f32] [C-f8] m) | 235 (substitute-key-definition [f33] [C-f9] local-function-key-map) |
| 236 (substitute-key-definition [f33] [C-f9] m) | 236 (substitute-key-definition [f34] [C-f10] local-function-key-map) |
| 237 (substitute-key-definition [f34] [C-f10] m) | 237 (substitute-key-definition [f35] [C-f11] local-function-key-map) |
| 238 (substitute-key-definition [f35] [C-f11] m) | 238 (substitute-key-definition [f36] [C-f12] local-function-key-map) |
| 239 (substitute-key-definition [f36] [C-f12] m) | 239 |
| 240 | 240 (substitute-key-definition [f37] [C-S-f1] local-function-key-map) |
| 241 (substitute-key-definition [f37] [C-S-f1] m) | 241 (substitute-key-definition [f38] [C-S-f2] local-function-key-map) |
| 242 (substitute-key-definition [f38] [C-S-f2] m) | 242 (substitute-key-definition [f39] [C-S-f3] local-function-key-map) |
| 243 (substitute-key-definition [f39] [C-S-f3] m) | 243 (substitute-key-definition [f40] [C-S-f4] local-function-key-map) |
| 244 (substitute-key-definition [f40] [C-S-f4] m) | 244 (substitute-key-definition [f41] [C-S-f5] local-function-key-map) |
| 245 (substitute-key-definition [f41] [C-S-f5] m) | 245 (substitute-key-definition [f42] [C-S-f6] local-function-key-map) |
| 246 (substitute-key-definition [f42] [C-S-f6] m) | 246 (substitute-key-definition [f43] [C-S-f7] local-function-key-map) |
| 247 (substitute-key-definition [f43] [C-S-f7] m) | 247 (substitute-key-definition [f44] [C-S-f8] local-function-key-map) |
| 248 (substitute-key-definition [f44] [C-S-f8] m) | 248 (substitute-key-definition [f45] [C-S-f9] local-function-key-map) |
| 249 (substitute-key-definition [f45] [C-S-f9] m) | 249 (substitute-key-definition [f46] [C-S-f10] local-function-key-map) |
| 250 (substitute-key-definition [f46] [C-S-f10] m) | 250 (substitute-key-definition [f47] [C-S-f11] local-function-key-map) |
| 251 (substitute-key-definition [f47] [C-S-f11] m) | 251 (substitute-key-definition [f48] [C-S-f12] local-function-key-map) |
| 252 (substitute-key-definition [f48] [C-S-f12] m) | 252 |
| 253 | 253 (substitute-key-definition [f49] [A-f1] local-function-key-map) |
| 254 (substitute-key-definition [f49] [A-f1] m) | 254 (substitute-key-definition [f50] [A-f2] local-function-key-map) |
| 255 (substitute-key-definition [f50] [A-f2] m) | 255 (substitute-key-definition [f51] [A-f3] local-function-key-map) |
| 256 (substitute-key-definition [f51] [A-f3] m) | 256 (substitute-key-definition [f52] [A-f4] local-function-key-map) |
| 257 (substitute-key-definition [f52] [A-f4] m) | 257 (substitute-key-definition [f53] [A-f5] local-function-key-map) |
| 258 (substitute-key-definition [f53] [A-f5] m) | 258 (substitute-key-definition [f54] [A-f6] local-function-key-map) |
| 259 (substitute-key-definition [f54] [A-f6] m) | 259 (substitute-key-definition [f55] [A-f7] local-function-key-map) |
| 260 (substitute-key-definition [f55] [A-f7] m) | 260 (substitute-key-definition [f56] [A-f8] local-function-key-map) |
| 261 (substitute-key-definition [f56] [A-f8] m) | 261 (substitute-key-definition [f57] [A-f9] local-function-key-map) |
| 262 (substitute-key-definition [f57] [A-f9] m) | 262 (substitute-key-definition [f58] [A-f10] local-function-key-map) |
| 263 (substitute-key-definition [f58] [A-f10] m) | 263 (substitute-key-definition [f59] [A-f11] local-function-key-map) |
| 264 (substitute-key-definition [f59] [A-f11] m) | 264 (substitute-key-definition [f60] [A-f12] local-function-key-map)) |
| 265 (substitute-key-definition [f60] [A-f12] m)) | |
| 266 | 265 |
| 267 ;; Use inheritance to let the main keymap override those defaults. | 266 ;; Use inheritance to let the main keymap override those defaults. |
| 268 ;; This way we don't override terminfo-derived settings or settings | 267 ;; This way we don't override terminfo-derived settings or settings |
| 269 ;; made in the .emacs file. | 268 ;; made in the .emacs file. |
| 270 (let ((m (copy-keymap xterm-function-map))) | 269 (let ((m (copy-keymap xterm-function-map))) |
| 271 (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) | 270 (set-keymap-parent m (keymap-parent local-function-key-map)) |
| 272 (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))) | 271 (set-keymap-parent local-function-key-map m))) |
| 273 | 272 |
| 274 ;; Do it! | 273 ;; Do it! |
| 275 (xterm-register-default-colors) | 274 (xterm-register-default-colors) |
| 276 ;; This recomputes all the default faces given the colors we've just set up. | 275 ;; This recomputes all the default faces given the colors we've just set up. |
| 277 (tty-set-up-initial-frame-faces))) | 276 (tty-set-up-initial-frame-faces)) |
| 278 | 277 |
| 279 ;; Set up colors, for those versions of xterm that support it. | 278 ;; Set up colors, for those versions of xterm that support it. |
| 280 (defvar xterm-standard-colors | 279 (defvar xterm-standard-colors |
| 281 ;; The names in the comments taken from XTerm-col.ad in the xterm | 280 ;; The names in the comments taken from XTerm-col.ad in the xterm |
| 282 ;; distribution, see ftp://dickey.his.com/xterm/. RGB values are | 281 ;; distribution, see ftp://dickey.his.com/xterm/. RGB values are |