Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

	ChangeLog

ChangeLog

@@ -1,4 +1,3 @@
-2008-03-10  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-html-level-start): Always have id's in HTML
 	headlines, even if there is no TOC to jump from.  Put extra <divs>
@@ -6,6 +5,16 @@
 	and its first subsection.  Insert ids into div's that surround
 	whole sections including subsections.
 
+2008-03-11  Bastien Guerry  <bzg@altern.org>
+
+	* org-publish.el (org-publish-initial-buffer): New variable.
+	(org-publish-org-to, org-publish): Use it.
+
+
+=====================================================================
+In Emacs CVS as 5.23
+
+
 2008-03-10  Bastien Guerry  <bzg@altern.org>
 
 	* org-publish.el (org-publish-expand-components): Remove null

org-publish.el

@@ -340,6 +340,9 @@ Each element of this alist is of the form:
 
   (file-name . project-name)")
 
+(defvar org-publish-initial-buffer nil
+  "The buffer `org-publish' has been called from.")
+
 (defun org-publish-initialize-files-alist (&optional refresh)
   "Set `org-publish-files-alist' if it is not set.
 Also set it if the optional argument REFRESH is non-nil."
@@ -476,13 +479,16 @@ PUB-DIR is the publishing directory."
     ;; run hooks after export and save export
     (and (run-hooks 'org-publish-after-export-hook)
 	 (if (buffer-modified-p) (save-buffer)))
+    (kill-buffer export-buf)
     ;; maybe restore buffer's content
     (set-buffer init-buf)
     (when (buffer-modified-p init-buf)
       (erase-buffer)
       (insert init-buf-string)
       (save-buffer)
-      (goto-char init-point))))
+      (goto-char init-point))
+    (unless (eq init-buf org-publish-initial-buffer)
+      (kill-buffer init-buf))))
 
 (defun org-publish-org-to-latex (plist filename pub-dir)
   "Publish an org file to LaTeX.
@@ -600,6 +606,7 @@ Default for INDEX-FILENAME is 'index.org'."
 (defun org-publish (project &optional force)
   "Publish PROJECT."
   (interactive "P")
+  (setq org-publish-initial-buffer (current-buffer))
   (save-window-excursion
     (let* ((force current-prefix-arg)
 	   (org-publish-use-timestamps-flag