[AUCTeX-diffs] Changes to auctex/tex-buf.el,v

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    09/12/12 18:43:57

Index: tex-buf.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex-buf.el,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -b -r1.281 -r1.282
--- tex-buf.el  7 Dec 2009 21:23:28 -0000       1.281
+++ tex-buf.el  12 Dec 2009 18:43:57 -0000      1.282
@@ -1419,7 +1419,7 @@
          ;; TeX error
          "^\\(!\\|\\(.*?\\):[0-9]+:\\) \\|"
          ;; New file
-         "(\\(\".*?\"\\|/*\
+         "(\\(\"[^\"]*?\"\\|/*\
 \\(?:\\.+[^()\r\n{} \\/]*\\|[^()\r\n{} .\\/]+\
 \\(?: [^()\r\n{} .\\/]+\\)*\\(?:\\.[-0-9a-zA-Z_.]*\\)?\\)\
 \\(?:[\\/]+\\(?:\\.+[^()\r\n{} \\/]*\\|[^()\r\n{} .\\/]+\
@@ -1477,13 +1477,16 @@
 
         ;; New file -- Push on stack
         ((match-beginning 3)
-         (let ((file (TeX-match-buffer 3)))
-           ;; Strip quotation marks if necessary.
-           (when (eq (string-to-char file) ?\")
-             (setq file (substring file 1 (1- (length file)))))
-           (push file TeX-error-file))
+         (let ((file (TeX-match-buffer 3))
+               (end (match-end 3)))
+           ;; Strip quotation marks and remove newlines if necessary
+           (when (or (eq (string-to-char file) ?\")
+                     (string-match "\n" file))
+             (setq file
+                   (mapconcat 'identity (split-string file "[\"\n]+") "")))
+           (push file TeX-error-file)
          (push nil TeX-error-offset)
-         (goto-char (match-end 3))
+           (goto-char end))
          t)
         
         ;; End of file -- Pop from stack