Fix semantics of terminal-local variables. Remove `terminal-local-value' hack.

* src/data.c (do_symval_forwarding, store_symval_forwarding)
  (find_symbol_value): Use the selected frame's keyboard, not
  current_kboard.

* src/data.c (Fterminal_local_value, Fset_terminal_local_value): Disable
  these functions.

* src/data.c (syms_of_data): Don't defsubr them.
* lisp/edmacro.el (edmacro-format-keys): Remove terminal-local-value calls.
* lisp/emulation/cua-base.el (cua--pre-command-handler-1): Ditto.
* lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto.
* lisp/isearch.el (isearch-other-meta-char): Ditto.
* lisp/obsolete/keyswap.el (the-table): Ditto.
* lisp/simple.el (normal-erase-is-backspace-mode): Ditto.
* lisp/subr.el (keyboard-translate, read-quoted-char): Ditto.
* lisp/term/AT386.el (terminal-init-AT386): Ditto.
* lisp/term/internal.el: Ditto.
* lisp/term/iris-ansi.el (terminal-init-iris-ansi): Ditto.
* lisp/term/lk201.el (terminal-init-lk201): Ditto.
* lisp/term/mac-win.el: Ditto.
* lisp/term/news.el (terminal-init-news): Ditto.
* lisp/term/rxvt.el (terminal-init-rxvt): Ditto.
* lisp/term/sun.el (terminal-init-sun): Ditto.
* lisp/term/tvi970.el (terminal-init-tvi970): Ditto.
* lisp/term/vt200.el (terminal-init-vt200): Ditto.
* lisp/term/vt201.el (terminal-init-vt201): Ditto.
* lisp/term/vt220.el (terminal-init-vt220): Ditto.
* lisp/term/vt240.el (terminal-init-vt240): Ditto.
* lisp/term/vt300.el (terminal-init-vt300): Ditto.
* lisp/term/vt320.el (terminal-init-vt320): Ditto.
* lisp/term/vt400.el (terminal-init-vt400): Ditto.
* lisp/term/vt420.el (terminal-init-vt420): Ditto.
* lisp/term/wyse50.el (terminal-init-wyse50): Ditto.
* lisp/term/x-win.el (x-setup-function-keys): Ditto.
* lisp/term/xterm.el (terminal-init-xterm): Ditto.


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

1 files changed, 32 insertions, 33 deletions

diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index 2c629fba29c..cb3d019d640 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -132,46 +132,45 @@
     ;; 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 [f11] [S-f1] m)
-      (substitute-key-definition [f12] [S-f2] m)
-      (substitute-key-definition [f13] [S-f3] m)
-      (substitute-key-definition [f14] [S-f4] m)
-      (substitute-key-definition [f15] [S-f5] m)
-      (substitute-key-definition [f16] [S-f6] m)
-      (substitute-key-definition [f17] [S-f7] m)
-      (substitute-key-definition [f18] [S-f8] m)
-      (substitute-key-definition [f19] [S-f9] m)
-      (substitute-key-definition [f20] [S-f10] m)
+    (substitute-key-definition [f11] [S-f1] local-function-key-map)
+    (substitute-key-definition [f12] [S-f2] local-function-key-map)
+    (substitute-key-definition [f13] [S-f3] local-function-key-map)
+    (substitute-key-definition [f14] [S-f4] local-function-key-map)
+    (substitute-key-definition [f15] [S-f5] local-function-key-map)
+    (substitute-key-definition [f16] [S-f6] local-function-key-map)
+    (substitute-key-definition [f17] [S-f7] local-function-key-map)
+    (substitute-key-definition [f18] [S-f8] local-function-key-map)
+    (substitute-key-definition [f19] [S-f9] local-function-key-map)
+    (substitute-key-definition [f20] [S-f10] local-function-key-map)
 
-      (substitute-key-definition [f23] [C-f1] m)
-      (substitute-key-definition [f24] [C-f2] m)
-      (substitute-key-definition [f25] [C-f3] m)
-      (substitute-key-definition [f26] [C-f4] m)
-      (substitute-key-definition [f27] [C-f5] m)
-      (substitute-key-definition [f28] [C-f6] m)
-      (substitute-key-definition [f29] [C-f7] m)
-      (substitute-key-definition [f30] [C-f8] m)
-      (substitute-key-definition [f31] [C-f9] m)
-      (substitute-key-definition [f32] [C-f10] m)
+    (substitute-key-definition [f23] [C-f1] local-function-key-map)
+    (substitute-key-definition [f24] [C-f2] local-function-key-map)
+    (substitute-key-definition [f25] [C-f3] local-function-key-map)
+    (substitute-key-definition [f26] [C-f4] local-function-key-map)
+    (substitute-key-definition [f27] [C-f5] local-function-key-map)
+    (substitute-key-definition [f28] [C-f6] local-function-key-map)
+    (substitute-key-definition [f29] [C-f7] local-function-key-map)
+    (substitute-key-definition [f30] [C-f8] local-function-key-map)
+    (substitute-key-definition [f31] [C-f9] local-function-key-map)
+    (substitute-key-definition [f32] [C-f10] local-function-key-map)
 
-      (substitute-key-definition [f33] [C-S-f1] m)
-      (substitute-key-definition [f34] [C-S-f2] m)
-      (substitute-key-definition [f35] [C-S-f3] m)
-      (substitute-key-definition [f36] [C-S-f4] m)
-      (substitute-key-definition [f37] [C-S-f5] m)
-      (substitute-key-definition [f38] [C-S-f6] m)
-      (substitute-key-definition [f39] [C-S-f7] m)
-      (substitute-key-definition [f40] [C-S-f8] m)
-      (substitute-key-definition [f41] [C-S-f9] m)
-      (substitute-key-definition [f42] [C-S-f10] m))
+    (substitute-key-definition [f33] [C-S-f1] local-function-key-map)
+    (substitute-key-definition [f34] [C-S-f2] local-function-key-map)
+    (substitute-key-definition [f35] [C-S-f3] local-function-key-map)
+    (substitute-key-definition [f36] [C-S-f4] local-function-key-map)
+    (substitute-key-definition [f37] [C-S-f5] local-function-key-map)
+    (substitute-key-definition [f38] [C-S-f6] local-function-key-map)
+    (substitute-key-definition [f39] [C-S-f7] local-function-key-map)
+    (substitute-key-definition [f40] [C-S-f8] local-function-key-map)
+    (substitute-key-definition [f41] [C-S-f9] local-function-key-map)
+    (substitute-key-definition [f42] [C-S-f10] local-function-key-map)
 
     ;; 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 (terminal-local-value 'local-function-key-map nil)))
-      (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m)))
+      (set-keymap-parent m (keymap-parent local-function-key-map))
+      (set-keymap-parent local-function-key-map m)))
 
   ;; Initialize colors and background mode.
   (rxvt-register-default-colors)