Mercurial > emacs
changeset 85612:35afe0eebae6
(iris-function-map): Move initialization into declaration.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 24 Oct 2007 14:54:03 +0000 |
| parents | e435efc12d5a |
| children | ae9da278f53b |
| files | lisp/ChangeLog lisp/term/iris-ansi.el |
| diffstat | 2 files changed, 200 insertions(+), 201 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 24 12:27:53 2007 +0000 +++ b/lisp/ChangeLog Wed Oct 24 14:54:03 2007 +0000 @@ -1,3 +1,7 @@ +2007-10-24 Stefan Monnier <monnier@iro.umontreal.ca> + + * term/iris-ansi.el (iris-function-map): Move init into declaration. + 2007-10-24 Juanma Barranquero <lekktu@gmail.com> * buff-menu.el (Buffer-menu-sort-column): Doc fix. @@ -6,19 +10,19 @@ 2007-10-24 Carsten Dominik <dominik@science.uva.nl> - * textmodes/org.el (org-version): Changed to 5.13e. - (org-agenda-file-regexp): Fixed typo in docstring. - (org-add-planning-info): Fixed bug in parenthesis settings. + * textmodes/org.el (org-version): Change to 5.13e. + (org-agenda-file-regexp): Fix typo in docstring. + (org-add-planning-info): Fix bug in parenthesis settings. (org-scan-tags): Catch the case of indirect buffers with no filename. (org-fast-tag-selection, org-export-as-ascii, org-export-as-html): - Re-installed switch to mapc, had been removed by accident. + Re-install switch to mapc, had been removed by accident. (org-columns-map): New binding `C-c C-o'. - (org-columns-menu): Changed menu text and added new entry. - (org-columns-eval): Documented the use of `next-line'. + (org-columns-menu): Change menu text and added new entry. + (org-columns-eval): Document the use of `next-line'. (org-columns-open-link): New function. - (org-columns-follow-link): Function removed. + (org-columns-follow-link): Remove function. (org-open-link-from-string): New function. - (org-read-date-get-relative): Fixed typo in docstring. + (org-read-date-get-relative): Fix typo in docstring. (org-read-date-get-relative): Leading +/- is not optional. (org-agenda-get-restriction-and-command): Always resize window on first loop cycle.
--- a/lisp/term/iris-ansi.el Wed Oct 24 12:27:53 2007 +0000 +++ b/lisp/term/iris-ansi.el Wed Oct 24 14:54:03 2007 +0000 @@ -26,305 +26,300 @@ ;;; Code: -(defvar iris-function-map (make-sparse-keymap) - "Function key definitions for SGI xwsh and winterm apps.") +(defvar iris-function-map + (let ((map (make-sparse-keymap))) -(define-key iris-function-map "\e[120q" [S-escape]) -(define-key iris-function-map "\e[121q" [C-escape]) + (define-key map "\e[120q" [S-escape]) + (define-key map "\e[121q" [C-escape]) -(define-key iris-function-map "\e[001q" [f1]) -(define-key iris-function-map "\e[013q" [S-f1]) -(define-key iris-function-map "\e[025q" [C-f1]) + (define-key map "\e[001q" [f1]) + (define-key map "\e[013q" [S-f1]) + (define-key map "\e[025q" [C-f1]) -(define-key iris-function-map "\e[002q" [f2]) -(define-key iris-function-map "\e[014q" [S-f2]) -(define-key iris-function-map "\e[026q" [C-f2]) -(define-key iris-function-map "\e[038q" [M-f2]) + (define-key map "\e[002q" [f2]) + (define-key map "\e[014q" [S-f2]) + (define-key map "\e[026q" [C-f2]) + (define-key map "\e[038q" [M-f2]) -(define-key iris-function-map "\e[003q" [f3]) -(define-key iris-function-map "\e[015q" [S-f3]) -(define-key iris-function-map "\e[027q" [C-f3]) + (define-key map "\e[003q" [f3]) + (define-key map "\e[015q" [S-f3]) + (define-key map "\e[027q" [C-f3]) -(define-key iris-function-map "\e[004q" [f4]) -(define-key iris-function-map "\e[016q" [S-f4]) -(define-key iris-function-map "\e[028q" [C-f4]) + (define-key map "\e[004q" [f4]) + (define-key map "\e[016q" [S-f4]) + (define-key map "\e[028q" [C-f4]) -(define-key iris-function-map "\e[005q" [f5]) -(define-key iris-function-map "\e[017q" [S-f5]) -(define-key iris-function-map "\e[029q" [C-f5]) + (define-key map "\e[005q" [f5]) + (define-key map "\e[017q" [S-f5]) + (define-key map "\e[029q" [C-f5]) -(define-key iris-function-map "\e[006q" [f6]) -(define-key iris-function-map "\e[018q" [S-f6]) -(define-key iris-function-map "\e[030q" [C-f6]) + (define-key map "\e[006q" [f6]) + (define-key map "\e[018q" [S-f6]) + (define-key map "\e[030q" [C-f6]) -(define-key iris-function-map "\e[007q" [f7]) -(define-key iris-function-map "\e[019q" [S-f7]) -(define-key iris-function-map "\e[031q" [C-f7]) + (define-key map "\e[007q" [f7]) + (define-key map "\e[019q" [S-f7]) + (define-key map "\e[031q" [C-f7]) -(define-key iris-function-map "\e[008q" [f8]) -(define-key iris-function-map "\e[020q" [S-f8]) -(define-key iris-function-map "\e[032q" [C-f8]) + (define-key map "\e[008q" [f8]) + (define-key map "\e[020q" [S-f8]) + (define-key map "\e[032q" [C-f8]) -(define-key iris-function-map "\e[009q" [f9]) -(define-key iris-function-map "\e[021q" [S-f9]) -(define-key iris-function-map "\e[033q" [C-f9]) + (define-key map "\e[009q" [f9]) + (define-key map "\e[021q" [S-f9]) + (define-key map "\e[033q" [C-f9]) -(define-key iris-function-map "\e[010q" [f10]) -(define-key iris-function-map "\e[022q" [S-f10]) -(define-key iris-function-map "\e[034q" [C-f10]) + (define-key map "\e[010q" [f10]) + (define-key map "\e[022q" [S-f10]) + (define-key map "\e[034q" [C-f10]) -(define-key iris-function-map "\e[011q" [f11]) -(define-key iris-function-map "\e[023q" [S-f11]) -(define-key iris-function-map "\e[035q" [C-f11]) -(define-key iris-function-map "\e[047q" [M-f11]) + (define-key map "\e[011q" [f11]) + (define-key map "\e[023q" [S-f11]) + (define-key map "\e[035q" [C-f11]) + (define-key map "\e[047q" [M-f11]) -(define-key iris-function-map "\e[012q" [f12]) -(define-key iris-function-map "\e[024q" [S-f12]) -(define-key iris-function-map "\e[036q" [C-f12]) -(define-key iris-function-map "\e[048q" [M-f12]) + (define-key map "\e[012q" [f12]) + (define-key map "\e[024q" [S-f12]) + (define-key map "\e[036q" [C-f12]) + (define-key map "\e[048q" [M-f12]) -(define-key iris-function-map "\e[057q" [?\C-`]) -(define-key iris-function-map "\e[115q" [?\M-`]) + (define-key map "\e[057q" [?\C-`]) + (define-key map "\e[115q" [?\M-`]) -(define-key iris-function-map "\e[049q" [?\C-1]) -(define-key iris-function-map "\e[058q" [?\M-1]) + (define-key map "\e[049q" [?\C-1]) + (define-key map "\e[058q" [?\M-1]) -(define-key iris-function-map "\e[059q" [?\M-2]) + (define-key map "\e[059q" [?\M-2]) -(define-key iris-function-map "\e[050q" [?\C-3]) -(define-key iris-function-map "\e[060q" [?\M-3]) + (define-key map "\e[050q" [?\C-3]) + (define-key map "\e[060q" [?\M-3]) -(define-key iris-function-map "\e[051q" [?\C-4]) -(define-key iris-function-map "\e[061q" [?\M-4]) + (define-key map "\e[051q" [?\C-4]) + (define-key map "\e[061q" [?\M-4]) -(define-key iris-function-map "\e[052q" [?\C-5]) -(define-key iris-function-map "\e[062q" [?\M-5]) + (define-key map "\e[052q" [?\C-5]) + (define-key map "\e[062q" [?\M-5]) -(define-key iris-function-map "\e[063q" [?\M-6]) + (define-key map "\e[063q" [?\M-6]) -(define-key iris-function-map "\e[053q" [?\C-7]) -(define-key iris-function-map "\e[064q" [?\M-7]) + (define-key map "\e[053q" [?\C-7]) + (define-key map "\e[064q" [?\M-7]) -(define-key iris-function-map "\e[054q" [?\C-8]) -(define-key iris-function-map "\e[065q" [?\M-8]) + (define-key map "\e[054q" [?\C-8]) + (define-key map "\e[065q" [?\M-8]) -(define-key iris-function-map "\e[055q" [?\C-9]) -(define-key iris-function-map "\e[066q" [?\M-9]) + (define-key map "\e[055q" [?\C-9]) + (define-key map "\e[066q" [?\M-9]) -(define-key iris-function-map "\e[056q" [?\C-0]) -(define-key iris-function-map "\e[067q" [?\M-0]) + (define-key map "\e[056q" [?\C-0]) + (define-key map "\e[067q" [?\M-0]) -(define-key iris-function-map "\e[068q" [?\M--]) + (define-key map "\e[068q" [?\M--]) -(define-key iris-function-map "\e[069q" [?\C-=]) -(define-key iris-function-map "\e[070q" [?\M-=]) + (define-key map "\e[069q" [?\C-=]) + (define-key map "\e[070q" [?\M-=]) -;; I don't know what to do with those. -;;(define-key iris-function-map "^H" [<del>]) -;;(define-key iris-function-map "^H" [S-<del>]) -;;(define-key iris-function-map "\177" [C-<del>]) -;;(define-key iris-function-map "\e[071q" [M-<del>]) + ;; I don't know what to do with those. + ;;(define-key map "^H" [<del>]) + ;;(define-key map "^H" [S-<del>]) + ;;(define-key map "\177" [C-<del>]) + ;;(define-key map "\e[071q" [M-<del>]) -(define-key iris-function-map "\e[Z" [?\S-\t]) -(define-key iris-function-map "\e[072q" [?\C-\t]) -;; This only works if you remove the M-TAB keybing from the system.4Dwmrc -;; our your ~/.4Dwmrc, if you use the 4Dwm window manager. -(define-key iris-function-map "\e[073q" [?\M-\t]) + (define-key map "\e[Z" [?\S-\t]) + (define-key map "\e[072q" [?\C-\t]) + ;; This only works if you remove the M-TAB keybing from the system.4Dwmrc + ;; our your ~/.4Dwmrc, if you use the 4Dwm window manager. + (define-key map "\e[073q" [?\M-\t]) -(define-key iris-function-map "\e[074q" [?\M-q]) + (define-key map "\e[074q" [?\M-q]) -(define-key iris-function-map "\e[075q" [?\M-w]) + (define-key map "\e[075q" [?\M-w]) -(define-key iris-function-map "\e[076q" [?\M-e]) + (define-key map "\e[076q" [?\M-e]) -(define-key iris-function-map "\e[077q" [?\M-r]) + (define-key map "\e[077q" [?\M-r]) -(define-key iris-function-map "\e[078q" [?\M-t]) + (define-key map "\e[078q" [?\M-t]) -(define-key iris-function-map "\e[079q" [?\M-y]) + (define-key map "\e[079q" [?\M-y]) -(define-key iris-function-map "\e[080q" [?\M-u]) + (define-key map "\e[080q" [?\M-u]) -(define-key iris-function-map "\e[081q" [?\M-i]) + (define-key map "\e[081q" [?\M-i]) -(define-key iris-function-map "\e[082q" [?\M-o]) + (define-key map "\e[082q" [?\M-o]) -(define-key iris-function-map "\e[083q" [?\M-p]) + (define-key map "\e[083q" [?\M-p]) -(define-key iris-function-map "\e[084q" [?\M-\[]) + (define-key map "\e[084q" [?\M-\[]) -(define-key iris-function-map "\e[085q" [?\M-\]]) + (define-key map "\e[085q" [?\M-\]]) -(define-key iris-function-map "\e[086q" [?\M-\\]) - -(define-key iris-function-map "\e[087q" [?\M-a]) + (define-key map "\e[086q" [?\M-\\]) -(define-key iris-function-map "\e[088q" [?\M-s]) + (define-key map "\e[087q" [?\M-a]) -(define-key iris-function-map "\e[089q" [?\M-d]) + (define-key map "\e[088q" [?\M-s]) -(define-key iris-function-map "\e[090q" [?\M-f]) + (define-key map "\e[089q" [?\M-d]) -(define-key iris-function-map "\e[091q" [?\M-g]) + (define-key map "\e[090q" [?\M-f]) -(define-key iris-function-map "\e[092q" [?\M-h]) + (define-key map "\e[091q" [?\M-g]) -(define-key iris-function-map "\e[093q" [?\M-j]) + (define-key map "\e[092q" [?\M-h]) -(define-key iris-function-map "\e[094q" [?\M-k]) + (define-key map "\e[093q" [?\M-j]) -(define-key iris-function-map "\e[095q" [?\M-l]) + (define-key map "\e[094q" [?\M-k]) + + (define-key map "\e[095q" [?\M-l]) -(define-key iris-function-map "\e[096q" [?\C-\;]) -(define-key iris-function-map "\e[097q" [?\M-:]) ;; we are cheating - ;; here, this is realy - ;; M-;, but M-: - ;; generates the same - ;; string and is more - ;; usefull. + (define-key map "\e[096q" [?\C-\;]) + ;; We are cheating here, this is really M-;, but M-: generates the same + ;; string and is more useful. + (define-key map "\e[097q" [?\M-:]) -(define-key iris-function-map "\e[098q" [?\C-']) -(define-key iris-function-map "\e[099q" [?\M-']) + (define-key map "\e[098q" [?\C-']) + (define-key map "\e[099q" [?\M-']) -(define-key iris-function-map "\e[100q" [?\M-\n]) + (define-key map "\e[100q" [?\M-\n]) + + (define-key map "\e[101q" [?\M-z]) -(define-key iris-function-map "\e[101q" [?\M-z]) + (define-key map "\e[102q" [?\M-x]) -(define-key iris-function-map "\e[102q" [?\M-x]) + (define-key map "\e[103q" [?\M-c]) -(define-key iris-function-map "\e[103q" [?\M-c]) + (define-key map "\e[104q" [?\M-v]) -(define-key iris-function-map "\e[104q" [?\M-v]) + (define-key map "\e[105q" [?\M-b]) -(define-key iris-function-map "\e[105q" [?\M-b]) + (define-key map "\e[106q" [M-n]) -(define-key iris-function-map "\e[106q" [M-n]) + (define-key map "\e[107q" [M-m]) -(define-key iris-function-map "\e[107q" [M-m]) + (define-key map "\e[108q" [?\C-,]) + (define-key map "\e[109q" [?\M-,]) -(define-key iris-function-map "\e[108q" [?\C-,]) -(define-key iris-function-map "\e[109q" [?\M-,]) + (define-key map "\e[110q" [?\C-.]) + (define-key map "\e[111q" [?\M-.]) -(define-key iris-function-map "\e[110q" [?\C-.]) -(define-key iris-function-map "\e[111q" [?\M-.]) - -(define-key iris-function-map "\e[112q" [?\C-/]) -(define-key iris-function-map "\e[113q" [?\M-/]) + (define-key map "\e[112q" [?\C-/]) + (define-key map "\e[113q" [?\M-/]) -(define-key iris-function-map "\e[139q" [insert]) -(define-key iris-function-map "\e[139q" [S-insert]) -(define-key iris-function-map "\e[140q" [C-insert]) -(define-key iris-function-map "\e[141q" [M-insert]) + (define-key map "\e[139q" [insert]) + (define-key map "\e[139q" [S-insert]) + (define-key map "\e[140q" [C-insert]) + (define-key map "\e[141q" [M-insert]) -(define-key iris-function-map "\e[H" [home]) -(define-key iris-function-map "\e[143q" [S-home]) -(define-key iris-function-map "\e[144q" [C-home]) + (define-key map "\e[H" [home]) + (define-key map "\e[143q" [S-home]) + (define-key map "\e[144q" [C-home]) -(define-key iris-function-map "\e[150q" [prior]) -(define-key iris-function-map "\e[151q" [S-prior]) ;; those don't seem - ;; to generate - ;; anything -(define-key iris-function-map "\e[152q" [C-prior]) + (define-key map "\e[150q" [prior]) + (define-key map "\e[151q" [S-prior]) ;Those don't seem to generate anything. + (define-key map "\e[152q" [C-prior]) -;; (define-key iris-function-map "^?" [delete]) ?? something else seems to take care of this. -(define-key iris-function-map "\e[P" [S-delete]) -(define-key iris-function-map "\e[142q" [C-delete]) -(define-key iris-function-map "\e[M" [M-delete]) + ;; (define-key map "^?" [delete]) ?? something else seems to take care of this. + (define-key map "\e[P" [S-delete]) + (define-key map "\e[142q" [C-delete]) + (define-key map "\e[M" [M-delete]) -(define-key iris-function-map "\e[146q" [end]) -(define-key iris-function-map "\e[147q" [S-end]) ;; those don't seem to - ;; generate anything -(define-key iris-function-map "\e[148q" [C-end]) + (define-key map "\e[146q" [end]) + (define-key map "\e[147q" [S-end]) ; Those don't seem to generate anything. + (define-key map "\e[148q" [C-end]) -(define-key iris-function-map "\e[154q" [next]) -(define-key iris-function-map "\e[155q" [S-next]) -(define-key iris-function-map "\e[156q" [C-next]) + (define-key map "\e[154q" [next]) + (define-key map "\e[155q" [S-next]) + (define-key map "\e[156q" [C-next]) -(define-key iris-function-map "\e[161q" [S-up]) -(define-key iris-function-map "\e[162q" [C-up]) -(define-key iris-function-map "\e[163q" [M-up]) + (define-key map "\e[161q" [S-up]) + (define-key map "\e[162q" [C-up]) + (define-key map "\e[163q" [M-up]) -(define-key iris-function-map "\e[158q" [S-left]) -(define-key iris-function-map "\e[159q" [C-left]) -(define-key iris-function-map "\e[160q" [M-left]) + (define-key map "\e[158q" [S-left]) + (define-key map "\e[159q" [C-left]) + (define-key map "\e[160q" [M-left]) -(define-key iris-function-map "\e[164q" [S-down]) -(define-key iris-function-map "\e[165q" [C-down]) -(define-key iris-function-map "\e[166q" [M-down]) + (define-key map "\e[164q" [S-down]) + (define-key map "\e[165q" [C-down]) + (define-key map "\e[166q" [M-down]) -(define-key iris-function-map "\e[167q" [S-right]) -(define-key iris-function-map "\e[168q" [C-right]) -(define-key iris-function-map "\e[169q" [M-right]) + (define-key map "\e[167q" [S-right]) + (define-key map "\e[168q" [C-right]) + (define-key map "\e[169q" [M-right]) -;; Keypad functions, most of those are untested. -(define-key iris-function-map "\e[179q" [?\C-/]) -(define-key iris-function-map "\e[180q" [?\M-/]) + ;; Keypad functions, most of those are untested. + (define-key map "\e[179q" [?\C-/]) + (define-key map "\e[180q" [?\M-/]) -(define-key iris-function-map "\e[187q" [?\C-*]) -(define-key iris-function-map "\e[188q" [?\M-*]) + (define-key map "\e[187q" [?\C-*]) + (define-key map "\e[188q" [?\M-*]) -(define-key iris-function-map "\e[198q" [?\C--]) -(define-key iris-function-map "\e[199q" [?\M--]) + (define-key map "\e[198q" [?\C--]) + (define-key map "\e[199q" [?\M--]) -;; Something else takes care of home, up, prior, down, left, right, next -;(define-key iris-function-map "\e[H" [home]) -(define-key iris-function-map "\e[172q" [C-home]) + ;; Something else takes care of home, up, prior, down, left, right, next + ;;(define-key map "\e[H" [home]) + (define-key map "\e[172q" [C-home]) -;(define-key iris-function-map "\e[A" [up]) -(define-key iris-function-map "\e[182q" [C-up]) + ;;(define-key map "\e[A" [up]) + (define-key map "\e[182q" [C-up]) -;(define-key iris-function-map "\e[150q" [prior]) -(define-key iris-function-map "\e[190q" [C-prior]) + ;;(define-key map "\e[150q" [prior]) + (define-key map "\e[190q" [C-prior]) -(define-key iris-function-map "\e[200q" [?\C-+]) -(define-key iris-function-map "\e[201q" [?\M-+]) + (define-key map "\e[200q" [?\C-+]) + (define-key map "\e[201q" [?\M-+]) -;(define-key iris-function-map "\e[D" [left]) -(define-key iris-function-map "\e[174q" [C-left]) + ;;(define-key map "\e[D" [left]) + (define-key map "\e[174q" [C-left]) -(define-key iris-function-map "\e[000q" [begin]) -(define-key iris-function-map "\e[184q" [C-begin]) + (define-key map "\e[000q" [begin]) + (define-key map "\e[184q" [C-begin]) -;(define-key iris-function-map "\e[C" [right]) -(define-key iris-function-map "\e[192q" [C-right]) + ;;(define-key map "\e[C" [right]) + (define-key map "\e[192q" [C-right]) -;(define-key iris-function-map "\e[146q" [end]) -(define-key iris-function-map "\e[176q" [C-end]) + ;;(define-key map "\e[146q" [end]) + (define-key map "\e[176q" [C-end]) -;(define-key iris-function-map "\e[B" [down]) -(define-key iris-function-map "\e[186q" [C-down]) + ;;(define-key map "\e[B" [down]) + (define-key map "\e[186q" [C-down]) -;(define-key iris-function-map "\e[154q" [next]) -(define-key iris-function-map "\e[194q" [C-next]) + ;;(define-key map "\e[154q" [next]) + (define-key map "\e[194q" [C-next]) - -(define-key iris-function-map "\e[100q" [M-enter]) + (define-key map "\e[100q" [M-enter]) -(define-key iris-function-map "\e[139q" [insert]) -(define-key iris-function-map "\e[178q" [C-inset]) + (define-key map "\e[139q" [insert]) + (define-key map "\e[178q" [C-inset]) -(define-key iris-function-map "\e[P" [delete]) -(define-key iris-function-map "\e[196q" [C-delete]) -(define-key iris-function-map "\e[197q" [M-delete]) + (define-key map "\e[P" [delete]) + (define-key map "\e[196q" [C-delete]) + (define-key map "\e[197q" [M-delete]) + map) + "Function key definitions for SGI xwsh and winterm apps.") (defun terminal-init-iris-ansi () "Terminal initialization function for iris-ansi."