From af32299331d79e5b8427a41f8dcf82ac083dc5c6 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 1 Oct 2020 01:44:05 +0200 Subject: 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. --- lisp/epa.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lisp/epa.el') 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) -- cgit v1.2.3