[SCM] Vim packaging branch, maint/lenny, updated. debian/7.1.314-3-51-g209709e
James Vega
jamessan at debian.org
Sun Oct 12 06:29:15 UTC 2008
The following commit has been merged in the maint/lenny branch:
commit 8312857d2436b437b2a41c87780467a90400cf85
Author: James Vega <jamessan at debian.org>
Date: Thu Oct 9 22:43:52 2008 -0400
Update filename escaping in vimball plugin
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim
index d69c645..44fdd47 100644
--- a/runtime/autoload/vimball.vim
+++ b/runtime/autoload/vimball.vim
@@ -1,7 +1,7 @@
" vimball.vim : construct a file containing both paths and files
" Author: Charles E. Campbell, Jr.
" Date: Jun 05, 2008
-" Version: 27
+" Version: 27+Debian
" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
" Copyright: (c) 2004-2008 by Charles E. Campbell, Jr.
" The VIM LICENSE applies to Vimball.vim, and Vimball.txt
@@ -15,7 +15,7 @@ if &cp || exists("g:loaded_vimball") || v:version < 700
finish
endif
let s:keepcpo = &cpo
-let g:loaded_vimball = "v27"
+let g:loaded_vimball = "v27+Debian"
set cpo&vim
"DechoTabOn
@@ -169,9 +169,8 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
call setline(lastline+1,0)
" write the file from the tab
- let svfilepath= s:Path(svfile,'')
" call Decho("exe $r ".fnameescape(svfilepath))
- exe "$r ".fnameescape(svfilepath)
+ exe "$r ".fnameescape(svfile)
call setline(lastline+1,line("$") - lastline - 1)
" call Decho("lastline=".lastline." line$=".line("$"))
@@ -186,13 +185,11 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
call s:ChgDir(curdir)
setlocal ff=unix
if a:writelevel
- let vbnamepath= s:Path(vbname,'')
" call Decho("exe w! ".fnameescape(vbnamepath))
- exe "w! ".fnameescape(vbnamepath)
+ exe "w! ".fnameescape(vbname)
else
- let vbnamepath= s:Path(vbname,'')
" call Decho("exe w ".fnameescape(vbnamepath))
- exe "w ".fnameescape(vbnamepath)
+ exe "w ".fnameescape(vbname)
endif
" call Decho("Vimball<".vbname."> created")
echo "Vimball<".vbname."> created"
@@ -215,8 +212,8 @@ endfun
fun! vimball#Vimball(really,...)
" call Dfunc("vimball#Vimball(really=".a:really.") a:0=".a:0)
- if v:version < 701 || (v:version == 701 && !has("patch299"))
- echoerr "This version of vimball requires vim 7.1 with patch 299"
+ if v:version < 701 || (v:version == 701 && !exists("*fnameescape"))
+ echoerr "your vim is missing the fnameescape() function"
" call Dret("vimball#Vimball : needs 7.1 with patch 299")
return
endif
@@ -338,7 +335,7 @@ fun! vimball#Vimball(really,...)
" write tab to file
if a:really
- let fnamepath= s:Path(home."/".fname,'')
+ let fnamepath= home."/".fname
" call Decho("exe w! ".fnameescape(fnamepath))
exe "silent w! ".fnameescape(fnamepath)
echo "wrote ".fnamepath
@@ -364,9 +361,9 @@ fun! vimball#Vimball(really,...)
" set up help
" call Decho("about to set up help: didhelp<".didhelp.">")
if didhelp != ""
- let htpath= s:Path(home."/".didhelp,"")
+ let htpath= home."/".didhelp
" call Decho("exe helptags ".htpath)
- exe "helptags ".htpath
+ exe "helptags ".fnameescape(htpath)
echo "did helptags"
endif
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list