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

[gnu-emacs] / lisp / term / mac-win.el

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 22bd55e5943b6d71053c2695714eaf724a35771a..03971a95db60c06512e4d31bb6c48ce1a83bfea3 100644 (file)
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1059,20 +1059,21 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 
 ;; Map certain keypad keys into ASCII characters
 ;; that people usually expect.
-(define-key function-key-map [backspace] [?\d])
-(define-key function-key-map [delete] [?\d])
-(define-key function-key-map [tab] [?\t])
-(define-key function-key-map [linefeed] [?\n])
-(define-key function-key-map [clear] [?\C-l])
-(define-key function-key-map [return] [?\C-m])
-(define-key function-key-map [escape] [?\e])
-(define-key function-key-map [M-backspace] [?\M-\d])
-(define-key function-key-map [M-delete] [?\M-\d])
-(define-key function-key-map [M-tab] [?\M-\t])
-(define-key function-key-map [M-linefeed] [?\M-\n])
-(define-key function-key-map [M-clear] [?\M-\C-l])
-(define-key function-key-map [M-return] [?\M-\C-m])
-(define-key function-key-map [M-escape] [?\M-\e])
+(let ((m (terminal-local-value 'function-key-map nil)))
+  (define-key m [backspace] [?\d])
+  (define-key m [delete] [?\d])
+  (define-key m [tab] [?\t])
+  (define-key m [linefeed] [?\n])
+  (define-key m [clear] [?\C-l])
+  (define-key m [return] [?\C-m])
+  (define-key m [escape] [?\e])
+  (define-key m [M-backspace] [?\M-\d])
+  (define-key m [M-delete] [?\M-\d])
+  (define-key m [M-tab] [?\M-\t])
+  (define-key m [M-linefeed] [?\M-\n])
+  (define-key m [M-clear] [?\M-\C-l])
+  (define-key m [M-return] [?\M-\C-m])
+  (define-key m [M-escape] [?\M-\e]))
 
 ;; These tell read-char how to convert
 ;; these special chars to ASCII.
@@ -1139,7 +1140,7 @@ correspoinding TextEncodingBase value."
     (set-keyboard-coding-system (or coding-system 'mac-roman))
     ;; MacJapanese maps reverse solidus to ?\x80.
     (if (eq coding-system 'japanese-shift-jis)
-       (define-key key-translation-map [?\x80] "\\"))))
+       (define-key global-key-translation-map [?\x80] "\\"))))
 
 (define-key special-event-map [language-change] 'mac-handle-language-change)
 \f