# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1274810017 14400
# Node ID 5a957bb32b66c9b3bf8e131707df0873691763f1
# Parent  559e7260976cf17733d87814d9babb30700122c8
* 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 -r 559e7260976c -r 5a957bb32b66 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 24 20:57:43 2010 -0400
+++ b/lisp/ChangeLog	Tue May 25 13:53:37 2010 -0400
@@ -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 -r 559e7260976c -r 5a957bb32b66 lisp/epa.el
--- a/lisp/epa.el	Mon May 24 20:57:43 2010 -0400
+++ b/lisp/epa.el	Tue May 25 13:53:37 2010 -0400
@@ -508,13 +508,12 @@
       (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