From 1cc23c6f3d44abe86e5e1c35b355734dc388ac61 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 12 Feb 2015 10:59:30 +0100 Subject: [PATCH] Fix bugs introduced in b39dd5a * ox-man.el (org-man-template), ox-texinfo.el (org-texinfo-template): Fix bug. --- lisp/ox-man.el | 2 +- lisp/ox-texinfo.el | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/ox-man.el b/lisp/ox-man.el index 59d107f3e..bdac34ce5 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -311,7 +311,7 @@ This function shouldn't be used for floats. See "Return complete document string after Man conversion. CONTENTS is the transcoded contents string. INFO is a plist holding export options." - (let* ((title (when (plist-get :with-title) + (let* ((title (when (plist-get info :with-title) (org-export-data (plist-get info :title) info))) (attr (read (format "(%s)" (mapconcat diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 68ebd1908..d759d1879 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -569,11 +569,12 @@ holding export options." "@finalout\n" "@titlepage\n" (when (plist-get info :with-title) - (format "@title %s\n" (or (plist-get info :texinfo-printed-title) title)) - (let ((subtitle (plist-get info :subtitle))) - (and subtitle - (org-element-normalize-string - (replace-regexp-in-string "^" "@subtitle " subtitle))))) + (concat + (format "@title %s\n" (or (plist-get info :texinfo-printed-title) title "")) + (let ((subtitle (plist-get info :subtitle))) + (and subtitle + (org-element-normalize-string + (replace-regexp-in-string "^" "@subtitle " subtitle)))))) (when (plist-get info :with-author) (concat ;; Primary author.