Merge branch 'maint'

Conflicts:
	contrib/lisp/ox-deck.el

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

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))

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))

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))

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))