[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8c60347 7/8: epa-key-list-mode-map: Use widget-keymap as parent k
From: |
Jonas Bernoulli |
Subject: |
master 8c60347 7/8: epa-key-list-mode-map: Use widget-keymap as parent keymap |
Date: |
Wed, 15 Jul 2020 12:12:30 -0400 (EDT) |
branch: master
commit 8c60347780937f87f8b5ff78e3e9372821cad89a
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
epa-key-list-mode-map: Use widget-keymap as parent keymap
Normally when one keymap is to be treated as the parent of another,
then that relationship is setup once at the time when the child is
being defined, i.e. at birth. For some reason, this was not done
here; instead `widget-keymap' is set as `epa-key-list-mode-map'
parent every time the former is setup to be used as the local map.
This appears to be a mistake. A few other keymaps use `widget-keymap'
as their parent and in those cases the relationship is established
just once. `epa-key-list-mode-map' is the only exception and because
there is absolutely no indication that that is justified, we remove
this inconsistency.
* lisp/epa.el (epa-key-list-mode-map): Set the parent of this keymap
while defining it.
* lisp/epa.el (epa--list-keys): Do not set the parent of the local
keymap here.
---
lisp/epa.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/epa.el b/lisp/epa.el
index e4d1e5b..8f45c66 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -188,6 +188,7 @@ You should bind this variable with `let', but do not set it
globally.")
(defvar epa-key-list-mode-map
(let ((keymap (make-sparse-keymap))
(menu-map (make-sparse-keymap)))
+ (set-keymap-parent keymap widget-keymap)
(define-key keymap "m" 'epa-mark-key)
(define-key keymap "u" 'epa-unmark-key)
(define-key keymap "d" 'epa-decrypt-file)
@@ -399,8 +400,7 @@ DOC is documentation text to insert at the start."
(goto-char point))
(epa--insert-keys (epg-list-keys context name secret))
- (widget-setup)
- (set-keymap-parent (current-local-map) widget-keymap))
+ (widget-setup))
(make-local-variable 'epa-list-keys-arguments)
(setq epa-list-keys-arguments (list name secret))
(goto-char (point-min))
- master updated (363f1d4 -> 58bec88), Jonas Bernoulli, 2020/07/15
- master 0e2af5c 4/8: Improve and add doc-strings, Jonas Bernoulli, 2020/07/15
- master 9f82622 6/8: Cosmetic changes to epa libraries, Jonas Bernoulli, 2020/07/15
- master c2ef4a1 1/8: * lisp/epa.el (epa-faces): Move definition., Jonas Bernoulli, 2020/07/15
- master bb6fe68 2/8: Add all epa faces to epa-faces Custom group, Jonas Bernoulli, 2020/07/15
- master 8c60347 7/8: epa-key-list-mode-map: Use widget-keymap as parent keymap,
Jonas Bernoulli <=
- master da6edaf 3/8: * lisp/epg-config.el (epg-config--make-gpg-configuration): Fix indentation., Jonas Bernoulli, 2020/07/15
- master e78c15a 5/8: Drop unnecessary backward compatibility aliases, Jonas Bernoulli, 2020/07/15
- master 58bec88 8/8: * lisp/epa.el (epa-show-key): New command., Jonas Bernoulli, 2020/07/15