From: Sam Steingold <sds@gnu.org>
Date: Fri, 22 Apr 2016 18:52:37 +0000 (-0400)
Subject: alas, a map can have only one parent
X-Git-Tag: emacs-26.0.90~2012
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d05806fda1cbba2db112bc783597fbe9d27175b2;p=emacs.git

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 a18b07ebe6a..a5cfc7ada64 100644
--- 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 2ae642a3e32..d9f58e52a07 100644
--- 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)