[Emacs-diffs] Changes to emacs/lisp/term/tvi970.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/08/29 05:28:10

Index: lisp/term/tvi970.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term/tvi970.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- lisp/term/tvi970.el 13 Aug 2007 13:41:28 -0000      1.18
+++ lisp/term/tvi970.el 29 Aug 2007 05:28:00 -0000      1.19
@@ -31,14 +31,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 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 function-key-map
+                     (define-key local-function-key-map
                        (car key-binding) (nth 1 key-binding))))
          '(
            ;; These are set up by termcap or terminfo
@@ -87,23 +87,24 @@
   ;; The numeric keypad keys.
   (let ((i 0))
     (while (< i 10)
-      (define-key function-key-map
+      (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 function-key-map
+      (define-key local-function-key-map
        (format "\e?%c" (+ i ?a))
        (vector (intern (format "f%d" (1+ i)))))
-      (define-key function-key-map
+      (define-key local-function-key-map
        (format "\e?%c" (+ i ?A))
        (vector (intern (format "S-f%d" (1+ i)))))
       (setq i (1+ i))))
 
   (tvi970-set-keypad-mode 1))
 
+
 ;;; Should keypad numbers send ordinary digits or distinct escape sequences?
 (defvar tvi970-keypad-numeric nil
   "Non-nil means the terminal should be in numeric keypad mode.