* epa.el (epa--select-keys): Don't explicitly delete the window since

that can fail (e.g. sole window in frame).  Use dedication instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3346fcf497a6812de3529902185e93fc59b3bd7c..ed5d215a9533258f9086556abfc29d7d39ef2475 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * epa.el (epa--select-keys): Don't explicitly delete the window since
+       that can fail (e.g. sole window in frame).  Use dedication instead.
+
 2010-05-19  Uday S Reddy  <u.s.reddy@cs.bham.ac.uk>  (tiny change)
 
        * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201).

diff --git a/lisp/epa.el b/lisp/epa.el
index ea438f0073a5f0c22dec35bc254a55bc01b30a3a..8d77d6938b199ce6dd1767a0b83480649f2954ee 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -508,13 +508,12 @@ If ARG is non-nil, mark the key."
       (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)))
+      (let ((display-buffer-mark-dedicated 'soft))
+        (pop-to-buffer (current-buffer))))
     (unwind-protect
        (progn
          (recursive-edit)
          (epa--marked-keys))
-      (if (get-buffer-window epa-keys-buffer)
-         (delete-window (get-buffer-window epa-keys-buffer)))
       (kill-buffer epa-keys-buffer))))
 
 ;;;###autoload