[Vim-latex-cvs] SF.net SVN: vim-latex:[1051] trunk/vimfiles/ftplugin

[<tm...@us...>]

Revision: 1051
          http://vim-latex.svn.sourceforge.net/vim-latex/?rev=1051&view=rev
Author:   tmaas
Date:     2009-06-02 18:33:54 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
add fnameescape() to various places, where files are sourced. Patch by Gary
Johnson.
This fixes failures in case the path contains spaces. Other special
characters may have caused problems, too.

Modified Paths:
--------------
    trunk/vimfiles/ftplugin/latex-suite/envmacros.vim
    trunk/vimfiles/ftplugin/latex-suite/main.vim
    trunk/vimfiles/ftplugin/latex-suite/texmenuconf.vim
    trunk/vimfiles/ftplugin/latex-suite/texproject.vim
    trunk/vimfiles/ftplugin/tex_latexSuite.vim

Modified: trunk/vimfiles/ftplugin/latex-suite/envmacros.vim
===================================================================
--- trunk/vimfiles/ftplugin/latex-suite/envmacros.vim	2009-04-29 13:29:56 UTC (rev 1050)
+++ trunk/vimfiles/ftplugin/latex-suite/envmacros.vim	2009-06-02 18:33:54 UTC (rev 1051)
@@ -10,7 +10,7 @@
 	finish
 endif
 
-exe 'so '.expand('<sfile>:p:h').'/wizardfuncs.vim'
+exe 'so '.fnameescape(expand('<sfile>:p:h').'/wizardfuncs.vim')
 
 nmap <silent> <script> <plug> i
 imap <silent> <script> <C-o><plug> <Nop>

Modified: trunk/vimfiles/ftplugin/latex-suite/main.vim
===================================================================
--- trunk/vimfiles/ftplugin/latex-suite/main.vim	2009-04-29 13:29:56 UTC (rev 1050)
+++ trunk/vimfiles/ftplugin/latex-suite/main.vim	2009-06-02 18:33:54 UTC (rev 1051)
@@ -29,7 +29,7 @@
 " set up personal defaults.
 runtime ftplugin/tex/texrc
 " set up global defaults.
-exe "so ".s:path.'/texrc'
+exe "so ".fnameescape(s:path.'/texrc')
 
 " }}}
 
@@ -805,39 +805,39 @@
 " }}}
 
 " source texproject.vim before other files
-exe 'source '.s:path.'/texproject.vim'
+exe 'source '.fnameescape(s:path.'/texproject.vim')
 
 " source all the relevant files.
-exe 'source '.s:path.'/texmenuconf.vim'
-exe 'source '.s:path.'/envmacros.vim'
-exe 'source '.s:path.'/elementmacros.vim'
+exe 'source '.fnameescape(s:path.'/texmenuconf.vim')
+exe 'source '.fnameescape(s:path.'/envmacros.vim')
+exe 'source '.fnameescape(s:path.'/elementmacros.vim')
 
 " source utf-8 or plain math menus
 if exists("g:Tex_UseUtfMenus") && g:Tex_UseUtfMenus != 0 && has("gui_running")
-	exe 'source '.s:path.'/mathmacros-utf.vim'
+	exe 'source '.fnameescape(s:path.'/mathmacros-utf.vim')
 else
-	exe 'source '.s:path.'/mathmacros.vim'
+	exe 'source '.fnameescape(s:path.'/mathmacros.vim')
 endif
 
-exe 'source '.s:path.'/multicompile.vim'
-exe 'source '.s:path.'/compiler.vim'
-exe 'source '.s:path.'/folding.vim'
-exe 'source '.s:path.'/templates.vim'
-exe 'source '.s:path.'/custommacros.vim'
-exe 'source '.s:path.'/bibtex.vim'
+exe 'source '.fnameescape(s:path.'/multicompile.vim')
+exe 'source '.fnameescape(s:path.'/compiler.vim')
+exe 'source '.fnameescape(s:path.'/folding.vim')
+exe 'source '.fnameescape(s:path.'/templates.vim')
+exe 'source '.fnameescape(s:path.'/custommacros.vim')
+exe 'source '.fnameescape(s:path.'/bibtex.vim')
 
 " source advanced math functions
 if g:Tex_AdvancedMath == 1
