Mercurial > emacs
changeset 85203:30c3da951eae
(xterm-function-map, xterm-alternatives-map): Use the
`meta' modifier consistently, rather than using sometimes meta
sometimes alt.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 12 Oct 2007 15:32:23 +0000 |
| parents | 6dd5eea8be7d |
| children | 255eda0011c7 |
| files | lisp/ChangeLog lisp/term/xterm.el |
| diffstat | 2 files changed, 40 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Oct 12 08:51:23 2007 +0000 +++ b/lisp/ChangeLog Fri Oct 12 15:32:23 2007 +0000 @@ -1,3 +1,9 @@ +2007-10-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * term/xterm.el (xterm-function-map, xterm-alternatives-map): Use the + `meta' modifier consistently, rather than using sometimes meta + sometimes alt. + 2007-10-12 Martin Rudalics <rudalics@gmx.at> * window.el (handle-select-window): Revert part of 2007-10-08
--- a/lisp/term/xterm.el Fri Oct 12 08:51:23 2007 +0000 +++ b/lisp/term/xterm.el Fri Oct 12 15:32:23 2007 +0000 @@ -89,18 +89,18 @@ (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 "\eO3P" [M-f1]) + (define-key map "\eO3Q" [M-f2]) + (define-key map "\eO3R" [M-f3]) + (define-key map "\eO3S" [M-f4]) + (define-key map "\e[15;3~" [M-f5]) + (define-key map "\e[17;3~" [M-f6]) + (define-key map "\e[18;3~" [M-f7]) + (define-key map "\e[19;3~" [M-f8]) + (define-key map "\e[20;3~" [M-f9]) + (define-key map "\e[21;3~" [M-f10]) + (define-key map "\e[23;3~" [M-f11]) + (define-key map "\e[24;3~" [M-f12]) (define-key map "\eO4P" [M-S-f1]) (define-key map "\eO4Q" [M-S-f2]) @@ -164,12 +164,12 @@ (define-key map "\e[1;8F" [C-M-S-end]) (define-key map "\e[1;8H" [C-M-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[1;3A" [M-up]) + (define-key map "\e[1;3B" [M-down]) + (define-key map "\e[1;3C" [M-right]) + (define-key map "\e[1;3D" [M-left]) + (define-key map "\e[1;3F" [M-end]) + (define-key map "\e[1;3H" [M-home]) (define-key map "\e[2~" [insert]) (define-key map "\e[3~" [delete]) @@ -206,10 +206,10 @@ (define-key map "\e[5;8~" [C-M-S-prior]) (define-key map "\e[6;8~" [C-M-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 "\e[2;3~" [M-insert]) + (define-key map "\e[3;3~" [M-delete]) + (define-key map "\e[5;3~" [M-prior]) + (define-key map "\e[6;3~" [M-next]) (define-key map "\e[4~" [select]) (define-key map "\e[29~" [print]) @@ -425,18 +425,18 @@ (define-key map [f47] [C-S-f11]) (define-key map [f48] [C-S-f12]) - (define-key map [f49] [A-f1]) - (define-key map [f50] [A-f2]) - (define-key map [f51] [A-f3]) - (define-key map [f52] [A-f4]) - (define-key map [f53] [A-f5]) - (define-key map [f54] [A-f6]) - (define-key map [f55] [A-f7]) - (define-key map [f56] [A-f8]) - (define-key map [f57] [A-f9]) - (define-key map [f58] [A-f10]) - (define-key map [f59] [A-f11]) - (define-key map [f60] [A-f12]) + (define-key map [f49] [M-f1]) + (define-key map [f50] [M-f2]) + (define-key map [f51] [M-f3]) + (define-key map [f52] [M-f4]) + (define-key map [f53] [M-f5]) + (define-key map [f54] [M-f6]) + (define-key map [f55] [M-f7]) + (define-key map [f56] [M-f8]) + (define-key map [f57] [M-f9]) + (define-key map [f58] [M-f10]) + (define-key map [f59] [M-f11]) + (define-key map [f60] [M-f12]) map) "Keymap of possible alternative meanings for some keys.")