Merged in changes from CVS trunk. Plus added lisp/term tweaks.

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

diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 23eea911b794d6199dc2f032f8b0081249c5cc76..8d8ef51c4a1c7468f3c706d6d0d9a004641c5d30 100644 (file)
--- 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 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 '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)))
 
   ;; Miscellaneous keys
   (mapcar (function (lambda (key-binding)
-                     (define-key function-key-map
+                     (define-key (terminal-local-value 'local-function-key-map nil)
                        (car key-binding) (nth 1 key-binding))))
          '(
            ;; These are set up by termcap or terminfo
@@ -53,7 +53,7 @@
            ("\e[@"     [insert])
            ("\e[L"     [insertline])
            ("\e[M"     [deleteline])
-           ("\e[U"     [next]) ;; actually the `page' key
+           ("\e[U"     [next])         ;; actually the `page' key
 
            ;; These won't be set up by either
            ("\eOm"     [kp-subtract])
@@ -86,22 +86,23 @@
   ;; The numeric keypad keys.
   (let ((i 0))
     (while (< i 10)
-      (define-key function-key-map
+      (define-key (terminal-local-value 'local-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 'local-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 'local-function-key-map nil)
        (format "\e?%c" (+ i ?A))
        (vector (intern (format "S-f%d" (1+ i)))))
       (setq i (1+ i))))
 
   (tvi970-set-keypad-mode 1))
+
 \f
 ;;; Should keypad numbers send ordinary digits or distinct escape sequences?
 (defvar tvi970-keypad-numeric nil