Merged from miles@gnu.org--gnu-2005 (patch 469)

[gnu-emacs] / lisp / term / tvi970.el

diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index c24464fbbd5972ded706c43e246c9c7a0169d335..54b1b6bc3a6ff03f2cfc95588a239ab8a9736ce1 100644 (file)
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -28,14 +28,14 @@
 
 ;;; Code:
 
-(or (lookup-key function-key-map "\e[")
-    (define-key function-key-map "\e[" (make-keymap)))
-;; (or (lookup-key function-key-map "\eO")
-;;    (define-key function-key-map "\eO" (make-keymap)))
+(or (lookup-key (terminal-local-value 'function-key-map nil) "\e[")
+    (define-key (terminal-local-value 'function-key-map nil) "\e[" (make-keymap)))
+;; (or (lookup-key (terminal-local-value 'function-key-map nil) "\eO")
+;;    (define-key (terminal-local-value 'function-key-map nil) "\eO" (make-keymap)))
 
 ;; Miscellaneous keys
 (mapcar (function (lambda (key-binding)
-                   (define-key function-key-map
+                   (define-key (terminal-local-value 'function-key-map nil)
                      (car key-binding) (nth 1 key-binding))))
        '(
          ;; These are set up by termcap or terminfo
@@ -84,17 +84,17 @@
 ;; The numeric keypad keys.
 (let ((i 0))
   (while (< i 10)
-    (define-key function-key-map
+    (define-key (terminal-local-value 'function-key-map nil)
       (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 function-key-map
+    (define-key (terminal-local-value 'function-key-map nil)
       (format "\e?%c" (+ i ?a))
       (vector (intern (format "f%d" (1+ i)))))
-    (define-key function-key-map
+    (define-key (terminal-local-value 'function-key-map nil)
       (format "\e?%c" (+ i ?A))
       (vector (intern (format "S-f%d" (1+ i)))))
     (setq i (1+ i))))