ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	contrib/lisp/ox-deck.el
This commit is contained in:
Nicolas Goaziou 2013-05-30 14:33:47 +02:00
parent 9d22167c68 752a4eb49d
commit 6a788618e3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/lisp/ox-deck.el
View File

@ -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 CONTENTS is the transcoded contents string. INFO is a plist
holding export options." holding export options."
(let ((pkg-info (org-deck--get-packages info)) (let ((pkg-info (org-deck--get-packages info))
(org-html--pre/postamble-class "deck-status") (org-html--pre/postamble-class "deck-status")
(info (plist-put (info (plist-put
(plist-put info :html-preamble (plist-get info :deck-preamble)) (plist-put info :html-preamble (plist-get info :deck-preamble))
:html-postamble (plist-get info :deck-postamble)))) :html-postamble (plist-get info :deck-postamble))))
(mapconcat (mapconcat
'identity 'identity
(list (list

2
contrib/lisp/ox-groff.el
View File

@ -1949,7 +1949,7 @@ Return PDF file name or an error if it couldn't be produced."
;; Collect standard errors from output buffer. ;; Collect standard errors from output buffer.
(setq errors (org-groff-collect-errors outbuf)))) (setq errors (org-groff-collect-errors outbuf))))
(t (error "No valid command to process to PDF"))) (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 ;; Check for process failure. Provide collected errors if
;; possible. ;; possible.
(if (not (file-exists-p pdffile)) (if (not (file-exists-p pdffile))

2
lisp/ox-latex.el
View File

@ -2892,7 +2892,7 @@ Return PDF file name or an error if it couldn't be produced."
;; Collect standard errors from output buffer. ;; Collect standard errors from output buffer.
(setq errors (and (not snippet) (org-latex--collect-errors outbuf))))) (setq errors (and (not snippet) (org-latex--collect-errors outbuf)))))
(t (error "No valid command to process to PDF"))) (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 ;; Check for process failure. Provide collected errors if
;; possible. ;; possible.
(if (not (file-exists-p pdffile)) (if (not (file-exists-p pdffile))

2
lisp/ox-man.el
View File

@ -1233,7 +1233,7 @@ Return PDF file name or an error if it couldn't be produced."
;; Collect standard errors from output buffer. ;; Collect standard errors from output buffer.
(setq errors (org-man-collect-errors outbuf)))) (setq errors (org-man-collect-errors outbuf))))
(t (error "No valid command to process to PDF"))) (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 ;; Check for process failure. Provide collected errors if
;; possible. ;; possible.
(if (not (file-exists-p pdffile)) (if (not (file-exists-p pdffile))

2
lisp/ox-texinfo.el
View File

@ -1830,7 +1830,7 @@ Return INFO file name or an error if it couldn't be produced."
;; Collect standard errors from output buffer. ;; Collect standard errors from output buffer.
(setq errors (org-texinfo-collect-errors outbuf)))) (setq errors (org-texinfo-collect-errors outbuf))))
(t (error "No valid command to process to Info"))) (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 ;; Check for process failure. Provide collected errors if
;; possible. ;; possible.
(if (not (file-exists-p infofile)) (if (not (file-exists-p infofile))