diff lisp/term/xterm.el @ 83316:102194c6d773

Update Lisp code for a terminal-local `function-key-map'. * lisp/term/x-win.el (x-setup-function-keys): New function. Move function-key-map tweaks here. * lisp/faces.el (x-create-frame-with-faces): Call x-setup-function-keys. * lisp/term/iris-ansi.el: Update for terminal-local function-key-map. * lisp/term/lk201.el: Ditto. * lisp/term/news.el: Ditto. * lisp/term/rxvt.el: Ditto. * lisp/term/sun.el: Ditto. * lisp/term/xterm.el: Ditto. * lisp/startup.el: Cosmetic change. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-356

--- a/lisp/term/xterm.el	Sat Jun 25 16:34:30 2005 +0000
+++ b/lisp/term/xterm.el	Sun Jun 26 03:19:45 2005 +0000
@@ -31,72 +31,10 @@
 (defvar xterm-function-map nil
   "Function key map overrides for xterm.")
 
-;; Protect against reloads.
+;; Make reloads faster.
 (unless xterm-function-map
   (setq xterm-function-map (make-sparse-keymap))
 
-  ;; XXX We need to find a way to make these definitions display-local. -- Lorentey
-
-  ;; 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.
-  (substitute-key-definition [f13] [S-f1] function-key-map)
-  (substitute-key-definition [f14] [S-f2] function-key-map)
-  (substitute-key-definition [f15] [S-f3] function-key-map)
-  (substitute-key-definition [f16] [S-f4] function-key-map)
-  (substitute-key-definition [f17] [S-f5] function-key-map)
-  (substitute-key-definition [f18] [S-f6] function-key-map)
-  (substitute-key-definition [f19] [S-f7] function-key-map)
-  (substitute-key-definition [f20] [S-f8] function-key-map)
-  (substitute-key-definition [f21] [S-f9] function-key-map)
-  (substitute-key-definition [f22] [S-f10] function-key-map)
-  (substitute-key-definition [f23] [S-f11] function-key-map)
-  (substitute-key-definition [f24] [S-f12] function-key-map)
-
-  (substitute-key-definition [f25] [C-f1] function-key-map)
-  (substitute-key-definition [f26] [C-f2] function-key-map)
-  (substitute-key-definition [f27] [C-f3] function-key-map)
-  (substitute-key-definition [f28] [C-f4] function-key-map)
-  (substitute-key-definition [f29] [C-f5] function-key-map)
-  (substitute-key-definition [f30] [C-f6] function-key-map)
-  (substitute-key-definition [f31] [C-f7] function-key-map)
-  (substitute-key-definition [f32] [C-f8] function-key-map)
-  (substitute-key-definition [f33] [C-f9] function-key-map)
-  (substitute-key-definition [f34] [C-f10] function-key-map)
-  (substitute-key-definition [f35] [C-f11] function-key-map)
-  (substitute-key-definition [f36] [C-f12] function-key-map)
-
-  (substitute-key-definition [f37] [C-S-f1] function-key-map)
-  (substitute-key-definition [f38] [C-S-f2] function-key-map)
-  (substitute-key-definition [f39] [C-S-f3] function-key-map)
-  (substitute-key-definition [f40] [C-S-f4] function-key-map)
-  (substitute-key-definition [f41] [C-S-f5] function-key-map)
-  (substitute-key-definition [f42] [C-S-f6] function-key-map)
-  (substitute-key-definition [f43] [C-S-f7] function-key-map)
-  (substitute-key-definition [f44] [C-S-f8] function-key-map)
-  (substitute-key-definition [f45] [C-S-f9] function-key-map)
-  (substitute-key-definition [f46] [C-S-f10] function-key-map)
-  (substitute-key-definition [f47] [C-S-f11] function-key-map)
-  (substitute-key-definition [f48] [C-S-f12] function-key-map)
-
-  (substitute-key-definition [f49] [A-f1] function-key-map)
-  (substitute-key-definition [f50] [A-f2] function-key-map)
-  (substitute-key-definition [f51] [A-f3] function-key-map)
-  (substitute-key-definition [f52] [A-f4] function-key-map)
-  (substitute-key-definition [f53] [A-f5] function-key-map)
-  (substitute-key-definition [f54] [A-f6] function-key-map)
-  (substitute-key-definition [f55] [A-f7] function-key-map)
-  (substitute-key-definition [f56] [A-f8] function-key-map)
-  (substitute-key-definition [f57] [A-f9] function-key-map)
-  (substitute-key-definition [f58] [A-f10] function-key-map)
-  (substitute-key-definition [f59] [A-f11] function-key-map)
-  (substitute-key-definition [f60] [A-f12] function-key-map)
-
   (define-key xterm-function-map "\e[A" [up])
   (define-key xterm-function-map "\e[B" [down])
   (define-key xterm-function-map "\e[C" [right])
@@ -245,13 +183,75 @@
   (define-key xterm-function-map "\eO5C" [C-right])
   (define-key xterm-function-map "\eO5D" [C-left])
   (define-key xterm-function-map "\eO5F" [C-end])
-  (define-key xterm-function-map "\eO5H" [C-home])
+  (define-key xterm-function-map "\eO5H" [C-home]))
+
+;; 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 function-key-map))
+  (set-keymap-parent function-key-map 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.
+(substitute-key-definition [f13] [S-f1] function-key-map)
+(substitute-key-definition [f14] [S-f2] function-key-map)
+(substitute-key-definition [f15] [S-f3] function-key-map)
+(substitute-key-definition [f16] [S-f4] function-key-map)
+(substitute-key-definition [f17] [S-f5] function-key-map)
+(substitute-key-definition [f18] [S-f6] function-key-map)
+(substitute-key-definition [f19] [S-f7] function-key-map)
+(substitute-key-definition [f20] [S-f8] function-key-map)
+(substitute-key-definition [f21] [S-f9] function-key-map)
+(substitute-key-definition [f22] [S-f10] function-key-map)
+(substitute-key-definition [f23] [S-f11] function-key-map)
+(substitute-key-definition [f24] [S-f12] 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.
-  (set-keymap-parent xterm-function-map (keymap-parent function-key-map))
-  (set-keymap-parent function-key-map xterm-function-map))
+(substitute-key-definition [f25] [C-f1] function-key-map)
+(substitute-key-definition [f26] [C-f2] function-key-map)
+(substitute-key-definition [f27] [C-f3] function-key-map)
+(substitute-key-definition [f28] [C-f4] function-key-map)
+(substitute-key-definition [f29] [C-f5] function-key-map)
+(substitute-key-definition [f30] [C-f6] function-key-map)
+(substitute-key-definition [f31] [C-f7] function-key-map)
+(substitute-key-definition [f32] [C-f8] function-key-map)
+(substitute-key-definition [f33] [C-f9] function-key-map)
+(substitute-key-definition [f34] [C-f10] function-key-map)
+(substitute-key-definition [f35] [C-f11] function-key-map)
+(substitute-key-definition [f36] [C-f12] function-key-map)
+
+(substitute-key-definition [f37] [C-S-f1] function-key-map)
+(substitute-key-definition [f38] [C-S-f2] function-key-map)
+(substitute-key-definition [f39] [C-S-f3] function-key-map)
+(substitute-key-definition [f40] [C-S-f4] function-key-map)
+(substitute-key-definition [f41] [C-S-f5] function-key-map)
+(substitute-key-definition [f42] [C-S-f6] function-key-map)
+(substitute-key-definition [f43] [C-S-f7] function-key-map)
+(substitute-key-definition [f44] [C-S-f8] function-key-map)
+(substitute-key-definition [f45] [C-S-f9] function-key-map)
+(substitute-key-definition [f46] [C-S-f10] function-key-map)
+(substitute-key-definition [f47] [C-S-f11] function-key-map)
+(substitute-key-definition [f48] [C-S-f12] function-key-map)
+
+(substitute-key-definition [f49] [A-f1] function-key-map)
+(substitute-key-definition [f50] [A-f2] function-key-map)
+(substitute-key-definition [f51] [A-f3] function-key-map)
+(substitute-key-definition [f52] [A-f4] function-key-map)
+(substitute-key-definition [f53] [A-f5] function-key-map)
+(substitute-key-definition [f54] [A-f6] function-key-map)
+(substitute-key-definition [f55] [A-f7] function-key-map)
+(substitute-key-definition [f56] [A-f8] function-key-map)
+(substitute-key-definition [f57] [A-f9] function-key-map)
+(substitute-key-definition [f58] [A-f10] function-key-map)
+(substitute-key-definition [f59] [A-f11] function-key-map)
+(substitute-key-definition [f60] [A-f12] function-key-map)
+
 
 ;; Set up colors, for those versions of xterm that support it.
 (defvar xterm-standard-colors