-	exe 'source '.s:path.'/brackets.vim'
-	exe 'source '.s:path.'/smartspace.vim'
+	exe 'source '.fnameescape(s:path.'/brackets.vim')
+	exe 'source '.fnameescape(s:path.'/smartspace.vim')
 endif
 
 if g:Tex_Diacritics != 0
-	exe 'source '.s:path.'/diacritics.vim'
+	exe 'source '.fnameescape(s:path.'/diacritics.vim')
 endif
 
-exe 'source '.s:path.'/texviewer.vim'
-exe 'source '.s:path.'/version.vim'
+exe 'source '.fnameescape(s:path.'/texviewer.vim')
+exe 'source '.fnameescape(s:path.'/version.vim')
 
 " ==============================================================================
 " Finally set up the folding, options, mappings and quit.
@@ -921,7 +921,7 @@
 let g:Tex_completion_explorer = ','
 
 " Mappings defined in package files will overwrite all other
-exe 'source '.s:path.'/packages.vim'
+exe 'source '.fnameescape(s:path.'/packages.vim')
 
 " ==============================================================================
 " These functions are used to immitate certain operating system type functions

Modified: trunk/vimfiles/ftplugin/latex-suite/texmenuconf.vim
===================================================================
--- trunk/vimfiles/ftplugin/latex-suite/texmenuconf.vim	2009-04-29 13:29:56 UTC (rev 1050)
+++ trunk/vimfiles/ftplugin/latex-suite/texmenuconf.vim	2009-06-02 18:33:54 UTC (rev 1051)
@@ -89,7 +89,7 @@
 	if a:type == 'math'
 		if a:action == 1
 			let g:Tex_MathMenus = 1
-			exe 'so '.s:path.'/mathmacros.vim'
+			exe 'so '.fnameescape(s:path.'/mathmacros.vim')
 			exe 'amenu disable '.menuloc.'Add\ Math\ Menu'
 			exe 'amenu enable '.menuloc.'Remove\ Math\ Menu'
 		elseif a:action == 0
@@ -107,11 +107,11 @@
 			exe 'amenu enable '.menuloc.'Expand\ Elements'
 			exe 'amenu disable '.menuloc.'Compress\ Elements'
 		endif
-		exe 'source '.s:path.'/elementmacros.vim'
+		exe 'source '.fnameescape(s:path.'/elementmacros.vim')
 	elseif a:type == 'packages'
 		if a:action == 1
 			let g:Tex_PackagesMenu = 1
-			exe 'so '.s:path.'/packages.vim'
+			exe 'so '.fnameescape(s:path.'/packages.vim')
 			exe 'amenu disable '.menuloc.'Load\ Packages\ Menu'
 		endif
 	endif

Modified: trunk/vimfiles/ftplugin/latex-suite/texproject.vim
===================================================================
--- trunk/vimfiles/ftplugin/latex-suite/texproject.vim	2009-04-29 13:29:56 UTC (rev 1050)
+++ trunk/vimfiles/ftplugin/latex-suite/texproject.vim	2009-06-02 18:33:54 UTC (rev 1051)
@@ -39,7 +39,7 @@
 
 	if glob(Tex_GetMainFileName(':p').'.latexmain') != ''
 		call Tex_Debug("Tex_ProjectLoad: sourcing [".Tex_GetMainFileName().".latexmain]", "proj")
-		exec 'source '.Tex_GetMainFileName().'.latexmain'
+		exec 'source 'fnameescape(.Tex_GetMainFileName().'.latexmain')
 	endif
 	
 	call Tex_CD(curd)

Modified: trunk/vimfiles/ftplugin/tex_latexSuite.vim
===================================================================
--- trunk/vimfiles/ftplugin/tex_latexSuite.vim	2009-04-29 13:29:56 UTC (rev 1050)
+++ trunk/vimfiles/ftplugin/tex_latexSuite.vim	2009-06-02 18:33:54 UTC (rev 1051)
@@ -5,7 +5,7 @@
 
 if !exists('s:initLatexSuite')
 	let s:initLatexSuite = 1
-	exec 'so '.expand('<sfile>:p:h').'/latex-suite/main.vim'
+	exec 'so '.fnameescape(expand('<sfile>:p:h').'/latex-suite/main.vim')
 
 	silent! do LatexSuite User LatexSuiteInitPost
 endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.