Mercurial > emacs
diff lisp/term/xterm.el @ 83328:f2eb4324cbaf
Speed up loading of term/xterm.el (Dan Nicolaescu).
* lisp/term/xterm.el: Move key substitutions back before the
define-keys.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-368
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 28 Jun 2005 15:06:17 +0000 |
parents | 950de36a755d |
children | dbb941c7c73c |
line wrap: on
line diff
--- a/lisp/term/xterm.el Mon Jun 27 03:46:25 2005 +0000 +++ b/lisp/term/xterm.el Tue Jun 28 15:06:17 2005 +0000 @@ -31,6 +31,70 @@ (defvar xterm-function-map nil "Function key map overrides for xterm.") +;; The terminal intialization C code file might have initialized +;; function keys F13->F60 from the termcap/terminfo information. On +;; a PC-style keyboard these keys correspond to +;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The +;; code here subsitutes the corresponding defintions in +;; 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 'function-key-map nil))) + ;; This stuff takes several seconds; don't do it unless the keys + ;; seem to be defined. + (when (lookup-key m [f13]) + (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))) + ;; Make reloads faster. (unless xterm-function-map (setq xterm-function-map (make-sparse-keymap)) @@ -192,71 +256,6 @@ (set-keymap-parent m (keymap-parent (terminal-local-value 'function-key-map nil))) (set-keymap-parent (terminal-local-value 'function-key-map nil) m)) -;; The terminal intialization C code file might have initialized -;; function keys F13->F60 from the termcap/terminfo information. On -;; a PC-style keyboard these keys correspond to -;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The -;; code here subsitutes the corresponding defintions in -;; 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 'function-key-map nil))) - ;; This stuff takes several seconds; don't do it unless the keys - ;; seem to be defined. - (when (lookup-key m [f13]) - (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))) - - ;; Set up colors, for those versions of xterm that support it. (defvar xterm-standard-colors ;; The names in the comments taken from XTerm-col.ad in the xterm