[AUCTeX-diffs] GNU AUCTeX branch, simplify-TeX-parse-error, updated. bfd5f18bb8480d4333b97086064df48d60c9bbe5

[Tassilo Horn]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, simplify-TeX-parse-error has been updated
       via  bfd5f18bb8480d4333b97086064df48d60c9bbe5 (commit)
       via  a262726e254417918cb14a22ef4a6edd690d4562 (commit)
       via  c7ba36530310ec329b162d74fcb5050838e7fe83 (commit)
      from  3dec183d22fb0d43dddc2809b51e70ddb661e21d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bfd5f18bb8480d4333b97086064df48d60c9bbe5
Merge: 3dec183 a262726
Author: Tassilo Horn <address@hidden>
Date:   Fri May 23 09:20:42 2014 +0200

    Merge master branch.

diff --cc tex-buf.el
index a6dbe65,6329936..479d669
--- a/tex-buf.el
+++ b/tex-buf.el
@@@ -1622,42 -1741,54 +1741,53 @@@ information in `TeX-error-list' instea
  
      ;; Remember where we was.
      (setq TeX-error-point (point))
- 
-     ;; Find the error.
-     (when (null file)
+     (if store
+       ;; Store the error information.
+       (add-to-list 'TeX-error-list
+                    (list 'error file line error offset context string) t)
+       ;; Find the error point and display the help.
+       (TeX-error--find-display-help
+        file line error offset context string))))
+ 
+ (defun TeX-error--find-display-help (file line error offset context
+                                         string)
+   "Find the error and display the help."
+   ;; Find the error.
+   (if (null file)
        (error "Error occurred after last TeX file closed"))
-     (when (not (file-exists-p file))
-       (error "No such file: %s" file))
-     (let ((runbuf (current-buffer))
-         (master (with-current-buffer
-                     TeX-command-buffer
-                   (expand-file-name (TeX-master-file))))
-         (command-buffer TeX-command-buffer)
-         error-file-buffer)
-       (run-hooks 'TeX-translate-location-hook)
-       (setq error-file-buffer (find-file file))
-       ;; Set the value of `TeX-command-buffer' in the next file with an
-       ;; error to be displayed to the value it has in the current buffer.
-       (with-current-buffer error-file-buffer
-       (set (make-local-variable 'TeX-command-buffer) command-buffer))
-       (goto-char (point-min))
-       (forward-line (+ offset line -1))
-       (if (not (string= string " "))
-         (search-forward string nil t))
- 
-       ;; Explain the error.
-       (cond ((eq TeX-display-help 'expert)
-            (TeX-pop-to-buffer runbuf nil t)
-            (goto-char TeX-error-point)
-            (TeX-pop-to-buffer error-file-buffer nil t))
-           (TeX-display-help
-            (TeX-help-error error context runbuf))
-           (t
-            (message (concat "! " error)))))))
- 
- (defun TeX-warning (string)
-   "Display a warning for STRING."
- 
+   (let ((runbuf (current-buffer))
+       (master (with-current-buffer
+                   TeX-command-buffer
+                 (expand-file-name (TeX-master-file))))
+       (command-buffer TeX-command-buffer)
+       error-file-buffer)
+     (run-hooks 'TeX-translate-location-hook)
+     (setq error-file-buffer (find-file file))
+     ;; Set the value of `TeX-command-buffer' in the next file with an
+     ;; error to be displayed to the value it has in the current buffer.
+     (with-current-buffer error-file-buffer
+       (set (make-local-variable 'TeX-command-buffer) command-buffer))
+     (goto-char (point-min))
+     (forward-line (+ offset line -1))
+     (if (not (string= string " "))
+       (search-forward string nil t))
+ 
+     ;; Explain the error.
+     (cond ((eq TeX-display-help 'expert)
+          (TeX-pop-to-buffer runbuf nil t)
+          (goto-char TeX-error-point)
+          (TeX-pop-to-buffer error-file-buffer nil t))
+         (TeX-display-help
+          (TeX-help-error error context runbuf))
+         (t
+          (message (concat "! " error))))))
+ 
+ (defun TeX-warning (string &optional store)
+   "Display a warning for STRING.
+ 
+ If optional argument STORE is non-nil, store the warning
+ information in `TeX-error-list' instead of displaying the
+ warning."
 -
    (let* ((error (concat "** " string))
  
         ;; bad-box is nil if this is a "LaTeX Warning"

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   56 +++++++++
 doc/auctex.texi  |   32 +++++-
 doc/changes.texi |    9 ++-
 doc/todo.texi    |   14 +-
 font-latex.el    |   27 ++--
 tex-buf.el       |  365 +++++++++++++++++++++++++++++++++++++-----------------
 tex-site.el.in   |   34 +++--
 7 files changed, 388 insertions(+), 149 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX