Przeglądaj źródła

Fix bugs introduced in b39dd5a

* ox-man.el (org-man-template),
  ox-texinfo.el (org-texinfo-template): Fix bug.
Rasmus 10 lat temu
rodzic
commit
1cc23c6f3d
2 zmienionych plików z 7 dodań i 6 usunięć
  1. 1 1
      lisp/ox-man.el
  2. 6 5
      lisp/ox-texinfo.el

+ 1 - 1
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

+ 6 - 5
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.