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

[Ralf Angeli]

CVSROOT:        /cvsroot/auctex
Module name:    auctex
Changes by:     Ralf Angeli <angeli>    08/02/09 18:51:44

Index: tex-buf.el
===================================================================
RCS file: /cvsroot/auctex/auctex/tex-buf.el,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- tex-buf.el  7 Feb 2008 21:20:46 -0000       1.269
+++ tex-buf.el  9 Feb 2008 18:51:44 -0000       1.270
@@ -1,7 +1,7 @@
 ;;; tex-buf.el --- External commands for AUCTeX.
 
 ;; Copyright (C) 1991, 1993, 1996, 2001, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: address@hidden
 ;; Keywords: tex, wp
@@ -1533,9 +1533,14 @@
          (search-forward string nil t))
       
       ;; Explain the error.
-      (if TeX-display-help
-         (TeX-help-error error context runbuf)
-       (message (concat "! " 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."
@@ -1593,7 +1598,7 @@
          (command-buffer TeX-command-buffer)
          error-file-buffer)
       (run-hooks 'TeX-translate-location-hook)
-      (setq error-file-buffer (find-file-other-window file))
+      (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
@@ -1609,10 +1614,15 @@
            (search-backward string start t)
            (search-forward string nil t))))
       ;; Display help
-      (if TeX-display-help
+      (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 (if bad-box context (concat "\n" context))
-                         runbuf)
-       (message (concat "! " error))))))
+                            runbuf))
+           (t
+            (message (concat "! " error)))))))
 
 ;;; - Help