alas, a map can have only one parent

* lisp/image-mode.el (image-model-map): Cannot have two parents.
* lisp/image.el (image-map): Inherit from `special-mode-map'.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a18b07ebe6a9b2dd3e528af54e8131f665015ef6..a5cfc7ada64b56b01b4dc784c899b0fbfdb275b7 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -372,6 +372,7 @@ call."
 
 (defvar image-mode-map
   (let ((map (make-sparse-keymap)))
+    (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)

diff --git a/lisp/image.el b/lisp/image.el
index 2ae642a3e32b276adc32ba2eb1c67eadaa96169e..d9f58e52a07dde1676f01f7b1b0fe1d9ceeb1fd0 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -142,6 +142,7 @@ based on the font pixel size."
 ;; Map put into text properties on images.
 (defvar image-map
   (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map special-mode-map)
     (define-key map "-" 'image-decrease-size)
     (define-key map "+" 'image-increase-size)
     (define-key map "r" 'image-rotate)