[Vim-latex-cvs] vimfiles/ftplugin/latex-suite compiler.vim,1.55,1.56

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

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

Modified Files:
	compiler.vim 
Log Message:
Bug: Viewing did not work on certain platforms because string
     concatenation wthout using a dot does not work on all platforms.
     (Alex Jakushev)


Index: compiler.vim
===================================================================
RCS file: /cvsroot/vim-latex/vimfiles/ftplugin/latex-suite/compiler.vim,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** compiler.vim	2 Dec 2003 11:04:17 -0000	1.55
--- compiler.vim	2 Dec 2003 11:36:14 -0000	1.56
***************
*** 267,276 ****
  		" editor from the command line. that would have really helped ensure
  		" that this particular vim and yap are connected.
! 		let execString = '!start' s:viewer mainfname . '.' . s:target
  	elseif has('macunix')
  		if strlen(s:viewer)
! 			let s:viewer = '-a ' . s:viewer
  		endif
! 		let execString = 'silent! !open' s:viewer mainfname . '.' . s:target
  	else
  		" taken from Dimitri Antoniou's tip on vim.sf.net (tip #225).
--- 267,276 ----
  		" editor from the command line. that would have really helped ensure
  		" that this particular vim and yap are connected.
! 		let execString = '!start '.s:viewer.' '.mainfname.'.'.s:target
  	elseif has('macunix')
  		if strlen(s:viewer)
! 			let s:viewer = '-a '.s:viewer
  		endif
! 		let execString = 'silent! !open' s:viewer mainfname.'.'.s:target
  	else
  		" taken from Dimitri Antoniou's tip on vim.sf.net (tip #225).
***************
*** 326,331 ****
  		return
  	end
  	" only know how to do forward search for yap on windows and xdvik (and
! 	" some newer versions of xdvi) on unices.
  	if !exists('g:Tex_ViewRule_dvi')
  		return
--- 326,334 ----
  		return
  	end
+ 
  	" only know how to do forward search for yap on windows and xdvik (and
! 	" some newer versions of xdvi) on unices. Therefore forward searching will
! 	" automatically open the DVI viewer irrespective of what the user chose as
! 	" the default view format.
  	if !exists('g:Tex_ViewRule_dvi')
  		return
***************
*** 346,350 ****
  	" tips on vim.sf.net (vim.sf.net tip #225)
  	if has('win32')
! 		let execString = 'silent! !start '.viewer.' -s '.line('.').expand('%:p:t').' '.mainfname
  	else
  		if exists('g:Tex_UseEditorSettingInDVIViewer') &&
--- 349,355 ----
  	" tips on vim.sf.net (vim.sf.net tip #225)
  	if has('win32')
! 
! 		let execString = 'silent! !start '. viewer.' -s '.line('.').expand('%:p:t').' '.mainfname
! 
  	else
  		if exists('g:Tex_UseEditorSettingInDVIViewer') &&
***************
*** 352,364 ****
  					\ exists('v:servername') &&
  					\ (viewer == "xdvi" || viewer == "xdvik") 
  			let execString = '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').
! 						\ ' -editor "gvim --servername '.v:servername.
! 						\ ' --remote-silent +\%l \%f" '.mainfname.'.dvi &'
  		elseif exists('g:Tex_UseEditorSettingInDVIViewer') &&
  					\ g:Tex_UseEditorSettingInDVIViewer == 1 &&
  					\ viewer == "kdvi"
  			let execString = 'silent! !kdvi --unique file:'.mainfname.'.dvi\#src:'.line('.').Tex_GetMainFileName(":p:t:r").' &'
  		else
  			let execString = 'silent! !'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' '.mainfname.'.dvi &'
  		endif
  	end
--- 357,375 ----
  					\ exists('v:servername') &&
  					\ (viewer == "xdvi" || viewer == "xdvik") 
+ 
  			let execString = '!'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').
! 						\ ' -editor "gvim --servername '.v:servername.' --remote-silent +\%l \%f" '.
! 						\ mainfname.'.dvi &'
! 
  		elseif exists('g:Tex_UseEditorSettingInDVIViewer') &&
  					\ g:Tex_UseEditorSettingInDVIViewer == 1 &&
  					\ viewer == "kdvi"
+ 
  			let execString = 'silent! !kdvi --unique file:'.mainfname.'.dvi\#src:'.line('.').Tex_GetMainFileName(":p:t:r").' &'
+ 
  		else
+ 
  			let execString = 'silent! !'.viewer.' -name xdvi -sourceposition '.line('.').expand('%').' '.mainfname.'.dvi &'
+ 
  		endif
  	end
***************
*** 520,528 ****
  		" changes, we will rerun latex.
  		if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
! 			let bibFileName = mainFileName_root . '.bbl'
  
  			let biblinesBefore = Tex_CatFile(bibFileName)
  
! 			echomsg "Running '" . g:Tex_BibtexFlavor . "' ..."
  			let temp_mp = &mp | let &mp = g:Tex_BibtexFlavor
  			exec 'silent! make '.mainFileName_root
--- 531,539 ----
  		" changes, we will rerun latex.
  		if runCount == 0 && Tex_IsPresentInFile('\\bibdata', mainFileName_root.'.aux')
! 			let bibFileName = mainFileName_root.'.bbl'
  
  			let biblinesBefore = Tex_CatFile(bibFileName)
  
! 			echomsg "Running '".g:Tex_BibtexFlavor."' ..."
  			let temp_mp = &mp | let &mp = g:Tex_BibtexFlavor
  			exec 'silent! make '.mainFileName_root
***************
*** 577,581 ****
  	if getline('.') !~ '|\d\+ \(error\|warning\)|'
  		if !search('|\d\+ \(error\|warning\)|')
! 			echomsg "not finding error pattern anywhere in quickfix window :".bufname(bufnr('%'))
  			pclose!
  			return
--- 588,593 ----
  	if getline('.') !~ '|\d\+ \(error\|warning\)|'
  		if !search('|\d\+ \(error\|warning\)|')
! 			call Tex_Debug("not finding error pattern anywhere in quickfix window :".bufname(bufnr('%')),
! 						\ 'comp')
  			pclose!
  			return