[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.44,1.45 texrc,1.34,1.35

[<sri...@us...>]

Update of /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite
In directory sc8-pr-cvs1:/tmp/cvs-serv885

Modified Files:
	compiler.vim texrc 
Log Message:
- implement Alan Schmitt's idea of a Tex_UseMakefile option. Setting this
  to zero means that latex-suite will completeley ignore the presence of a
  makefile in the current directory.


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** compiler.vim	2 Sep 2003 07:05:59 -0000	1.44
--- compiler.vim	3 Sep 2003 05:56:22 -0000	1.45
***************
*** 5,8 ****
--- 5,9 ----
  " 
  "  Description: functions for compiling/viewing/searching latex documents
+ "          CVS: $Id$
  "=============================================================================
  
***************
*** 108,125 ****
  	" Extract the complete file name including the extension.
  	let mainfname = Tex_GetMainFileName(':r')
  	if exists('b:fragmentFile') || mainfname == ''
  		let mainfname = escape(expand('%:t'), ' ')
  	endif
  
! 	" if a makefile exists, then use that irrespective of whether *.latexmain
! 	" exists or not. mainfname is still extracted from *.latexmain (if
! 	" possible) log file name depends on the main file which will be compiled.
! 	if glob('makefile') != '' || glob('Makefile') != ''
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'
  		if exists('s:target')
! 			exec 'make '.s:target
  		else
! 			exec 'make'
  		endif
  		let &l:makeprg = _makeprg
--- 109,130 ----
  	" Extract the complete file name including the extension.
  	let mainfname = Tex_GetMainFileName(':r')
+ 	call Tex_Debug('Tex_CompileLatex: getting mainfname = ['.mainfname.'] from Tex_GetMainFileName', 'comp')
  	if exists('b:fragmentFile') || mainfname == ''
  		let mainfname = escape(expand('%:t'), ' ')
  	endif
  
! 	" if a makefile exists and the user wants to use it, then use that
! 	" irrespective of whether *.latexmain exists or not. mainfname is still
! 	" extracted from *.latexmain (if possible) log file name depends on the
! 	" main file which will be compiled.
! 	if !g:Tex_UseMakefile || glob('makefile') != '' || glob('Makefile') != ''
  		let _makeprg = &l:makeprg
  		let &l:makeprg = 'make $*'
  		if exists('s:target')
! 			call Tex_Debug('Tex_CompileLatex: execing [make! '.s:target.']', 'comp')
! 			exec 'make! '.s:target
  		else
! 			call Tex_Debug('Tex_CompileLatex: execing [make!]', 'comp')
! 			exec 'make!'
  		endif
  		let &l:makeprg = _makeprg
***************
*** 130,134 ****
  			let mainfname = fnamemodify(mainfname, ':r')
  		endif
! 		exec 'make '.mainfname
  	endif
  	redraw!
--- 135,140 ----
  			let mainfname = fnamemodify(mainfname, ':r')
  		endif
! 		call Tex_Debug('Tex_CompileLatex: execing [make! '.mainfname.']', 'comp')
! 		exec 'make! '.mainfname
  	endif
  	redraw!
***************
*** 460,464 ****
  	" land us on the error in a.tex.
  	if errfile != ''
! 		exec 'bot pedit +/(\\(\\f\\|\\[\\|\]\\)*'.errfile.'/ '.a:filename
  	else
  		exec 'bot pedit +0 '.a:filename
--- 466,470 ----
  	" land us on the error in a.tex.
  	if errfile != ''
! 		exec 'silent! bot pedit +/(\\(\\f\\|\\[\\|\]\\|\\s\\)*'.errfile.'/ '.a:filename
  	else
  		exec 'bot pedit +0 '.a:filename

Index: texrc
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/texrc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** texrc	29 Aug 2003 02:55:48 -0000	1.34
--- texrc	3 Sep 2003 05:56:22 -0000	1.35
***************
*** 116,119 ****
--- 116,121 ----
  TexLet g:Tex_CompileRule_bib = 'bibtex $*'
  
+ TexLet g:Tex_UseMakefile = 1
+ 
  " }}}
  " ------------------------------------------------------------------------------