Make `q' etc work in image mode again

* lisp/image-mode.el (image-mode-map): Restore
special-mode-map as the parent keymap of image-mode-map (bug#23167).

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