From 57f51dce5d85d74520c369ac8381faddbf6841aa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 12 Jan 2012 17:53:47 +0100 Subject: [PATCH] org-export: Default title doesn't overwrite a blank #+title keyword * contrib/lisp/org-export.el (org-export-collect-options): Default title is retrieved before in-buffer settings are read. Also, be more careful about indirect buffers. --- contrib/lisp/org-export.el | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el index b44c2f7fa..6ab6fbe6f 100644 --- a/contrib/lisp/org-export.el +++ b/contrib/lisp/org-export.el @@ -843,6 +843,13 @@ settings." (let ((options (org-combine-plists ;; ... from global variables... (org-export-get-global-options backend) + ;; ... from buffer's name (default title)... + `(:title + ,(or (let ((file (buffer-file-name (buffer-base-buffer)))) + (and file + (file-name-sans-extension + (file-name-nondirectory file)))) + (buffer-name (buffer-base-buffer)))) ;; ... from an external property list... ext-plist ;; ... from in-buffer settings... @@ -854,16 +861,7 @@ settings." (and subtreep (org-export-get-subtree-options))))) ;; Add initial options. - (setq options (append (org-export-initial-options options) - options)) - ;; Set a default title if none has been specified so far. - (unless (plist-get options :title) - (setq options (plist-put options :title - (or (and buffer-file-name - (file-name-sans-extension - (file-name-nondirectory - buffer-file-name))) - (buffer-name))))) + (setq options (append (org-export-initial-options options) options)) ;; Return plist. options))