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

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

diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 75f43420013637b686fd59382be5245144296d28..9ab9cb0f6edf5635418361ff9354d95356e26849 100644 (file)
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -40,9 +40,9 @@
 
 (defun terminal-init-wyse50 ()
   "Terminal initialization function for wyse50."
-  (define-key function-key-map "\C-a" (make-keymap))
+  (define-key (terminal-local-value 'local-function-key-map nil) "\C-a" (make-keymap))
   (mapcar (function (lambda (key-definition)
-                     (define-key function-key-map
+                     (define-key (terminal-local-value 'local-function-key-map nil)
                        (car key-definition) (nth 1 key-definition))))
          '(
            ;; These might be set up by termcap and terminfo
@@ -100,11 +100,11 @@
            ("\eY"      [key-clear])            ;; Not an X keysym
 
            ;; These are totally strange :-)
-           ("\eW"      [?\C-?])            ;; Not an X keysym
-           ("\^a\^k\^m"        [funct-up]) ;; Not an X keysym
-           ("\^a\^j\^m"        [funct-down])  ;; Not an X keysym
-           ("\^a\^l\^m"        [funct-right]) ;; Not an X keysym
-           ("\^a\^h\^m"        [funct-left])  ;; Not an X keysym
+           ("\eW"      [?\C-?])                ;; Not an X keysym
+           ("\^a\^k\^m"        [funct-up])     ;; Not an X keysym
+           ("\^a\^j\^m"        [funct-down])   ;; Not an X keysym
+           ("\^a\^l\^m"        [funct-right])  ;; Not an X keysym
+           ("\^a\^h\^m"        [funct-left])   ;; Not an X keysym
            ("\^a\^m\^m"        [funct-return]) ;; Not an X keysym
            ("\^a\^i\^m"        [funct-tab])    ;; Not an X keysym
            ))