1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00

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

that can fail (e.g. sole window in frame).  Use dedication instead.
This commit is contained in:
Stefan Monnier 2010-05-25 13:53:37 -04:00
parent 605d1fd9a9
commit 397eb3f3e7
2 changed files with 7 additions and 3 deletions

View file

@ -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).

View file

@ -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