diff options
| author | Rasmus <rasmus@gmx.us> | 2015-02-12 10:59:30 +0100 |
|---|---|---|
| committer | Rasmus <rasmus@gmx.us> | 2015-02-12 11:00:56 +0100 |
| commit | 1cc23c6f3d44abe86e5e1c35b355734dc388ac61 (patch) | |
| tree | 73e8eda937597f1e491b60f65d2954b21d6ac548 | |
| parent | b39dd5a099c4acca23f0393dfb744706bee77ec4 (diff) | |
| download | org-mode-1cc23c6f3d44abe86e5e1c35b355734dc388ac61.tar.gz | |
Fix bugs introduced in b39dd5a
* ox-man.el (org-man-template),
ox-texinfo.el (org-texinfo-template): Fix bug.
| -rw-r--r-- | lisp/ox-man.el | 2 | ||||
| -rw-r--r-- | 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 59d107f..bdac34c 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 68ebd19..d759d18 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. |