Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[gnu-emacs] / lisp / image-mode.el

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index e887e296308297e8b4125e1e2c7111368cbf8940..a18b07ebe6a9b2dd3e528af54e8131f665015ef6 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -371,8 +371,7 @@ call."
   "Internal variable to keep the previous non-image major mode.")
 
 (defvar image-mode-map
-  (let ((map (copy-keymap image-map)))
-    (set-keymap-parent 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)
@@ -477,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