X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fd4fc004ab4d4fd5a75f1663e7067e58cf389912..2f67f8a145af8f185f644b1d094a03895a124ef1:/lisp/image-mode.el

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 3334d6a823..a18b07ebe6 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -372,8 +372,6 @@ call."
 
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map special-mode-map)
-    (set-keymap-parent map image-map)
     (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)
@@ -478,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