summaryrefslogtreecommitdiff
path: root/lisp/image-mode.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-05-02 20:08:48 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2016-05-02 20:08:48 +0200
commit6b3d64854f6a7b0c8365b600704f0087b15b5720 (patch)
tree02c3e1ddfba1ef858e002f640132f0da4aa60644 /lisp/image-mode.el
parent2bf7bc4161a3b3e1eceaf8422773de87ae233ea3 (diff)
downloademacs-6b3d64854f6a7b0c8365b600704f0087b15b5720.tar.gz
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.
Diffstat (limited to 'lisp/image-mode.el')
-rw-r--r--lisp/image-mode.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a5cfc7ada64..a18b07ebe6a 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)