diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-06-26 03:19:45 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-06-26 03:19:45 +0000 |
commit | 2bb819d593a8cbf989a84c5346ba9386b89f6960 (patch) | |
tree | 4cf40e4f6ae44ce0230c4ae9ff31484b1e068023 /lisp/term/rxvt.el | |
parent | f01b6d17cc07655d6ce62a4ac5097947529b81a2 (diff) | |
download | emacs-2bb819d593a8cbf989a84c5346ba9386b89f6960.tar.gz |
Update Lisp code for a terminal-local `function-key-map'.
* lisp/term/x-win.el (x-setup-function-keys): New function. Move
function-key-map tweaks here.
* lisp/faces.el (x-create-frame-with-faces): Call x-setup-function-keys.
* lisp/term/iris-ansi.el: Update for terminal-local function-key-map.
* lisp/term/lk201.el: Ditto.
* lisp/term/news.el: Ditto.
* lisp/term/rxvt.el: Ditto.
* lisp/term/sun.el: Ditto.
* lisp/term/xterm.el: Ditto.
* lisp/startup.el: Cosmetic change.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-356
Diffstat (limited to 'lisp/term/rxvt.el')
-rw-r--r-- | lisp/term/rxvt.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 180e0b40946..6b824ecd0b9 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -36,7 +36,6 @@ (setq rxvt-function-map (make-sparse-keymap)) ;; Set up function-key-map entries that termcap and terminfo don't know. - ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey (define-key rxvt-function-map "\e[A" [up]) (define-key rxvt-function-map "\e[B" [down]) (define-key rxvt-function-map "\e[C" [right]) @@ -95,13 +94,14 @@ (define-key rxvt-function-map "\e[d" [S-left]) (define-key rxvt-function-map "\e[c" [S-right]) (define-key rxvt-function-map "\e[a" [S-up]) - (define-key rxvt-function-map "\e[b" [S-down]) - - ;; 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 rxvt-function-map (keymap-parent function-key-map)) - (set-keymap-parent function-key-map rxvt-function-map)) + (define-key rxvt-function-map "\e[b" [S-down])) + +;; 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. +(let ((m (copy-keymap rxvt-function-map))) + (set-keymap-parent m (keymap-parent function-key-map)) + (set-keymap-parent function-key-map m)) ;; Set up colors, for those versions of rxvt that support it. |