diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-10-01 01:44:05 +0200 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-10-01 01:44:05 +0200 |
commit | af32299331d79e5b8427a41f8dcf82ac083dc5c6 (patch) | |
tree | c3e574f448e099336b546da80e6db4ebdc8afb63 /lisp/epa.el | |
parent | fdaceeb8b49cb4d5c83df08167a2ee8e6125897e (diff) | |
download | emacs-af32299331d79e5b8427a41f8dcf82ac083dc5c6.tar.gz emacs-af32299331d79e5b8427a41f8dcf82ac083dc5c6.tar.bz2 emacs-af32299331d79e5b8427a41f8dcf82ac083dc5c6.zip |
Fix up previous window excursion patch in epa--select-keys
* lisp/epa.el (epa--select-keys): Use save-window-excursion
instead of open-coding the macro.
Diffstat (limited to 'lisp/epa.el')
-rw-r--r-- | lisp/epa.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index a2fb7f2bd1d..25e055c201f 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -435,7 +435,7 @@ q trust status questionable. - trust status unspecified. (unless (and epa-keys-buffer (buffer-live-p epa-keys-buffer)) (setq epa-keys-buffer (generate-new-buffer "*Keys*"))) - (let ((conf (current-window-configuration))) + (save-window-excursion (with-current-buffer epa-keys-buffer (epa-key-list-mode) ;; C-c C-c is the usual way to finish the selection (bug#11159). @@ -462,8 +462,7 @@ q trust status questionable. - trust status unspecified. (progn (recursive-edit) (epa--marked-keys)) - (kill-buffer epa-keys-buffer) - (set-window-configuration conf))))) + (kill-buffer epa-keys-buffer))))) ;;;###autoload (defun epa-select-keys (context prompt &optional names secret) |