diff lisp/double.el @ 83346:7372c2f9daac

Rename function-key-map to local-function-key-map, and global-function-key-map to function-key-map. Same for key-translation-map. * src/keyboard.h (struct kboard): Rename member 'Vfunction_key_map' to 'Vlocal_function_key_map', and 'Vkey_translation_map' to 'Vlocal_key_translation_map'. (Vfunction_key_map, Vkey_translation_map): New declarations. * src/keyboard.c (Vfunction_key_map): New variable. (Vglobal_key_translation_map): Rename to Vglobal_key_translation_map. (read_key_sequence, init_kboard, syms_of_keyboard, mark_kboards): Update. * src/keymap.c (Fdescribe_buffer_bindings): Update. * src/term.c (term_get_fkeys_1): Update. * lisp/double.el (double-setup): Replace global-key-translation-map with key-translation-map. * lisp/international/encoded-kb.el (encoded-kbd-setup-display): Ditto. * lisp/international/iso-transl.el: Ditto. * lisp/obsolete/iso-acc.el (iso-accents-customize): Ditto. * lisp/edmacro.el (edmacro-format-keys): Use terminal-local binding of local-function-key-map instead of function-key-map. * lisp/emulation/cua-base.el (cua--pre-command-handler): Ditto. * lisp/isearch.el (isearch-other-meta-char): Ditto. * lisp/subr.el (read-quoted-char): Ditto. * lisp/term/vt200.el: Ditto. * lisp/term/vt201.el: Ditto. * lisp/term/vt220.el: Ditto. * lisp/term/vt240.el: Ditto. * lisp/term/vt300.el: Ditto. * lisp/term/vt320.el: Ditto. * lisp/term/vt400.el: Ditto. * lisp/term/vt420.el: Ditto. * lisp/simple.el (normal-erase-is-backspace-mode): Add todo note. * lisp/xt-mouse.el: Ditto. * lisp/term/AT386.el: Adapt for renaming of function-key-map to local-function-key-map. * lisp/term/internal.el: Ditto. * lisp/term/iris-ansi.el: Ditto. * lisp/term/lk201.el: Ditto. * lisp/term/mac-win.el: Ditto. * lisp/term/news.el: Ditto. * lisp/term/rxvt.el: Ditto. * lisp/term/sun.el: Ditto. * lisp/term/tvi970.el: Ditto. * lisp/term/wyse50.el: Ditto. * lisp/term/x-win.el (x-setup-function-keys): Ditto. * lisp/term/xterm.el: Ditto. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-386

--- a/lisp/double.el	Mon Jul 11 00:21:10 2005 +0000
+++ b/lisp/double.el	Tue Jul 12 10:55:24 2005 +0000
@@ -144,18 +144,18 @@
   (if enable-flag
       (progn
 	;; Set up key-translation-map as indicated by `double-map'.
-	;; XXX I don't think global-key-translation-map should be made local here. -- Lorentey
-	(kill-local-variable 'global-key-translation-map)
-	(make-local-variable 'global-key-translation-map)
-	(setq global-key-translation-map (if (keymapp global-key-translation-map)
-					     (copy-keymap global-key-translation-map)
+	;; XXX I don't think key-translation-map should be made local here. -- Lorentey
+	(kill-local-variable 'key-translation-map)
+	(make-local-variable 'key-translation-map)
+	(setq key-translation-map (if (keymapp key-translation-map)
+					     (copy-keymap key-translation-map)
 					   (make-sparse-keymap)))
 	(mapcar (function (lambda (entry)
-			    (define-key global-key-translation-map
+			    (define-key key-translation-map
 			      (vector (nth 0 entry))
 			      'double-translate-key)))
 		(append double-map '((magic-start) (magic-end)))))
-    (kill-local-variable 'global-key-translation-map)))
+    (kill-local-variable 'key-translation-map)))
 
 ;;; Mode