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

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

Revision: 1105
          http://vim-latex.svn.sourceforge.net/vim-latex/?rev=1105&view=rev
Author:   tmaas
Date:     2010-02-02 23:51:36 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
properly escapee arguments for outline.main

- a the usage of fnameescape in changeset 1098 was not correct for running
  outline.main or outline.py. This has now been corrected using vim.eval and
  shellescape

Modified Paths:
--------------
    trunk/vimfiles/ftplugin/latex-suite/texviewer.vim

Modified: trunk/vimfiles/ftplugin/latex-suite/texviewer.vim
===================================================================
--- trunk/vimfiles/ftplugin/latex-suite/texviewer.vim	2010-01-29 00:38:56 UTC (rev 1104)
+++ trunk/vimfiles/ftplugin/latex-suite/texviewer.vim	2010-02-02 23:51:36 UTC (rev 1105)
@@ -738,6 +738,15 @@
     set cmdheight=1
     set lazyredraw
 
+	if has('python') && Tex_GetVarValue('Tex_UsePython')
+		python retval = outline.main(vim.eval("Tex_GetMainFileName(':p')"), vim.eval("s:prefix"))
+
+		" transfer variable from python to a local variable.
+		python vim.command("""let retval = "%s" """ % re.sub(r'"|\\', r'\\\g<0>', retval))
+	else
+		let retval = system(shellescape(s:path.'/outline.py').' '.shellescape(mainfname).' '.shellescape(s:prefix))
+	endif
+
     bot split __OUTLINE__
 	exec Tex_GetVarValue('Tex_OutlineWindowHeight', 15).' wincmd _'
 
@@ -751,20 +760,8 @@
 
 	" delete everything in it to the blackhole
 	% d _
+	0put!=retval
 
-	if has('python') && Tex_GetVarValue('Tex_UsePython')
-		exec 'python retval = outline.main('
-			\. 'r"' . fnameescape(fnamemodify(mainfname, ':p')) . '", '
-			\. 'r"' . s:prefix . '")'
-
-		" transfer variable from python to a local variable.
-		python vim.command("""let retval = "%s" """ % re.sub(r'"|\\', r'\\\g<0>', retval))
-
-		0put!=retval
-	else
-		exec '0r!'.shellescape(s:path.'/outline.py').' '.fnameescape(mainfname).' '.s:prefix
-	endif
-
 	0
 
     call Tex_SetupOutlineSyntax()


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