From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 2 May 2016 18:08:48 +0000 (+0200)
Subject: Revert "alas, a map can have only one parent"
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/6b3d64854f6a7b0c8365b600704f0087b15b5720

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 a5cfc7ada6..a18b07ebe6 100644
--- 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 d9f58e52a0..2ae642a3e3 100644
--- 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)