diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 22:34:49 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-31 22:34:49 -0400 |
| commit | fd67a7000ee9e118b426df6ad779f3c86d4fe320 (patch) | |
| tree | 9f39d84fb5eeee28ec6670794980c075ebe51b32 /lisp/epa.el | |
| parent | 06ac62b4db7cf64c9d65ac55bdfcefdf478e20b5 (diff) | |
| parent | feceda26100f1b5712a85aadf0c428a1507b538d (diff) | |
| download | emacs-fd67a7000ee9e118b426df6ad779f3c86d4fe320.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 5 |
1 files changed, 2 insertions, 3 deletions
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 |