1 files changed, 8 insertions, 7 deletions

diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 1b91afeac8d..66dc7b83507 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1633,11 +1633,11 @@ If NOT-ALL is non-nil, save the `.dvi' file."
 (defvar tex-compile-commands
   '(((concat "pdf" tex-command
              " " (if (< 0 (length tex-start-commands))
-                     tex-start-commands) " %f")
+                     (shell-quote-argument tex-start-commands)) " %f")
      t "%r.pdf")
     ((concat tex-command
              " " (if (< 0 (length tex-start-commands))
-                     tex-start-commands) " %f")
+                     (shell-quote-argument tex-start-commands)) " %f")
      t "%r.dvi")
     ("yap %r &" "%r.dvi")
     ("xdvi %r &" "%r.dvi")
@@ -1900,8 +1900,8 @@ FILE is typically the output DVI or PDF file."
             (prog1 (file-name-directory (expand-file-name file))
               (setq file (file-name-nondirectory file))))
           (root (file-name-sans-extension file))
-          (fspec (list (cons ?r root)
-                       (cons ?f file)))
+          (fspec (list (cons ?r (shell-quote-argument root))
+                       (cons ?f (shell-quote-argument file))))
           (default (tex-compile-default fspec)))
      (list default-directory
            (completing-read
@@ -1922,13 +1922,14 @@ FILE is typically the output DVI or PDF file."
          (compile-command
           (if star
               (concat (substring command 0 star)
-                      file
+                      (shell-quote-argument file)
                       (substring command (1+ star)))
             (concat command " "
                     tex-start-options
                     (if (< 0 (length tex-start-commands))
-                        (concat tex-start-commands " "))
-                    file))))
+                        (concat
+                         (shell-quote-argument tex-start-commands) " "))
+                    (shell-quote-argument file)))))
     (tex-send-tex-command compile-command dir)))
 
 (defun tex-send-tex-command (cmd &optional dir)