[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 6b3d648: Revert "alas, a map can have only one pare
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 6b3d648: Revert "alas, a map can have only one parent" |
Date: |
Mon, 02 May 2016 18:09:47 +0000 |
branch: master
commit 6b3d64854f6a7b0c8365b600704f0087b15b5720
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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.
---
lisp/image-mode.el | 1 -
lisp/image.el | 1 -
2 files changed, 2 deletions(-)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a5cfc7a..a18b07e 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 d9f58e5..2ae642a 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 6b3d648: Revert "alas, a map can have only one parent",
Lars Ingebrigtsen <=