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

[gnu-emacs] / lisp / double.el

diff --git a/lisp/double.el b/lisp/double.el
index fb4947fbd88213e9564a1462d1fac1430fe4b2a3..d112fbed3cd654d9d11174007ff0a30703d1f3ce 100644 (file)
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -145,11 +145,12 @@ 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'.
+       ;; 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)))
+                                            (copy-keymap key-translation-map)
+                                          (make-sparse-keymap)))
        (mapcar (function (lambda (entry)
                            (define-key key-translation-map
                              (vector (nth 0 entry))