From: Glenn Morris <rgm@gnu.org>
Date: Sun, 28 Feb 2021 23:13:07 +0000 (-0800)
Subject: Make generation of texi from org overwrite output
X-Git-Tag: emacs-28.0.90~3487
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18e1455c8ae851791a047dc56eef972cc24e5b6c;p=emacs.git

Make generation of texi from org overwrite output

* doc/misc/Makefile.in (org_template): Don't delete output.
* lisp/org/ox-texinfo.el (org-texinfo-export-to-texinfo-batch):
Overwrite existing output.
---

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 662537b4512..060bffa638b 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -237,7 +237,6 @@ emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 # things like org-setup's "version" macro work.  Sigh.
 define org_template
  $(1:.org=.texi): $(1)
-	@rm -f $$@
 	$${AM_V_GEN}cd "$${srcdir}" && $${emacs} -l ox-texinfo \
 	  -f org-texinfo-export-to-texinfo-batch $$(notdir $$<) $$(notdir $$@)
 endef
diff --git a/lisp/org/ox-texinfo.el b/lisp/org/ox-texinfo.el
index 78d58beadd6..6e8d0d62141 100644
--- a/lisp/org/ox-texinfo.el
+++ b/lisp/org/ox-texinfo.el
@@ -1629,17 +1629,16 @@ Return output file's name."
 
 (defun org-texinfo-export-to-texinfo-batch ()
   "Export Org file INFILE to Texinfo file OUTFILE, in batch mode.
+Overwrites existing output file.
 Usage: emacs -batch -f org-texinfo-export-to-texinfo-batch INFILE OUTFILE"
   (or noninteractive (user-error "Batch mode use only"))
   (let ((infile (pop command-line-args-left))
 	(outfile (pop command-line-args-left))
-	(org-export-coding-system org-texinfo-coding-system))
+	(org-export-coding-system org-texinfo-coding-system)
+        (make-backup-files nil))
     (unless (file-readable-p infile)
       (message "File `%s' not readable" infile)
       (kill-emacs 1))
-    (when (file-exists-p outfile)
-      (message "File `%s' already exists" outfile)
-      (kill-emacs 1))
     (with-temp-buffer
       (insert-file-contents infile)
       (org-export-to-file 'texinfo outfile))))