Skip to content

Commit

Permalink
Partially synced with the branch.
Browse files Browse the repository at this point in the history
git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1150 2a77ed30-b011-0410-a7ad-c7884a0aa172
  • Loading branch information
edyfox committed Aug 7, 2008
1 parent 148cf41 commit b968478
Show file tree
Hide file tree
Showing 170 changed files with 786 additions and 470 deletions.
2 changes: 1 addition & 1 deletion README_src.txt
@@ -1,4 +1,4 @@
README_src.txt for version 7.2b of Vim: Vi IMproved.
README_src.txt for version 7.2c of Vim: Vi IMproved.

The source archive contains the files needed to compile Vim on Unix systems.
It is packed for Unix systems (NL line separator). It is also used for other
Expand Down
6 changes: 3 additions & 3 deletions runtime/autoload/ada.vim
@@ -1,15 +1,15 @@
"------------------------------------------------------------------------------
" Description: Perform Ada specific completion & tagging.
" Language: Ada (2005)
" $Id: ada.vim,v 1.7 2008/07/13 17:33:59 vimboss Exp $
" $Id: ada.vim,v 1.8 2008/08/06 16:55:19 vimboss Exp $
" Maintainer: Martin Krischik <krischik@users.sourceforge.net>
" Taylor Venable <taylor@metasyntax.net>
" Neil Bird <neil@fnxweb.com>
" Ned Okie <nokie@radford.edu>
" $Author: vimboss $
" $Date: 2008/07/13 17:33:59 $
" $Date: 2008/08/06 16:55:19 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
" History: 24.05.2006 MK Unified Headers
" 26.05.2006 MK ' should not be in iskeyword.
Expand Down
6 changes: 3 additions & 3 deletions runtime/autoload/adacomplete.vim
@@ -1,12 +1,12 @@
"------------------------------------------------------------------------------
" Description: Vim Ada omnicompletion file
" Language: Ada (2005)
" $Id: adacomplete.vim,v 1.7 2008/07/13 17:24:52 vimboss Exp $
" $Id: adacomplete.vim,v 1.8 2008/08/06 16:44:07 vimboss Exp $
" Maintainer: Martin Krischik
" $Author: vimboss $
" $Date: 2008/07/13 17:24:52 $
" $Date: 2008/08/06 16:44:07 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/adacomplete.vim $
" History: 24.05.2006 MK Unified Headers
" 26.05.2006 MK improved search for begin of word.
Expand Down
6 changes: 3 additions & 3 deletions runtime/autoload/decada.vim
@@ -1,13 +1,13 @@
"------------------------------------------------------------------------------
" Description: Vim Ada/Dec Ada compiler file
" Language: Ada (Dec Ada)
" $Id: decada.vim,v 1.7 2008/07/13 17:22:10 vimboss Exp $
" $Id: decada.vim,v 1.8 2008/08/06 16:39:09 vimboss Exp $
" Copyright: Copyright (C) 2006 Martin Krischik
" Maintainer: Martin Krischik <krischik@users.sourceforge.net>
" $Author: vimboss $
" $Date: 2008/07/13 17:22:10 $
" $Date: 2008/08/06 16:39:09 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/decada.vim $
" History: 21.07.2006 MK New Dec Ada
" 15.10.2006 MK Bram's suggestion for runtime integration
Expand Down
6 changes: 3 additions & 3 deletions runtime/autoload/gnat.vim
@@ -1,14 +1,14 @@
"------------------------------------------------------------------------------
" Description: Vim Ada/GNAT compiler file
" Language: Ada (GNAT)
" $Id: gnat.vim,v 1.7 2008/07/13 17:39:19 vimboss Exp $
" $Id: gnat.vim,v 1.8 2008/08/06 17:02:58 vimboss Exp $
" Copyright: Copyright (C) 2006 Martin Krischik
" Maintainer: Martin Krischi <krischik@users.sourceforge.net>k
" Ned Okie <nokie@radford.edu>
" $Author: vimboss $
" $Date: 2008/07/13 17:39:19 $
" $Date: 2008/08/06 17:02:58 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/gnat.vim $
" History: 24.05.2006 MK Unified Headers
" 16.07.2006 MK Ada-Mode as vim-ball
Expand Down
236 changes: 119 additions & 117 deletions runtime/autoload/netrw.vim

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion runtime/autoload/rubycomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: Ruby
" Maintainer: Mark Guzman <segfault@hasno.info>
" Info: $Id: rubycomplete.vim,v 1.12 2008/07/13 17:20:00 vimboss Exp $
" Info: $Id: rubycomplete.vim,v 1.13 2008/08/06 16:34:36 vimboss Exp $
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
Expand Down
6 changes: 3 additions & 3 deletions runtime/autoload/tar.vim
@@ -1,7 +1,7 @@
" tar.vim: Handles browsing tarfiles
" AUTOLOAD PORTION
" Date: Jul 12, 2008
" Version: 19 + changes by Bram
" Date: Jul 30, 2008
" Version: 20
" Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
" License: Vim License (see vim's :help license)
"
Expand All @@ -24,7 +24,7 @@ set cpo&vim
if &cp || exists("g:loaded_tar") || v:version < 700
finish
endif
let g:loaded_tar= "v19+b"
let g:loaded_tar= "v20"
"call Decho("loading autoload/tar.vim")
if v:version < 701 || (v:version == 701 && !has("patch299"))
echoerr "(autoload/tar.vim) need vim v7.1 with patchlevel 299"
Expand Down
60 changes: 18 additions & 42 deletions 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
" Date: Jul 30, 2008
" Version: 29
" 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
Expand All @@ -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 = "v29"
set cpo&vim
"DechoTabOn

