From e89aa69bc64bc1554264ce98ac13072b4c691695 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 7 Mar 2008 12:09:09 +0100 Subject: [PATCH] Reverted the change that killed html buffer after export. The side effects for org-export-to-html-and-open, and for the publishing commands need to be studied first. --- ChangeLog | 6 ++++++ org.el | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab88e01a3..118459f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-07 Carsten Dominik + + * org.el (org-export-as-html): Revert the change that killed the + html buffer. Side effects first need to be studied carefully. + (org-get-tags-at): Fix the structure of the condition-case statement. + 2008-03-06 Bastien Guerry * org.el (org-get-legal-level): Aliased to `org-get-valid-level'. diff --git a/org.el b/org.el index 94909441e..c29fca1f8 100644 --- a/org.el +++ b/org.el @@ -23329,15 +23329,16 @@ the tags of the current headline come last." (goto-char (or pos (point))) (save-match-data (condition-case nil - (org-back-to-heading t) - (while (not (equal lastpos (point))) - (setq lastpos (point)) - (if (looking-at (org-re "[^\r\n]+?:\\([[:alnum:]_@:]+\\):[ \t]*$")) - (setq tags (append (org-split-string - (org-match-string-no-properties 1) ":") - tags))) - (or org-use-tag-inheritance (error "")) - (org-up-heading-all 1)) + (progn + (org-back-to-heading t) + (while (not (equal lastpos (point))) + (setq lastpos (point)) + (if (looking-at (org-re "[^\r\n]+?:\\([[:alnum:]_@:]+\\):[ \t]*$")) + (setq tags (append (org-split-string + (org-match-string-no-properties 1) ":") + tags))) + (or org-use-tag-inheritance (error "")) + (org-up-heading-all 1))) (error nil)))) tags))) @@ -26100,8 +26101,7 @@ lang=\"%s\" xml:lang=\"%s\"> (delete-region beg end) (insert (format "%s" (make-string n ?x))))) - - (or to-buffer (progn (save-buffer) (kill-buffer (current-buffer)))) + (or to-buffer (save-buffer)) (goto-char (point-min)) (message "Exporting... done") (if (eq to-buffer 'string) -- 2.11.4.GIT