From cceb998feb6b117baeaba10321ed461297688daf Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Mon, 3 Nov 2008 13:52:16 +0100 Subject: [PATCH] Fix return value of `org-publish-find-title'. My previous patch to remove buffers created just for retrieving the page title did mess up the return value of this function. This has now been fixed. --- lisp/org-publish.el | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index ffad1991b..5a6244f5c 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -674,18 +674,21 @@ Default for INDEX-FILENAME is 'index.org'." (defun org-publish-find-title (file) "Find the title of file in project." (let* ((visiting (find-buffer-visiting file)) - (buffer (or visiting (find-file-noselect file)))) + (buffer (or visiting (find-file-noselect file))) + title) (save-excursion (set-buffer buffer) (let* ((opt-plist (org-combine-plists (org-default-export-plist) (org-infile-export-plist)))) - (or (plist-get opt-plist :title) - (and (not - (plist-get opt-plist :skip-before-1st-heading)) - (org-export-grab-title-from-buffer)) - (file-name-nondirectory (file-name-sans-extension file))))) + (setq title + (or (plist-get opt-plist :title) + (and (not + (plist-get opt-plist :skip-before-1st-heading)) + (org-export-grab-title-from-buffer)) + (file-name-nondirectory (file-name-sans-extension file)))))) (unless visiting - (kill-buffer buffer)))) + (kill-buffer buffer)) + title)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Interactive publishing functions