(texinfo-tex-buffer): Bind

tex-start-options-string to empty string.
(texinfo-tex-region): Use texinfo-tex-trailer as documented.

1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index cfd54d5cd09..c5064805d7b 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -814,14 +814,17 @@ The value of `texinfo-tex-trailer' is appended to the temporary file after the r
   (interactive "r")
   (require 'tex-mode)
   (let ((tex-command texinfo-tex-command)
-	(tex-trailer "@bye\n"))
+	(tex-trailer texinfo-tex-trailer))
     (tex-region beg end)))
 
 (defun texinfo-tex-buffer ()
   "Run TeX on visited file, once or twice, to make a correct `.dvi' file."
   (interactive)
   (require 'tex-mode)
-  (let ((tex-command texinfo-texi2dvi-command))
+  (let ((tex-command texinfo-texi2dvi-command)
+	;; Disable tex-start-options-string.  texi2dvi would not
+	;; understand anything specified here.
+	(tex-start-options-string ""))
     (tex-buffer)))
 
 (defun texinfo-texindex ()