Mercurial > emacs
changeset 108668:5a957bb32b66
* epa.el (epa--select-keys): Don't explicitly delete the window since
that can fail (e.g. sole window in frame). Use dedication instead.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 25 May 2010 13:53:37 -0400 |
| parents | 559e7260976c |
| children | c1945e85d4b9 |
| files | lisp/ChangeLog lisp/epa.el |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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).
--- 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