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, 8 insertions, 8 deletions

diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 8d8ef51c4a1..647e4cc2745 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -30,14 +30,14 @@
 
 (defun terminal-init-tvi970 ()
   "Terminal initialization function for tvi970."
-  (or (lookup-key (terminal-local-value 'local-function-key-map nil) "\e[")
-      (define-key (terminal-local-value 'local-function-key-map nil) "\e[" (make-keymap)))
-  ;; (or (lookup-key (terminal-local-value 'local-function-key-map nil) "\eO")
-  ;;    (define-key (terminal-local-value 'local-function-key-map nil) "\eO" (make-keymap)))
+  (or (lookup-key local-function-key-map "\e[")
+      (define-key local-function-key-map "\e[" (make-keymap)))
+  ;; (or (lookup-key local-function-key-map "\eO")
+  ;;    (define-key local-function-key-map "\eO" (make-keymap)))
 
   ;; Miscellaneous keys
   (mapcar (function (lambda (key-binding)
-		      (define-key (terminal-local-value 'local-function-key-map nil)
+		      (define-key local-function-key-map
 			(car key-binding) (nth 1 key-binding))))
 	  '(
 	    ;; These are set up by termcap or terminfo
@@ -86,17 +86,17 @@
   ;; The numeric keypad keys.
   (let ((i 0))
     (while (< i 10)
-      (define-key (terminal-local-value 'local-function-key-map nil)
+      (define-key local-function-key-map
 	(format "\eO%c" (+ i ?p))
 	(vector (intern (format "kp-%d" i))))
       (setq i (1+ i))))
   ;; The numbered function keys.
   (let ((i 0))
     (while (< i 16)
-      (define-key (terminal-local-value 'local-function-key-map nil)
+      (define-key local-function-key-map
 	(format "\e?%c" (+ i ?a))
 	(vector (intern (format "f%d" (1+ i)))))
-      (define-key (terminal-local-value 'local-function-key-map nil)
+      (define-key local-function-key-map
 	(format "\e?%c" (+ i ?A))
 	(vector (intern (format "S-f%d" (1+ i)))))
       (setq i (1+ i))))