Revert "alas, a map can have only one parent"

This reverts commit d05806fda1cbba2db112bc783597fbe9d27175b2.

This had already been fixed by using `make-composed-map'.  And
we don't want image-map to inherit from special-mode-map, anyway.

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a5cfc7ada64b56b01b4dc784c899b0fbfdb275b7..a18b07ebe6a9b2dd3e528af54e8131f665015ef6 100644 (file)
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -372,7 +372,6 @@ 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 d9f58e52a07dde1676f01f7b1b0fe1d9ceeb1fd0..2ae642a3e32b276adc32ba2eb1c67eadaa96169e 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -142,7 +142,6 @@ 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)