diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 14:33:47 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-05-30 14:33:47 +0200 |
| commit | 6a788618e30fef787b439760065c122dfa8aad3f (patch) | |
| tree | ef6d478db09f56651b57e82f7cd96a9f81229a03 | |
| parent | 9d22167c68d6ff7cfedc4b5aa7d538deee515df2 (diff) | |
| parent | 752a4eb49d1dff09b4a59e31bf29128a3202dc22 (diff) | |
| download | org-mode-6a788618e30fef787b439760065c122dfa8aad3f.tar.gz | |
Merge branch 'maint'
Conflicts:
contrib/lisp/ox-deck.el
| -rw-r--r-- | contrib/lisp/ox-deck.el | 8 | ||||
| -rw-r--r-- | contrib/lisp/ox-groff.el | 2 | ||||
| -rw-r--r-- | lisp/ox-latex.el | 2 | ||||
| -rw-r--r-- | lisp/ox-man.el | 2 | ||||
| -rw-r--r-- | lisp/ox-texinfo.el | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/contrib/lisp/ox-deck.el b/contrib/lisp/ox-deck.el index dcb5879..bdcdcbc 100644 --- a/contrib/lisp/ox-deck.el +++ b/contrib/lisp/ox-deck.el @@ -385,10 +385,10 @@ the \"slide\" class will be added to the to the list element, CONTENTS is the transcoded contents string. INFO is a plist holding export options." (let ((pkg-info (org-deck--get-packages info)) - (org-html--pre/postamble-class "deck-status") - (info (plist-put - (plist-put info :html-preamble (plist-get info :deck-preamble)) - :html-postamble (plist-get info :deck-postamble)))) + (org-html--pre/postamble-class "deck-status") + (info (plist-put + (plist-put info :html-preamble (plist-get info :deck-preamble)) + :html-postamble (plist-get info :deck-postamble)))) (mapconcat 'identity (list diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el index ca50b18..cd7b78c 100644 --- a/contrib/lisp/ox-groff.el +++ b/contrib/lisp/ox-groff.el @@ -1949,7 +1949,7 @@ Return PDF file name or an error if it couldn't be produced." ;; Collect standard errors from output buffer. (setq errors (org-groff-collect-errors outbuf)))) (t (error "No valid command to process to PDF"))) - (let ((pdffile (concat out-dir base-name ".pdf"))) + (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf"))) ;; Check for process failure. Provide collected errors if ;; possible. (if (not (file-exists-p pdffile)) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index fdada8b..8c62897 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -2892,7 +2892,7 @@ Return PDF file name or an error if it couldn't be produced." ;; Collect standard errors from output buffer. (setq errors (and (not snippet) (org-latex--collect-errors outbuf))))) (t (error "No valid command to process to PDF"))) - (let ((pdffile (concat out-dir base-name ".pdf"))) + (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf"))) ;; Check for process failure. Provide collected errors if ;; possible. (if (not (file-exists-p pdffile)) diff --git a/lisp/ox-man.el b/lisp/ox-man.el index 4a5add8..55a79f7 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -1233,7 +1233,7 @@ Return PDF file name or an error if it couldn't be produced." ;; Collect standard errors from output buffer. (setq errors (org-man-collect-errors outbuf)))) (t (error "No valid command to process to PDF"))) - (let ((pdffile (concat out-dir base-name ".pdf"))) + (let ((pdffile (concat (file-name-sans-extension full-name) ".pdf"))) ;; Check for process failure. Provide collected errors if ;; possible. (if (not (file-exists-p pdffile)) diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index 9cdd08e..b468ce1 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -1830,7 +1830,7 @@ Return INFO file name or an error if it couldn't be produced." ;; Collect standard errors from output buffer. (setq errors (org-texinfo-collect-errors outbuf)))) (t (error "No valid command to process to Info"))) - (let ((infofile (concat out-dir base-name ".info"))) + (let ((infofile (concat (file-name-sans-extension full-name) ".info"))) ;; Check for process failure. Provide collected errors if ;; possible. (if (not (file-exists-p infofile)) |