Expand Down Expand Up @@ -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)
" call Decho("exe $r ".fnameescape(svfile))
exe "$r ".fnameescape(svfile)

call setline(lastline+1,line("$") - lastline - 1)
" call Decho("lastline=".lastline." line$=".line("$"))
Expand All @@ -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)
" call Decho("exe w! ".fnameescape(vbname))
exe "w! ".fnameescape(vbname)
else
let vbnamepath= s:Path(vbname,'')
" call Decho("exe w ".fnameescape(vbnamepath))
exe "w ".fnameescape(vbnamepath)
" call Decho("exe w ".fnameescape(vbname))
exe "w ".fnameescape(vbname)
endif
" call Decho("Vimball<".vbname."> created")
echo "Vimball<".vbname."> created"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -577,27 +574,6 @@ fun! s:ChgDir(newdir)
" call Dret("ChgDir : curdir<".getcwd().">")
endfun

" ---------------------------------------------------------------------
" s:Path: prepend and append quotes and do escaping {{{2
fun! s:Path(cmd,quote)
" call Dfunc("Path(cmd<".a:cmd."> quote<".a:quote.">) vimball_path_escape<".g:vimball_path_escape.">")
if (has("win32") || has("win95") || has("win64") || has("win16"))
" let cmdpath= a:quote.substitute(a:cmd,'/','\\','g').a:quote
let cmdpath= a:quote.substitute(a:cmd,'\\','/','g').a:quote
" call Decho("cmdpath<".cmdpath."> (win32 mod)")
else
let cmdpath= a:quote.a:cmd.a:quote
" call Decho("cmdpath<".cmdpath."> (not-win32 mod)")
endif
if a:quote == "" && g:vimball_path_escape !~ ' '
let cmdpath= escape(cmdpath,' ')
" call Decho("cmdpath<".cmdpath."> (empty quote case)")
endif
let cmdpath= escape(cmdpath,g:vimball_path_escape)
" call Dret("Path <".cmdpath.">")
return cmdpath
endfun

