diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-09-04 03:48:17 +0000 |
| commit | fbf349734468d48b421c3d03074bb66dfcf3115b (patch) | |
| tree | 0a7d1ee844b6c591a5a499d23e35931945106e5a /lisp/term/iris-ansi.el | |
| parent | f0caabd962b662cccbea472995d86af718cc8d0b (diff) | |
| parent | 4b5fa40e1f1ba3cafde672863a0331311d1c2695 (diff) | |
| download | emacs-fbf349734468d48b421c3d03074bb66dfcf3115b.tar.gz | |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
Diffstat (limited to 'lisp/term/iris-ansi.el')
| -rw-r--r-- | lisp/term/iris-ansi.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index 4d99c3a355b..42f0912ed2f 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el @@ -1,6 +1,6 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. +;; Copyright (C) 1997, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu> @@ -135,10 +135,10 @@ (define-key iris-function-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>]) + ;;(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>]) (define-key iris-function-map "\e[Z" [?\S-\t]) (define-key iris-function-map "\e[072q" [?\C-\t]) @@ -329,12 +329,14 @@ (define-key iris-function-map "\e[196q" [C-delete]) (define-key iris-function-map "\e[197q" [M-delete])) -;; 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)) +(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))) ;;; arch-tag: b1d0e73a-bb7d-47be-9fb2-6fb126469a1b ;;; iris-ansi.el ends here |