From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 25 May 2010 17:53:37 +0000 (-0400)
Subject: * epa.el (epa--select-keys): Don't explicitly delete the window since
X-Git-Tag: emacs-pretest-23.2.90~139^2~167
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=397eb3f3e779ed4bd20facb34e4b418f65540643;p=emacs.git

* 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 3346fcf497a..ed5d215a953 100644
--- 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 ea438f0073a..8d77d6938b1 100644
--- 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