" ---------------------------------------------------------------------
" s:RecordInVar: record a un-vimball command in the .VimballRecord file {{{2
fun! s:RecordInVar(home,cmd)
Expand Down Expand Up @@ -719,14 +695,14 @@ fun! vimball#SaveSettings()
let s:acdkeep = &acd
endif
let s:eikeep = &ei
let s:fenkeep = &fen
let s:fenkeep = &l:fen
let s:hidkeep = &hidden
let s:ickeep = &ic
let s:lzkeep = &lz
let s:pmkeep = &pm
let s:repkeep = &report
let s:vekeep = &ve
let s:ffkeep = &ff
let s:ffkeep = &l:ff
if exists("&acd")
setlocal ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm= ff=unix
else
Expand All @@ -745,15 +721,15 @@ fun! vimball#RestoreSettings()
if exists("&acd")
let &acd = s:acdkeep
endif
let &fen = s:fenkeep
let &l:fen = s:fenkeep
let &hidden = s:hidkeep
let &ic = s:ickeep
let &lz = s:lzkeep
let &pm = s:pmkeep
let &report = s:repkeep
let &ve = s:vekeep
let &ei = s:eikeep
let &ff = s:ffkeep
let &l:ff = s:ffkeep
if s:makeep[0] != 0
" restore mark a
" call Decho("restore mark-a: makeep=".string(makeep))
Expand Down
27 changes: 16 additions & 11 deletions runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
" zip.vim: Handles browsing zipfiles
" AUTOLOAD PORTION
" Date: Jul 12, 2008
" Version: 21 (modified by Bram)
" Date: Jul 30, 2008
" Version: 22
" Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
" License: Vim License (see vim's :help license)
" Copyright: Copyright (C) 2005-2008 Charles E. Campbell, Jr. {{{1
Expand All @@ -22,7 +22,7 @@ if &cp || exists("g:loaded_zip") || v:version < 700
finish
endif

let g:loaded_zip = "v21+b"
let g:loaded_zip = "v22"
let s:zipfile_escape = ' ?&;\'
let s:ERROR = 2
let s:WARNING = 1
Expand Down Expand Up @@ -58,6 +58,12 @@ fun! zip#Browse(zipfile)
set report=10

" sanity checks
if !exists("*fnameescape")
if &verbose > 1
echoerr "the zip plugin is not available (your vim doens't support fnameescape())"
endif
return
endif
if !executable(g:zip_unzipcmd)
redraw!
echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
Expand Down Expand Up @@ -99,8 +105,8 @@ fun! zip#Browse(zipfile)
0d
$

" call Decho("exe silent r! ".g:zip_unzipcmd." -l ".s:Escape(a:zipfile,1))
exe "silent r! ".g:zip_unzipcmd." -l ".s:Escape(a:zipfile,1)
" call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
exe "silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1)
if v:shell_error != 0
redraw!
echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
Expand Down Expand Up @@ -193,8 +199,8 @@ fun! zip#Read(fname,mode)
" call Decho("zipfile<".zipfile.">")
" call Decho("fname <".fname.">")

" call Decho("exe r! ".g:zip_unzipcmd." -p ".s:Escape(zipfile,1)." ".s:Escape(fname,1))
exe "silent r! ".g:zip_unzipcmd." -p ".s:Escape(zipfile,1)." ".s:Escape(fname,1)
" call Decho("exe r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1))
exe "silent r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1)

" cleanup
0d
Expand Down Expand Up @@ -286,8 +292,8 @@ fun! zip#Write(fname)
let fname = substitute(fname, '[', '[[]', 'g')
endif

" call Decho(g:zip_zipcmd." -u ".s:Escape(zipfile,0)." ".s:Escape(fname,0))
call system(g:zip_zipcmd." -u ".s:Escape(zipfile,0)." ".s:Escape(fname,0))
" call Decho(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
call system(g:zip_zipcmd." -u ".s:Escape(fnamemodify(zipfile,":p"),0)." ".s:Escape(fname,0))
if v:shell_error != 0
redraw!
echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
Expand Down Expand Up @@ -342,9 +348,8 @@ endfun
fun! s:ChgDir(newdir,errlvl,errmsg)
" call Dfunc("ChgDir(newdir<".a:newdir."> errlvl=".a:errlvl." errmsg<".a:errmsg.">)")


