summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2012-09-14 13:54:43 +0200
committerNicolas Goaziou <n.goaziou@gmail.com>2012-09-14 13:54:43 +0200
commitf0bcf780a324b7e5aa7b23fde9d6630689d59021 (patch)
tree46a0d47007f8b75ee84aece401dd5730500c6fb4
parent275412a4a249cee38e6a64fd60617aa30a666171 (diff)
downloadorg-mode-f0bcf780a324b7e5aa7b23fde9d6630689d59021.tar.gz
org-export: Fix collision between old export menu and new one
* contrib/lisp/org-export.el (org-export-dispatch-ui): Do not use same buffer name as previous export dispatcher. Also make sure the temporary buffer is deleted once the export is done.
-rw-r--r--contrib/lisp/org-export.el19
1 files changed, 12 insertions, 7 deletions
diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el
index ddd64da..6f5fd39 100644
--- a/contrib/lisp/org-export.el
+++ b/contrib/lisp/org-export.el
@@ -4530,13 +4530,18 @@ back to standard interface."
expert-prompt allowed-keys backends options first-key expertp)
(save-window-excursion
(delete-other-windows)
- (with-current-buffer (get-buffer-create "*Org Export/Publishing Help*")
- (erase-buffer)
- (save-excursion (insert help)))
- (org-fit-window-to-buffer
- (display-buffer "*Org Export/Publishing Help*"))
- (org-export-dispatch-action
- standard-prompt allowed-keys backends options first-key expertp)))))
+ (unwind-protect
+ (progn
+ (with-current-buffer
+ (get-buffer-create "*Org Export Dispatcher*")
+ (erase-buffer)
+ (save-excursion (insert help)))
+ (org-fit-window-to-buffer
+ (display-buffer "*Org Export Dispatcher*"))
+ (org-export-dispatch-action
+ standard-prompt allowed-keys backends options first-key expertp))
+ (and (get-buffer "*Org Export Dispatcher*")
+ (kill-buffer "*Org Export Dispatcher*")))))))
(defun org-export-dispatch-action
(prompt allowed-keys backends options first-key expertp)