[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99815: * epa.el (epa--select-keys): Don't explicitly delete the window since

[Stefan Monnier]

------------------------------------------------------------
revno: 99815
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Tue 2010-05-25 13:53:37 -0400
message:
  * epa.el (epa--select-keys): Don't explicitly delete the window since
  that can fail (e.g. sole window in frame).  Use dedication instead.
modified:
  lisp/ChangeLog
  lisp/epa.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-19 03:51:55 +0000
+++ b/lisp/ChangeLog    2010-05-25 17:53:37 +0000
@@ -1,3 +1,8 @@
+2010-05-25  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201).

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2010-01-13 08:35:10 +0000
+++ b/lisp/epa.el       2010-05-25 17:53:37 +0000
@@ -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