# HG changeset patch # User Dan Nicolaescu # Date 1122052264 0 # Node ID d5254bde5ea561e03189336a735c5e7d0ae1fb2f # Parent bea731b504621b3124a06c71114e948bc98c2a09 * term/rxvt.el (function-key-map): Use substitute-key-definition to bind {C,S,C-S}-{f1-f10}. Add a few missing key bindings. * term/cygwin.el: New file. diff -r bea731b50462 -r d5254bde5ea5 lisp/ChangeLog --- a/lisp/ChangeLog Fri Jul 22 14:22:02 2005 +0000 +++ b/lisp/ChangeLog Fri Jul 22 17:11:04 2005 +0000 @@ -1,3 +1,10 @@ +2005-07-22 Dan Nicolaescu + + * term/rxvt.el (function-key-map): Use substitute-key-definition + to bind {C,S,C-S}-{f1-f10}. Add a few missing key bindings. + + * term/cygwin.el: New file. + 2005-07-22 Kim F. Storm * image-file.el (insert-image-file, image-file-yank-handler): Fix diff -r bea731b50462 -r d5254bde5ea5 lisp/term/cygwin.el --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/term/cygwin.el Fri Jul 22 17:11:04 2005 +0000 @@ -0,0 +1,6 @@ +;;; cygwin.el --- support for the Cygwin terminal -*- no-byte-compile: t -*- + +;;; The Cygwin terminal can't really display underlines. +(tty-no-underline) + +;;; cygwin.el ends here diff -r bea731b50462 -r d5254bde5ea5 lisp/term/rxvt.el --- a/lisp/term/rxvt.el Fri Jul 22 14:22:02 2005 +0000 +++ b/lisp/term/rxvt.el Fri Jul 22 17:11:04 2005 +0000 @@ -26,6 +26,47 @@ ;;; Code: +;;; The terminal intialization C code file might have initialized +;;; function keys F11->F42 from the termcap/terminfo information. On +;;; a PC-style keyboard these keys correspond to +;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, 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 [f11] [S-f1] function-key-map) +(substitute-key-definition [f12] [S-f2] function-key-map) +(substitute-key-definition [f13] [S-f3] function-key-map) +(substitute-key-definition [f14] [S-f4] function-key-map) +(substitute-key-definition [f15] [S-f5] function-key-map) +(substitute-key-definition [f16] [S-f6] function-key-map) +(substitute-key-definition [f17] [S-f7] function-key-map) +(substitute-key-definition [f18] [S-f8] function-key-map) +(substitute-key-definition [f19] [S-f9] function-key-map) +(substitute-key-definition [f20] [S-f10] function-key-map) + +(substitute-key-definition [f23] [C-f1] function-key-map) +(substitute-key-definition [f24] [C-f2] function-key-map) +(substitute-key-definition [f25] [C-f3] function-key-map) +(substitute-key-definition [f26] [C-f4] function-key-map) +(substitute-key-definition [f27] [C-f5] function-key-map) +(substitute-key-definition [f28] [C-f6] function-key-map) +(substitute-key-definition [f29] [C-f7] function-key-map) +(substitute-key-definition [f30] [C-f8] function-key-map) +(substitute-key-definition [f31] [C-f9] function-key-map) +(substitute-key-definition [f32] [C-f10] function-key-map) + +(substitute-key-definition [f33] [C-S-f1] function-key-map) +(substitute-key-definition [f34] [C-S-f2] function-key-map) +(substitute-key-definition [f35] [C-S-f3] function-key-map) +(substitute-key-definition [f36] [C-S-f4] function-key-map) +(substitute-key-definition [f37] [C-S-f5] function-key-map) +(substitute-key-definition [f38] [C-S-f6] function-key-map) +(substitute-key-definition [f39] [C-S-f7] function-key-map) +(substitute-key-definition [f40] [C-S-f8] function-key-map) +(substitute-key-definition [f41] [C-S-f9] function-key-map) +(substitute-key-definition [f42] [C-S-f10] function-key-map) + ;; Set up function-key-map entries that termcap and terminfo don't know. (let ((map (make-sparse-keymap))) (define-key map "\e[A" [up]) @@ -48,8 +89,10 @@ (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]) + ;; The strings emitted by f11 and f12 are the same as the strings + ;; emitted by S-f1 and S-f2, so don't define f11 and f12. + ;; (define-key map "\e[23~" [f11]) + ;; (define-key map "\e[24~" [f12]) (define-key map "\e[29~" [print]) (define-key map "\e[11^" [C-f1]) @@ -62,23 +105,42 @@ (define-key map "\e[19^" [C-f8]) (define-key map "\e[20^" [C-f9]) (define-key map "\e[21^" [C-f10]) - (define-key map "\e[23^" [C-f11]) - (define-key map "\e[24^" [C-f12]) - (define-key map "\e[29~" [print]) + (define-key map "\e[23~" [S-f1]) + (define-key map "\e[24~" [S-f2]) + (define-key map "\e[25~" [S-f3]) + (define-key map "\e[26~" [S-f4]) + (define-key map "\e[28~" [S-f5]) + (define-key map "\e[29~" [S-f6]) + (define-key map "\e[31~" [S-f7]) + (define-key map "\e[32~" [S-f8]) + (define-key map "\e[33~" [S-f9]) + (define-key map "\e[34~" [S-f10]) - (define-key map "\e[2;2~" [S-insert]) - (define-key map "\e[3$" [S-delete]) + (define-key map "\e[23^" [C-S-f1]) + (define-key map "\e[24^" [C-S-f2]) + (define-key map "\e[25^" [C-S-f3]) + (define-key map "\e[26^" [C-S-f4]) + (define-key map "\e[28^" [C-S-f5]) + (define-key map "\e[29^" [C-S-f6]) + (define-key map "\e[31^" [C-S-f7]) + (define-key map "\e[32^" [C-S-f8]) + (define-key map "\e[33^" [C-S-f9]) + (define-key map "\e[34^" [C-S-f10]) (define-key map "\e[2^" [C-insert]) (define-key map "\e[3^" [C-delete]) (define-key map "\e[5^" [C-prior]) (define-key map "\e[6^" [C-next]) + (define-key map "\e[7^" [C-home]) + (define-key map "\e[8^" [C-end]) (define-key map "\eOd" [C-left]) (define-key map "\eOc" [C-right]) (define-key map "\eOa" [C-up]) (define-key map "\eOb" [C-down]) + (define-key map "\e[2;2~" [S-insert]) + (define-key map "\e[3$" [S-delete]) (define-key map "\e[5$" [S-prior]) (define-key map "\e[6$" [S-next]) (define-key map "\e[8$" [S-end])