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

[gnu-emacs] / lisp / double.el

diff --git a/lisp/double.el b/lisp/double.el
index 137ea510123ed9ca764f030b69f76a01d4302c58..f340c70a11ae7d8a626588dd8439b3d947d730aa 100644 (file)
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -144,17 +144,18 @@ but not `C-u X' or `ESC X' since the X is not the prefix key."
   (if enable-flag
       (progn
        ;; Set up key-translation-map as indicated by `double-map'.
-       (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)))
+       ;; 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)
+                                          (make-sparse-keymap)))
        (mapcar (function (lambda (entry)
-                           (define-key key-translation-map
+                           (define-key global-key-translation-map
                              (vector (nth 0 entry))
                              'double-translate-key)))
                (append double-map '((magic-start) (magic-end)))))
-    (kill-local-variable 'key-translation-map)))
+    (kill-local-variable 'global-key-translation-map)))
 
 ;;; Mode