[Emacs-diffs] Changes to emacs/lisp/term/xterm.el

[Dan Nicolaescu]

Index: emacs/lisp/term/xterm.el
diff -c emacs/lisp/term/xterm.el:1.14 emacs/lisp/term/xterm.el:1.15
*** emacs/lisp/term/xterm.el:1.14       Tue Apr 26 05:56:20 2005
--- emacs/lisp/term/xterm.el    Sun May  1 16:37:19 2005
***************
*** 26,31 ****
--- 26,91 ----
  
  ;;; Code:
  
+ ;;; 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])
***************
*** 183,248 ****
    (set-keymap-parent map (keymap-parent function-key-map))
    (set-keymap-parent function-key-map map))
  
- ;;; 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)
- 
  ;; 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
--- 243,248 ----