From e67e6d06e9c00301467beaaaeeeaad929bdc621b Mon Sep 17 00:00:00 2001 From: ueno Date: Sat, 25 Nov 2006 22:31:22 +0000 Subject: [PATCH] * epa.el (epa-keys-mode): Don't call widget-setup. (epa-list-keys): Call widget-setup here. (epa-select-keys): Ditto. --- ChangeLog | 6 ++++++ epa.el | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a50ed2..3adb5a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-25 Daiki Ueno + + * epa.el (epa-keys-mode): Don't call widget-setup. + (epa-list-keys): Call widget-setup here. + (epa-select-keys): Ditto. + 2006-11-24 Hiroya Murata * epg.el (epg-delete-keys): Remove redundant argument for `error' diff --git a/epa.el b/epa.el index 1ac41df..4ef4094 100644 --- a/epa.el +++ b/epa.el @@ -247,13 +247,11 @@ the separate window." truncate-lines t buffer-read-only t) (use-local-map epa-keys-mode-map) - (set-keymap-parent (current-local-map) widget-keymap) (make-local-variable 'font-lock-defaults) (setq font-lock-defaults '(epa-font-lock-keywords t)) ;; In XEmacs, auto-initialization of font-lock is not effective ;; if buffer-file-name is not set. (font-lock-set-defaults) - (widget-setup) (make-local-variable 'epa-exit-buffer-function) (run-hooks 'epa-keys-mode-hook)) @@ -345,7 +343,9 @@ If ARG is non-nil, mark the current line." (point-max))) (goto-char point)) (epa-insert-keys context name mode) - (epa-keys-mode)) + (epa-keys-mode) + (widget-setup) + (set-keymap-parent (current-local-map) widget-keymap)) (make-local-variable 'epa-list-keys-arguments) (setq epa-list-keys-arguments (list name mode protocol)) (goto-char (point-min)) @@ -436,6 +436,8 @@ If SECRET is non-nil, list secret keys instead of public keys." (epa-mark))) (epa-insert-keys context nil nil))) (epa-keys-mode) + (widget-setup) + (set-keymap-parent (current-local-map) widget-keymap) (setq epa-exit-buffer-function #'abort-recursive-edit) (goto-char (point-min)) (pop-to-buffer (current-buffer))) -- 1.7.10.4