[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_B
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE] |
Date: |
Mon, 17 Sep 2007 07:01:53 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Glenn Morris <gm> 07/09/17 07:01:53
Index: tex-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/tex-mode.el,v
retrieving revision 1.185.2.4
retrieving revision 1.185.2.5
diff -u -b -r1.185.2.4 -r1.185.2.5
--- tex-mode.el 17 Sep 2007 06:57:58 -0000 1.185.2.4
+++ tex-mode.el 17 Sep 2007 07:01:53 -0000 1.185.2.5
@@ -2011,21 +2011,28 @@
(file-name-directory (buffer-file-name tex-last-buffer-texed)))
found-desired (num-errors-found 0)
last-filename last-linenum last-position
- begin-of-error end-of-error)
+ begin-of-error end-of-error errfilename)
;; Don't reparse messages already seen at last parse.
(goto-char compilation-parsing-end)
;; Parse messages.
(while (and (not (or found-desired (eobp)))
+ ;; First alternative handles the newer --file-line-error style:
+ ;; ./test2.tex:14: Too many }'s.
+ ;; Second handles the old-style:
+ ;; ! Too many }'s.
(prog1 (re-search-forward
- "^\\(?:[^:\n]+:[[:digit:]]+:\\|!\\) " nil 'move)
+ "^\\(?:\\([^:\n]+\\):[[:digit:]]+:\\|!\\) " nil 'move)
(setq begin-of-error (match-beginning 0)
- end-of-error (match-end 0)))
+ end-of-error (match-end 0)
+ errfilename (match-string 1)))
(re-search-forward
"^l\\.\\([0-9]+\\) \\(\\.\\.\\.\\)?\\(.*\\)$" nil 'move))
(let* ((this-error (copy-marker begin-of-error))
(linenum (string-to-number (match-string 1)))
(error-text (regexp-quote (match-string 3)))
(filename
+ ;; Prefer --file-liner-error filename if we have it.
+ (or errfilename
(save-excursion
(with-syntax-table tex-error-parse-syntax-table
(backward-up-list 1)
@@ -2034,7 +2041,7 @@
(skip-syntax-backward "(_")
(backward-up-list 1)
(skip-syntax-forward "(_"))
- (thing-at-point 'filename))))
+ (thing-at-point 'filename)))))
(new-file
(or (null last-filename)
(not (string-equal last-filename filename))))
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/09/15
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/09/16
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/09/17
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE],
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/09/19
- [Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/09/19