try
exe "cd ".fnameescape(newdir)
exe "cd ".fnameescape(a:newdir)
catch /^Vim\%((\a\+)\)\=:E344/
redraw!
if a:errlvl == s:NOTE
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/decada.vim
@@ -1,13 +1,13 @@
"------------------------------------------------------------------------------
" Description: Vim Ada/Dec Ada compiler file
" Language: Ada (Dec Ada)
" $Id: decada.vim,v 1.7 2008/07/13 17:36:18 vimboss Exp $
" $Id: decada.vim,v 1.8 2008/08/06 16:58:48 vimboss Exp $
" Copyright: Copyright (C) 2006 Martin Krischik
" Maintainer: Martin Krischik <krischik@users.sourceforge.net>
" $Author: vimboss $
" $Date: 2008/07/13 17:36:18 $
" $Date: 2008/08/06 16:58:48 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/decada.vim $
" History: 21.07.2006 MK New Dec Ada
" 15.10.2006 MK Bram's suggestion for runtime integration
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/eruby.vim
@@ -1,7 +1,7 @@
" Vim compiler file
" Language: eRuby
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Info: $Id: eruby.vim,v 1.7 2008/07/13 17:31:44 vimboss Exp $
" Info: $Id: eruby.vim,v 1.8 2008/08/06 16:53:08 vimboss Exp $
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
Expand Down
6 changes: 3 additions & 3 deletions runtime/compiler/gnat.vim
@@ -1,14 +1,14 @@
"------------------------------------------------------------------------------
" Description: Vim Ada/GNAT compiler file
" Language: Ada (GNAT)
" $Id: gnat.vim,v 1.7 2008/07/13 17:34:52 vimboss Exp $
" $Id: gnat.vim,v 1.8 2008/08/06 16:56:26 vimboss Exp $
" Copyright: Copyright (C) 2006 Martin Krischik
" Maintainer: Martin Krischi <krischik@users.sourceforge.net>k
" Ned Okie <nokie@radford.edu>
" $Author: vimboss $
" $Date: 2008/07/13 17:34:52 $
" $Date: 2008/08/06 16:56:26 $
" Version: 4.6
" $Revision: 1.7 $
" $Revision: 1.8 $
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/compiler/gnat.vim $
" History: 24.05.2006 MK Unified Headers
" 16.07.2006 MK Ada-Mode as vim-ball
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/rspec.vim
@@ -1,7 +1,7 @@
" Vim compiler file
" Language: RSpec
" Maintainer: Tim Pope <vimNOSPAM@tpope.info>
" Info: $Id: rspec.vim,v 1.1 2008/07/13 17:24:26 vimboss Exp $
" Info: $Id: rspec.vim,v 1.2 2008/08/06 16:42:56 vimboss Exp $
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/ruby.vim
Expand Up @@ -2,7 +2,7 @@
" Language: Ruby
" Function: Syntax check and/or error reporting
" Maintainer: Tim Hammerquist <timh at rubyforge.org>
" Info: $Id: ruby.vim,v 1.9 2008/07/13 17:22:00 vimboss Exp $
" Info: $Id: ruby.vim,v 1.10 2008/08/06 16:38:56 vimboss Exp $
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/rubyunit.vim
@@ -1,7 +1,7 @@
" Vim compiler file
" Language: Test::Unit - Ruby Unit Testing Framework
" Maintainer: Doug Kearns <dougkearns@gmail.com>
" Info: $Id: rubyunit.vim,v 1.7 2008/07/13 17:41:10 vimboss Exp $
" Info: $Id: rubyunit.vim,v 1.8 2008/08/06 17:05:14 vimboss Exp $
" URL: http://vim-ruby.rubyforge.org
" Anon CVS: See above site
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
Expand Down

0 comments on commit b968478

Please sign in to comment.