changeset 65315:af6b70a1bba9

(tex-send-tex-command, tex-bibtex-file): Undo last change. Enclosing the result in quotes broke things on Unix since tex-send-command passes it through shell-quote-argument. (tex-send-command): Pass `file' through convert-standard-filename if possible. (tex-uptodate-p): Handle the case where TeX hasn't put additional info in a transcript.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 02 Sep 2005 18:24:29 +0000
parents 6c488c4c11c6
children d2d6a76016a7
files lisp/textmodes/tex-mode.el
diffstat 1 files changed, 15 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/textmodes/tex-mode.el	Fri Sep 02 16:59:57 2005 +0000
+++ b/lisp/textmodes/tex-mode.el	Fri Sep 02 18:24:29 2005 +0000
@@ -1580,12 +1580,14 @@
            (star (string-match "\\*" cmd))
 	   (string
 	    (concat
-	     (if file
-		 (if star (concat (substring cmd 0 star)
-				  (shell-quote-argument file)
-				  (substring cmd (1+ star)))
-		   (concat cmd " " (shell-quote-argument file)))
-	       cmd)
+	     (if (null file)
+		 cmd
+               (if (file-name-absolute-p file)
+                   (setq file (convert-standard-filename file)))
+	       (if star (concat (substring cmd 0 star)
+                                (shell-quote-argument file)
+                                (substring cmd (1+ star)))
+                 (concat cmd " " (shell-quote-argument file))))
 	     (if background "&" ""))))
       ;; Switch to buffer before checking for subproc output in it.
       (set-buffer buf)
@@ -1763,7 +1765,11 @@
 	 (save-excursion
 	   (goto-char (point-max))
 	   (and (re-search-backward
-		 "(see the transcript file for additional information)" nil t)
+                 (concat
+                  "(see the transcript file for additional information)"
+                  "\\|^Output written on .*"
+                  (regexp-quote (file-name-nondirectory file))
+                  " (.*)\\.") nil t)
 		(> (save-excursion
 		     (or (re-search-backward "\\[[0-9]+\\]" nil t)
 			 (point-min)))
@@ -1945,8 +1951,7 @@
                                       default-directory))))
 	      (not dir))
     (let (shell-dirtrack-verbose)
-      (tex-send-command tex-shell-cd-command
-			(concat "\"" (convert-standard-filename dir) "\""))))
+      (tex-send-command tex-shell-cd-command dir)))
   (with-current-buffer (process-buffer (tex-send-command cmd))
     (setq compilation-last-buffer (current-buffer))
     (compilation-forget-errors)
@@ -2311,8 +2316,7 @@
 	(tex-out-file
          (tex-append (file-name-nondirectory (buffer-file-name)) ""))
 	(file-dir (file-name-directory (buffer-file-name))))
-    (tex-send-command tex-shell-cd-command
-		      (concat "\"" (convert-standard-filename file-dir) "\""))
+    (tex-send-command tex-shell-cd-command file-dir)
     (tex-send-command tex-bibtex-command tex-out-file))
   (tex-display-shell))