From f0bcf780a324b7e5aa7b23fde9d6630689d59021 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 14 Sep 2012 13:54:43 +0200 Subject: [PATCH] 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. --- contrib/lisp/org-export.el | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index ddd64dae9..6f5fd39f9 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)