Patch for tex-mode.el (more compatibility with AUCTeX)

Patch for tex-mode.el (more compatibility with AUCTeX)

[Markus Rost]

Currently tex-mode supports the variable TeX-master (from AUCTeX) if
it is a string.  See lines 1694-1698 in tex-mode.el.  I suggest to
support the variable TeX-master also if it is set to 't.  In that case
the "master" of the file is the file itself, so the right thing is to
run TeX on the buffer's file.  What about the following patch for
tex-mode.el?  Stefan?

I have a bunch of old .tex files which have Local Variable sections
created by AUCTeX.  The patch would make tex-mode handle those files
better.


	* textmodes/tex-mode.el (tex-main-file): Add a compatibility with
	AUCTeX.


===Buffer *vc-diff*=========================================
*** tex-mode.el.~1.150.~	Mon Oct 25 16:35:24 2004
--- tex-mode.el	Sat Nov 27 18:20:28 2004
***************
*** 1700,1709 ****
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")
  		     (file-relative-name
! 		      (if (save-excursion
! 			    (goto-char (point-min))
! 			    (re-search-forward tex-start-of-header
! 					       (+ (point) 10000) t))
  			  ;; This is the main file.
  			  buffer-file-name
  			;; This isn't the main file, let's try to find better,
--- 1700,1713 ----
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")
  		     (file-relative-name
! 		      (if (or
! 			   ;; Compatibility with AUCTeX.
! 			   (with-no-warnings
! 			    (and (boundp 'TeX-master) (eq TeX-master t)))
! 			   (save-excursion
! 			     (goto-char (point-min))
! 			     (re-search-forward tex-start-of-header
! 						(+ (point) 10000) t)))
  			  ;; This is the main file.
  			  buffer-file-name
  			;; This isn't the main file, let's try to find better,
============================================================

Re: Patch for tex-mode.el (more compatibility with AUCTeX)

[David Kastrup]

Markus Rost <rost@ias.edu> writes:

> Currently tex-mode supports the variable TeX-master (from AUCTeX) if
> it is a string.  See lines 1694-1698 in tex-mode.el.  I suggest to
> support the variable TeX-master also if it is set to 't.  In that
> case the "master" of the file is the file itself, so the right thing
> is to run TeX on the buffer's file.  What about the following patch
> for tex-mode.el?  Stefan?
>
> I have a bunch of old .tex files which have Local Variable sections
> created by AUCTeX.  The patch would make tex-mode handle those files
> better.

BTW, while there probably is nothing speaking against that patch, I'd
be interested in hearing why you would not go for the obvious
"solution", namely just using AUCTeX, which you obviously have been
using before at some time.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: Patch for tex-mode.el (more compatibility with AUCTeX)

[Richard Stallman]

Wouldn't this patch be a more natural way to handle TeX-master = t?

*** tex-mode.el	26 Oct 2004 04:21:48 -0400	1.150
--- tex-mode.el	28 Nov 2004 16:19:05 -0500	
***************
*** 1693,1701 ****
    (let* ((file (or tex-main-file
  		   ;; Compatibility with AUCTeX.
  		   (with-no-warnings
! 		    (when (and (boundp 'TeX-master) (stringp TeX-master))
! 		      (make-local-variable 'tex-main-file)
! 		      (setq tex-main-file TeX-master)))
  		   ;; Try to guess the main file.
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")
--- 1693,1705 ----
    (let* ((file (or tex-main-file
  		   ;; Compatibility with AUCTeX.
  		   (with-no-warnings
! 		    (when (boundp 'TeX-master)
! 		      (if (stringp TeX-master)
! 			  (progn
! 			    (make-local-variable 'tex-main-file)
! 			    (setq tex-main-file TeX-master))
! 			(when (eq TeX-master t)
! 			  (file-relative-name buffer-file-name)))))
  		   ;; Try to guess the main file.
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")

Re: Patch for tex-mode.el (more compatibility with AUCTeX)

[Markus Rost]

> From: Richard Stallman <rms@gnu.org>
> CC: emacs-devel@gnu.org
> Reply-to: rms@gnu.org
> Date: Mon, 29 Nov 2004 01:11:12 -0500
> X-Scanned-By: MIMEDefang 2.42
> X-Spam-Level: 
> 
> Wouldn't this patch be a more natural way to handle TeX-master = t?

Yes, but your patch may perhaps result in an error if buffer-file-name
is nil.  Below is another version, which is essentially your patch,
except for a test for buffer-file-name being non-nil.  Let me know
whether I should install it.

By the way, one could fix my original problem also by just removing
the handling of TeX-master completely.  Not that I want to suggest
that -- with the new patch things should work well.


===Buffer *vc-diff*=========================================
Index: tex-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/tex-mode.el,v
retrieving revision 1.150
diff -c -r1.150 tex-mode.el
*** tex-mode.el	25 Oct 2004 20:35:24 -0000	1.150
--- tex-mode.el	29 Nov 2004 19:38:52 -0000
***************
*** 1693,1701 ****
    (let* ((file (or tex-main-file
  		   ;; Compatibility with AUCTeX.
  		   (with-no-warnings
! 		    (when (and (boundp 'TeX-master) (stringp TeX-master))
! 		      (make-local-variable 'tex-main-file)
! 		      (setq tex-main-file TeX-master)))
  		   ;; Try to guess the main file.
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")
--- 1693,1704 ----
    (let* ((file (or tex-main-file
  		   ;; Compatibility with AUCTeX.
  		   (with-no-warnings
! 		    (when (boundp 'TeX-master)
! 		      (cond ((stringp TeX-master)
! 			     (make-local-variable 'tex-main-file)
! 			     (setq tex-main-file TeX-master))
! 			    ((and (eq TeX-master t) buffer-file-name)
! 			     (file-relative-name buffer-file-name)))))
  		   ;; Try to guess the main file.
  		   (if (not buffer-file-name)
  		       (error "Buffer is not associated with any file")
============================================================

> 
> *** tex-mode.el	26 Oct 2004 04:21:48 -0400	1.150
> --- tex-mode.el	28 Nov 2004 16:19:05 -0500	
> ***************
> *** 1693,1701 ****
>     (let* ((file (or tex-main-file
>   		   ;; Compatibility with AUCTeX.
>   		   (with-no-warnings
> ! 		    (when (and (boundp 'TeX-master) (stringp TeX-master))
> ! 		      (make-local-variable 'tex-main-file)
> ! 		      (setq tex-main-file TeX-master)))
>   		   ;; Try to guess the main file.
>   		   (if (not buffer-file-name)
>   		       (error "Buffer is not associated with any file")
> --- 1693,1705 ----
>     (let* ((file (or tex-main-file
>   		   ;; Compatibility with AUCTeX.
>   		   (with-no-warnings
> ! 		    (when (boundp 'TeX-master)
> ! 		      (if (stringp TeX-master)
> ! 			  (progn
> ! 			    (make-local-variable 'tex-main-file)
> ! 			    (setq tex-main-file TeX-master))
> ! 			(when (eq TeX-master t)
> ! 			  (file-relative-name buffer-file-name)))))
>   		   ;; Try to guess the main file.
>   		   (if (not buffer-file-name)
>   		       (error "Buffer is not associated with any file")
>