From 024ae841918fa8c78b54497f0a6bde6ca58c3675 Mon Sep 17 00:00:00 2001 From: Jambunathan K Date: Sat, 24 Dec 2011 09:36:29 +0530 Subject: [PATCH] org-odt.el: Honor author. timestamp and email options in preamble * org-odt.el (org-odt-format-preamble): Honor following user options: author, timestamp and email. See http://lists.gnu.org/archive/html/emacs-orgmode/2011-12/msg00539.html --- lisp/org-odt.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/org-odt.el b/lisp/org-odt.el index d5be1e16a..b2c6f334d 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -495,7 +495,11 @@ PUB-DIR is set, use this as the publishing directory." (date (plist-get opt-plist :date)) (iso-date (org-odt-format-date date)) (date (org-odt-format-date date "%d %b %Y")) - (email (plist-get opt-plist :email))) + (email (plist-get opt-plist :email)) + ;; switch on or off above vars based on user settings + (author (and (plist-get opt-plist :author-info) (or author email))) + (email (and (plist-get opt-plist :email-info) email)) + (date (and (plist-get opt-plist :time-stamp-file) date))) (concat ;; title (when title @@ -505,7 +509,6 @@ PUB-DIR is set, use this as the publishing directory." '("" . "") title)) ;; separator "")) - (cond ((and author (not email)) ;; author only