[Emacs-diffs] master 1284662: Call `make-composed-keymap' correctly

[Lars Ingebrigtsen]

branch: master
commit 12846626bfae795a173fdedf2850dfbd24065534
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    Call `make-composed-keymap' correctly
    
    * lisp/image-mode.el (image-mode-map): Call
    `make-composed-keymap' correctly.
---
 lisp/image-mode.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index f4a17b2..a18b07e 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -371,7 +371,7 @@ call."
   "Internal variable to keep the previous non-image major mode.")
 
 (defvar image-mode-map
-  (let ((map (make-composed-keymap image-map special-mode-map)))
+  (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-c" 'image-toggle-display)
     (define-key map "\C-c\C-x" 'image-toggle-hex-display)
     (define-key map (kbd "SPC")       'image-scroll-up)
@@ -476,7 +476,7 @@ call."
        ["Goto Frame..." image-goto-frame :active image-multi-frame
         :help "Show a specific frame of this image"]
        ))
-    map)
+    (make-composed-keymap (list map image-map) special-mode-map))
   "Mode keymap for `image-mode'.")
 
 (defvar image-minor-mode-map