diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-09 19:04:34 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-09 19:04:34 +0000 |
commit | af520c4a4e04e55c854bb782af8df8412028c481 (patch) | |
tree | 10def401ec0f2c648dc480d2ff5185d43ee45f7d /lisp/term/iris-ansi.el | |
parent | 5b65d888a676b023b7232b460105551e51a58a13 (diff) | |
download | emacs-af520c4a4e04e55c854bb782af8df8412028c481.tar.gz |
Fix function-key-map massaging vs `C-x 5 2' in lisp/term/*.el. (Submitted by Dan Nicolaescu.)
* term/lk201.el (terminal-init-lk201):
* term/iris-ansi.el (terminal-init-iris-ansi):
* term/rxvt.el (terminal-init-rxvt): Protect function-key-map
against multiple invocations from the same terminal.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-403
Diffstat (limited to 'lisp/term/iris-ansi.el')
-rw-r--r-- | lisp/term/iris-ansi.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 42f0912ed2f..d751ca69057 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -331,12 +331,15 @@ (defun terminal-init-iris-ansi () "Terminal initialization function for iris-ansi." - ;; Use inheritance to let the main keymap override these defaults. - ;; This way we don't override terminfo-derived settings or settings - ;; made in the .emacs file. - (let ((m (copy-keymap iris-function-map))) - (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) - (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m))) + ;; The terminal-local stuff only need to be set up on the first + ;; frame on that device. + (when (eq 1 (length (frames-on-display-list))) + ;; Use inheritance to let the main keymap override these defaults. + ;; This way we don't override terminfo-derived settings or settings + ;; made in the .emacs file. + (let ((m (copy-keymap iris-function-map))) + (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil))) + (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m)))) ;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b ;;; iris-ansi.el ends here |