[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d05806f: alas, a map can have only one parent
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] master d05806f: alas, a map can have only one parent |
Date: |
Mon, 02 May 2016 15:48:08 +0000 |
branch: master
commit d05806fda1cbba2db112bc783597fbe9d27175b2
Author: Sam Steingold <address@hidden>
Commit: Sam Steingold <address@hidden>
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'.
---
lisp/image-mode.el | 1 +
lisp/image.el | 1 +
2 files changed, 2 insertions(+)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index a18b07e..a5cfc7a 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 2ae642a..d9f58e5 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d05806f: alas, a map can have only one parent,
Sam Steingold <=