Index: emacs/lisp/term/xterm.el
diff -c emacs/lisp/term/xterm.el:1.19 emacs/lisp/term/xterm.el:1.20
*** emacs/lisp/term/xterm.el:1.19 Fri Jul 22 18:40:14 2005
--- emacs/lisp/term/xterm.el Wed Jul 27 18:02:07 2005
***************
*** 26,254 ****
;;; Code:
! ;;; rxvt terminals sometimes set the TERM variable to "xterm", but
! ;;; rxvt's keybindings that are incompatible with xterm's. It is
! ;;; better in that case to load rxvt's terminal initialization file.
! (if (and (getenv "COLORTERM")
! (string-match "\\`rxvt" (getenv "COLORTERM")))
! (load "term/rxvt")
!
! ;;; 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)
!
! (let ((map (make-sparse-keymap)))
! (define-key map "\e[A" [up])
! (define-key map "\e[B" [down])
! (define-key map "\e[C" [right])
! (define-key map "\e[D" [left])
! (define-key map "\e[1~" [home])
! (define-key map "\e[2~" [insert])
! (define-key map "\e[3~" [delete])
! (define-key map "\e[4~" [select])
! (define-key map "\e[5~" [prior])
! (define-key map "\e[6~" [next])
! (define-key map "\e[11~" [f1])
! (define-key map "\e[12~" [f2])
! (define-key map "\e[13~" [f3])
! (define-key map "\e[14~" [f4])
! (define-key map "\e[15~" [f5])
! (define-key map "\e[17~" [f6])
! (define-key map "\e[18~" [f7])
! (define-key map "\e[19~" [f8])
! (define-key map "\e[20~" [f9])
! (define-key map "\e[21~" [f10])
! (define-key map "\e[23~" [f11])
! (define-key map "\e[24~" [f12])
! (define-key map "\e[29~" [print])
!
! (define-key map "\eOP" [f1])
! (define-key map "\eOQ" [f2])
! (define-key map "\eOR" [f3])
! (define-key map "\eOS" [f4])
!
! (define-key map "\eO2P" [S-f1])
! (define-key map "\eO2Q" [S-f2])
! (define-key map "\eO2R" [S-f3])
! (define-key map "\eO2S" [S-f4])
! (define-key map "\e[15;2~" [S-f5])
! (define-key map "\e[17;2~" [S-f6])
! (define-key map "\e[18;2~" [S-f7])
! (define-key map "\e[19;2~" [S-f8])
! (define-key map "\e[20;2~" [S-f9])
! (define-key map "\e[21;2~" [S-f10])
! (define-key map "\e[23;2~" [S-f11])
! (define-key map "\e[24;2~" [S-f12])
!
! (define-key map "\eO5P" [C-f1])
! (define-key map "\eO5Q" [C-f2])
! (define-key map "\eO5R" [C-f3])
! (define-key map "\eO5S" [C-f4])
! (define-key map "\e[15;5~" [C-f5])
! (define-key map "\e[17;5~" [C-f6])
! (define-key map "\e[18;5~" [C-f7])
! (define-key map "\e[19;5~" [C-f8])
! (define-key map "\e[20;5~" [C-f9])
! (define-key map "\e[21;5~" [C-f10])
! (define-key map "\e[23;5~" [C-f11])
! (define-key map "\e[24;5~" [C-f12])
!
! (define-key map "\eO6P" [C-S-f1])
! (define-key map "\eO6Q" [C-S-f2])
! (define-key map "\eO6R" [C-S-f3])
! (define-key map "\eO6S" [C-S-f4])
! (define-key map "\e[15;6~" [C-S-f5])
! (define-key map "\e[17;6~" [C-S-f6])
! (define-key map "\e[18;6~" [C-S-f7])
! (define-key map "\e[19;6~" [C-S-f8])
! (define-key map "\e[20;6~" [C-S-f9])
! (define-key map "\e[21;6~" [C-S-f10])
! (define-key map "\e[23;6~" [C-S-f11])
! (define-key map "\e[24;6~" [C-S-f12])
!
! (define-key map "\eO3P" [A-f1])
! (define-key map "\eO3Q" [A-f2])
! (define-key map "\eO3R" [A-f3])
! (define-key map "\eO3S" [A-f4])
! (define-key map "\e[15;3~" [A-f5])
! (define-key map "\e[17;3~" [A-f6])
! (define-key map "\e[18;3~" [A-f7])
! (define-key map "\e[19;3~" [A-f8])
! (define-key map "\e[20;3~" [A-f9])
! (define-key map "\e[21;3~" [A-f10])
! (define-key map "\e[23;3~" [A-f11])
! (define-key map "\e[24;3~" [A-f12])
!
! (define-key map "\e[1;2A" [S-up])
! (define-key map "\e[1;2B" [S-down])
! (define-key map "\e[1;2C" [S-right])
! (define-key map "\e[1;2D" [S-left])
! (define-key map "\e[1;2F" [S-end])
! (define-key map "\e[1;2H" [S-home])
!
! (define-key map "\e[1;5A" [C-up])
! (define-key map "\e[1;5B" [C-down])
! (define-key map "\e[1;5C" [C-right])
! (define-key map "\e[1;5D" [C-left])
! (define-key map "\e[1;5F" [C-end])
! (define-key map "\e[1;5H" [C-home])
!
! (define-key map "\e[1;6A" [C-S-up])
! (define-key map "\e[1;6B" [C-S-down])
! (define-key map "\e[1;6C" [C-S-right])
! (define-key map "\e[1;6D" [C-S-left])
! (define-key map "\e[1;6F" [C-S-end])
! (define-key map "\e[1;6H" [C-S-home])
!
! (define-key map "\e[1;3A" [A-up])
! (define-key map "\e[1;3B" [A-down])
! (define-key map "\e[1;3C" [A-right])
! (define-key map "\e[1;3D" [A-left])
! (define-key map "\e[1;3F" [A-end])
! (define-key map "\e[1;3H" [A-home])
!
! (define-key map "\e[2;2~" [S-insert])
! (define-key map "\e[3;2~" [S-delete])
! (define-key map "\e[5;2~" [S-prior])
! (define-key map "\e[6;2~" [S-next])
!
! (define-key map "\e[2;5~" [C-insert])
! (define-key map "\e[3;5~" [C-delete])
! (define-key map "\e[5;5~" [C-prior])
! (define-key map "\e[6;5~" [C-next])
!
! (define-key map "\e[2;6~" [C-S-insert])
! (define-key map "\e[3;6~" [C-S-delete])
! (define-key map "\e[5;6~" [C-S-prior])
! (define-key map "\e[6;6~" [C-S-next])
!
! (define-key map "\e[2;3~" [A-insert])
! (define-key map "\e[3;3~" [A-delete])
! (define-key map "\e[5;3~" [A-prior])
! (define-key map "\e[6;3~" [A-next])
!
! (define-key map "\eOA" [up])
! (define-key map "\eOB" [down])
! (define-key map "\eOC" [right])
! (define-key map "\eOD" [left])
! (define-key map "\eOF" [end])
! (define-key map "\eOH" [home])
!
! (define-key map "\eO2A" [S-up])
! (define-key map "\eO2B" [S-down])
! (define-key map "\eO2C" [S-right])
! (define-key map "\eO2D" [S-left])
! (define-key map "\eO2F" [S-end])
! (define-key map "\eO2H" [S-home])
!
! (define-key map "\eO5A" [C-up])
! (define-key map "\eO5B" [C-down])
! (define-key map "\eO5C" [C-right])
! (define-key map "\eO5D" [C-left])
! (define-key map "\eO5F" [C-end])
! (define-key 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.
! (set-keymap-parent map (keymap-parent function-key-map))
! (set-keymap-parent function-key-map map))
;; Set up colors, for those versions of xterm that support it.
(defvar xterm-standard-colors
--- 26,263 ----
;;; Code:
! (defun terminal-init-xterm ()
! "Terminal initialization function for xterm."
! ;; rxvt terminals sometimes set the TERM variable to "xterm", but
! ;; rxvt's keybindings that are incompatible with xterm's. It is
! ;; better in that case to use rxvt's initializion function.
! (if (and (getenv "COLORTERM")
! (string-match "\\`rxvt" (getenv "COLORTERM")))
! (progn
! (load "term/rxvt")
! (terminal-init-rxvt))
!
! ;; 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)
!
! (let ((map (make-sparse-keymap)))
! (define-key map "\e[A" [up])
! (define-key map "\e[B" [down])
! (define-key map "\e[C" [right])
! (define-key map "\e[D" [left])
! (define-key map "\e[1~" [home])
! (define-key map "\e[2~" [insert])
! (define-key map "\e[3~" [delete])
! (define-key map "\e[4~" [select])
! (define-key map "\e[5~" [prior])
! (define-key map "\e[6~" [next])
! (define-key map "\e[11~" [f1])
! (define-key map "\e[12~" [f2])
! (define-key map "\e[13~" [f3])
! (define-key map "\e[14~" [f4])
! (define-key map "\e[15~" [f5])
! (define-key map "\e[17~" [f6])
! (define-key map "\e[18~" [f7])
! (define-key map "\e[19~" [f8])
! (define-key map "\e[20~" [f9])
! (define-key map "\e[21~" [f10])
! (define-key map "\e[23~" [f11])
! (define-key map "\e[24~" [f12])
! (define-key map "\e[29~" [print])
!
! (define-key map "\eOP" [f1])
! (define-key map "\eOQ" [f2])
! (define-key map "\eOR" [f3])
! (define-key map "\eOS" [f4])
!
! (define-key map "\eO2P" [S-f1])
! (define-key map "\eO2Q" [S-f2])
! (define-key map "\eO2R" [S-f3])
! (define-key map "\eO2S" [S-f4])
! (define-key map "\e[15;2~" [S-f5])
! (define-key map "\e[17;2~" [S-f6])
! (define-key map "\e[18;2~" [S-f7])
! (define-key map "\e[19;2~" [S-f8])
! (define-key map "\e[20;2~" [S-f9])
! (define-key map "\e[21;2~" [S-f10])
! (define-key map "\e[23;2~" [S-f11])
! (define-key map "\e[24;2~" [S-f12])
!
! (define-key map "\eO5P" [C-f1])
! (define-key map "\eO5Q" [C-f2])
! (define-key map "\eO5R" [C-f3])
! (define-key map "\eO5S" [C-f4])
! (define-key map "\e[15;5~" [C-f5])
! (define-key map "\e[17;5~" [C-f6])
! (define-key map "\e[18;5~" [C-f7])
! (define-key map "\e[19;5~" [C-f8])
! (define-key map "\e[20;5~" [C-f9])
! (define-key map "\e[21;5~" [C-f10])
! (define-key map "\e[23;5~" [C-f11])
! (define-key map "\e[24;5~" [C-f12])
!
! (define-key map "\eO6P" [C-S-f1])
! (define-key map "\eO6Q" [C-S-f2])
! (define-key map "\eO6R" [C-S-f3])
! (define-key map "\eO6S" [C-S-f4])
! (define-key map "\e[15;6~" [C-S-f5])
! (define-key map "\e[17;6~" [C-S-f6])
! (define-key map "\e[18;6~" [C-S-f7])
! (define-key map "\e[19;6~" [C-S-f8])
! (define-key map "\e[20;6~" [C-S-f9])
! (define-key map "\e[21;6~" [C-S-f10])
! (define-key map "\e[23;6~" [C-S-f11])
! (define-key map "\e[24;6~" [C-S-f12])
!
! (define-key map "\eO3P" [A-f1])
! (define-key map "\eO3Q" [A-f2])
! (define-key map "\eO3R" [A-f3])
! (define-key map "\eO3S" [A-f4])
! (define-key map "\e[15;3~" [A-f5])
! (define-key map "\e[17;3~" [A-f6])
! (define-key map "\e[18;3~" [A-f7])
! (define-key map "\e[19;3~" [A-f8])
! (define-key map "\e[20;3~" [A-f9])
! (define-key map "\e[21;3~" [A-f10])
! (define-key map "\e[23;3~" [A-f11])
! (define-key map "\e[24;3~" [A-f12])
!
! (define-key map "\e[1;2A" [S-up])
! (define-key map "\e[1;2B" [S-down])
! (define-key map "\e[1;2C" [S-right])
! (define-key map "\e[1;2D" [S-left])
! (define-key map "\e[1;2F" [S-end])
! (define-key map "\e[1;2H" [S-home])
!
! (define-key map "\e[1;5A" [C-up])
! (define-key map "\e[1;5B" [C-down])
! (define-key map "\e[1;5C" [C-right])
! (define-key map "\e[1;5D" [C-left])
! (define-key map "\e[1;5F" [C-end])
! (define-key map "\e[1;5H" [C-home])
!
! (define-key map "\e[1;6A" [C-S-up])
! (define-key map "\e[1;6B" [C-S-down])
! (define-key map "\e[1;6C" [C-S-right])
! (define-key map "\e[1;6D" [C-S-left])
! (define-key map "\e[1;6F" [C-S-end])
! (define-key map "\e[1;6H" [C-S-home])
!
! (define-key map "\e[1;3A" [A-up])
! (define-key map "\e[1;3B" [A-down])
! (define-key map "\e[1;3C" [A-right])
! (define-key map "\e[1;3D" [A-left])
! (define-key map "\e[1;3F" [A-end])
! (define-key map "\e[1;3H" [A-home])
!
! (define-key map "\e[2;2~" [S-insert])
! (define-key map "\e[3;2~" [S-delete])
! (define-key map "\e[5;2~" [S-prior])
! (define-key map "\e[6;2~" [S-next])
!
! (define-key map "\e[2;5~" [C-insert])
! (define-key map "\e[3;5~" [C-delete])
! (define-key map "\e[5;5~" [C-prior])
! (define-key map "\e[6;5~" [C-next])
!
! (define-key map "\e[2;6~" [C-S-insert])
! (define-key map "\e[3;6~" [C-S-delete])
! (define-key map "\e[5;6~" [C-S-prior])
! (define-key map "\e[6;6~" [C-S-next])
!
! (define-key map "\e[2;3~" [A-insert])
! (define-key map "\e[3;3~" [A-delete])
! (define-key map "\e[5;3~" [A-prior])
! (define-key map "\e[6;3~" [A-next])
!
! (define-key map "\eOA" [up])
! (define-key map "\eOB" [down])
! (define-key map "\eOC" [right])
! (define-key map "\eOD" [left])
! (define-key map "\eOF" [end])
! (define-key map "\eOH" [home])
!
! (define-key map "\eO2A" [S-up])
! (define-key map "\eO2B" [S-down])
! (define-key map "\eO2C" [S-right])
! (define-key map "\eO2D" [S-left])
! (define-key map "\eO2F" [S-end])
! (define-key map "\eO2H" [S-home])
!
! (define-key map "\eO5A" [C-up])
! (define-key map "\eO5B" [C-down])
! (define-key map "\eO5C" [C-right])
! (define-key map "\eO5D" [C-left])
! (define-key map "\eO5F" [C-end])
! (define-key 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.
! (set-keymap-parent map (keymap-parent function-key-map))
! (set-keymap-parent function-key-map map))
!
! ;; 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)))
;; Set up colors, for those versions of xterm that support it.
(defvar xterm-standard-colors
***************
*** 366,376 ****
;; right colors, so clear them.
(clear-face-cache)))
- ;; 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)
-
- )
;; arch-tag: 12e7ebdd-1e6c-4b25-b0f9-35ace25e855a
;;; xterm.el ends here
--- 375,379 ----
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
