Prevent resource allocation explosion when C-x 5 2 is used on xterms.

* lisp/term/xterm.el (terminal-init-xterm): Protect function-key-map
  against multiple invocations on the same terminal.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-401

diff --git a/README.multi-tty b/README.multi-tty
index 5a5ff63..aa11d95 100644 (file)
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -386,6 +386,11 @@ is probably not very interesting for anyone else.)
 THINGS TO DO
 ------------
 
+** Go through lisp/term/*.el once more and protect terminal-local
+   initializations with '(when (eq 1 (length (frames-on-display-list)))'
+   as in xterm.el.  This is to prevent resource allocation explosions
+   when C-x 5 2 is used repeatedly.
+
 ** Dan Nicolaescu writes:
    > The terminal initialization code still has some issues. 
    > This can be seen when using emacsclient -t on a 256 color xterm. The

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 3a5312d..607c24c 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -196,77 +196,80 @@
   ;; better in that case to use rxvt's initializion function.
   (if (and (server-getenv "COLORTERM")
           (string-match "\\`rxvt" (server-getenv "COLORTERM")))
-      (progn 
+      (progn
        (eval-when-compile (load "term/rxvt"))
        (terminal-init-rxvt))
 
-    ;; The terminal intialization C code file might have initialized
-    ;; function keys F13->F60 from the termcap/terminfo information.  On
-    ;; a PC-style keyboard these keys correspond to
-    ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
-    ;; code here subsitutes the corresponding defintions in
-    ;; function-key-map. This substitution is needed because if a key
-    ;; definition if found in function-key-map, there are no further
-    ;; lookups in other keymaps.
-    (let ((m (terminal-local-value 'local-function-key-map nil)))
-      (substitute-key-definition [f13] [S-f1] m)
-      (substitute-key-definition [f14] [S-f2] m)
-      (substitute-key-definition [f15] [S-f3] m)
-      (substitute-key-definition [f16] [S-f4] m)
-      (substitute-key-definition [f17] [S-f5] m)
-      (substitute-key-definition [f18] [S-f6] m)
-      (substitute-key-definition [f19] [S-f7] m)
-      (substitute-key-definition [f20] [S-f8] m)
-      (substitute-key-definition [f21] [S-f9] m)
-      (substitute-key-definition [f22] [S-f10] m)
-      (substitute-key-definition [f23] [S-f11] m)
-      (substitute-key-definition [f24] [S-f12] m)
-
-      (substitute-key-definition [f25] [C-f1] m)
-      (substitute-key-definition [f26] [C-f2] m)
-      (substitute-key-definition [f27] [C-f3] m)
-      (substitute-key-definition [f28] [C-f4] m)
-      (substitute-key-definition [f29] [C-f5] m)
-      (substitute-key-definition [f30] [C-f6] m)
-      (substitute-key-definition [f31] [C-f7] m)
-      (substitute-key-definition [f32] [C-f8] m)
-      (substitute-key-definition [f33] [C-f9] m)
-      (substitute-key-definition [f34] [C-f10] m)
-      (substitute-key-definition [f35] [C-f11] m)
-      (substitute-key-definition [f36] [C-f12] m)
-
-      (substitute-key-definition [f37] [C-S-f1] m)
-      (substitute-key-definition [f38] [C-S-f2] m)
-      (substitute-key-definition [f39] [C-S-f3] m)
-      (substitute-key-definition [f40] [C-S-f4] m)
-      (substitute-key-definition [f41] [C-S-f5] m)
-      (substitute-key-definition [f42] [C-S-f6] m)
-      (substitute-key-definition [f43] [C-S-f7] m)
-      (substitute-key-definition [f44] [C-S-f8] m)
-      (substitute-key-definition [f45] [C-S-f9] m)
-      (substitute-key-definition [f46] [C-S-f10] m)
-      (substitute-key-definition [f47] [C-S-f11] m)
-      (substitute-key-definition [f48] [C-S-f12] m)
-
-      (substitute-key-definition [f49] [A-f1] m)
-      (substitute-key-definition [f50] [A-f2] m)
-      (substitute-key-definition [f51] [A-f3] m)
-      (substitute-key-definition [f52] [A-f4] m)
-      (substitute-key-definition [f53] [A-f5] m)
-      (substitute-key-definition [f54] [A-f6] m)
-      (substitute-key-definition [f55] [A-f7] m)
-      (substitute-key-definition [f56] [A-f8] m)
-      (substitute-key-definition [f57] [A-f9] m)
-      (substitute-key-definition [f58] [A-f10] m)
-      (substitute-key-definition [f59] [A-f11] m)
-      (substitute-key-definition [f60] [A-f12] m))
-
-    ;; 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 xterm-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)))
+      ;; The terminal intialization C code file might have initialized
+      ;; function keys F13->F60 from the termcap/terminfo information.  On
+      ;; a PC-style keyboard these keys correspond to
+      ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-.  The
+      ;; code here subsitutes the corresponding defintions in
+      ;; function-key-map. This substitution is needed because if a key
+      ;; definition if found in function-key-map, there are no further
+      ;; lookups in other keymaps.
+      (let ((m (terminal-local-value 'local-function-key-map nil)))
+       (substitute-key-definition [f13] [S-f1] m)
+       (substitute-key-definition [f14] [S-f2] m)
+       (substitute-key-definition [f15] [S-f3] m)
+       (substitute-key-definition [f16] [S-f4] m)
+       (substitute-key-definition [f17] [S-f5] m)
+       (substitute-key-definition [f18] [S-f6] m)
+       (substitute-key-definition [f19] [S-f7] m)
+       (substitute-key-definition [f20] [S-f8] m)
+       (substitute-key-definition [f21] [S-f9] m)
+       (substitute-key-definition [f22] [S-f10] m)
+       (substitute-key-definition [f23] [S-f11] m)
+       (substitute-key-definition [f24] [S-f12] m)
+
+       (substitute-key-definition [f25] [C-f1] m)
+       (substitute-key-definition [f26] [C-f2] m)
+       (substitute-key-definition [f27] [C-f3] m)
+       (substitute-key-definition [f28] [C-f4] m)
+       (substitute-key-definition [f29] [C-f5] m)
+       (substitute-key-definition [f30] [C-f6] m)
+       (substitute-key-definition [f31] [C-f7] m)
+       (substitute-key-definition [f32] [C-f8] m)
+       (substitute-key-definition [f33] [C-f9] m)
+       (substitute-key-definition [f34] [C-f10] m)
+       (substitute-key-definition [f35] [C-f11] m)
+       (substitute-key-definition [f36] [C-f12] m)
+
+       (substitute-key-definition [f37] [C-S-f1] m)
+       (substitute-key-definition [f38] [C-S-f2] m)
+       (substitute-key-definition [f39] [C-S-f3] m)
+       (substitute-key-definition [f40] [C-S-f4] m)
+       (substitute-key-definition [f41] [C-S-f5] m)
+       (substitute-key-definition [f42] [C-S-f6] m)
+       (substitute-key-definition [f43] [C-S-f7] m)
+       (substitute-key-definition [f44] [C-S-f8] m)
+       (substitute-key-definition [f45] [C-S-f9] m)
+       (substitute-key-definition [f46] [C-S-f10] m)
+       (substitute-key-definition [f47] [C-S-f11] m)
+       (substitute-key-definition [f48] [C-S-f12] m)
+
+       (substitute-key-definition [f49] [A-f1] m)
+       (substitute-key-definition [f50] [A-f2] m)
+       (substitute-key-definition [f51] [A-f3] m)
+       (substitute-key-definition [f52] [A-f4] m)
+       (substitute-key-definition [f53] [A-f5] m)
+       (substitute-key-definition [f54] [A-f6] m)
+       (substitute-key-definition [f55] [A-f7] m)
+       (substitute-key-definition [f56] [A-f8] m)
+       (substitute-key-definition [f57] [A-f9] m)
+       (substitute-key-definition [f58] [A-f10] m)
+       (substitute-key-definition [f59] [A-f11] m)
+       (substitute-key-definition [f60] [A-f12] m))
+
+      ;; 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 xterm-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)))
 
     ;; Do it!
     (xterm-register-default-colors)