From b968478e440312defa68a7c2a18150aac2bdd77a Mon Sep 17 00:00:00 2001 From: edyfox Date: Thu, 7 Aug 2008 03:59:49 +0000 Subject: [PATCH] Partially synced with the branch. git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1150 2a77ed30-b011-0410-a7ad-c7884a0aa172 --- README_src.txt | 2 +- runtime/autoload/ada.vim | 6 +- runtime/autoload/adacomplete.vim | 6 +- runtime/autoload/decada.vim | 6 +- runtime/autoload/gnat.vim | 6 +- runtime/autoload/netrw.vim | 236 +++++++++++++++++++------------------- runtime/autoload/rubycomplete.vim | 2 +- runtime/autoload/tar.vim | 6 +- runtime/autoload/vimball.vim | 60 +++------- runtime/autoload/zip.vim | 27 +++-- runtime/compiler/decada.vim | 6 +- runtime/compiler/eruby.vim | 2 +- runtime/compiler/gnat.vim | 6 +- runtime/compiler/rspec.vim | 2 +- runtime/compiler/ruby.vim | 2 +- runtime/compiler/rubyunit.vim | 2 +- runtime/doc/Makefile | 25 +++- runtime/doc/arabic.txt | 2 +- runtime/doc/autocmd.txt | 2 +- runtime/doc/change.txt | 4 +- runtime/doc/cmdline.txt | 19 +-- runtime/doc/debug.txt | 2 +- runtime/doc/debugger.txt | 2 +- runtime/doc/develop.txt | 2 +- runtime/doc/diff.txt | 8 +- runtime/doc/digraph.txt | 6 +- runtime/doc/editing.txt | 2 +- runtime/doc/eval.txt | 24 +++- runtime/doc/farsi.txt | 2 +- runtime/doc/filetype.txt | 25 +++- runtime/doc/fold.txt | 2 +- runtime/doc/ft_ada.txt | 2 +- runtime/doc/ft_sql.txt | 2 +- runtime/doc/gui.txt | 2 +- runtime/doc/gui_w16.txt | 2 +- runtime/doc/gui_w32.txt | 2 +- runtime/doc/gui_x11.txt | 2 +- runtime/doc/hangulin.txt | 2 +- runtime/doc/hebrew.txt | 2 +- runtime/doc/help.txt | 4 +- runtime/doc/howto.txt | 2 +- runtime/doc/if_cscop.txt | 2 +- runtime/doc/if_mzsch.txt | 2 +- runtime/doc/if_ole.txt | 2 +- runtime/doc/if_perl.txt | 2 +- runtime/doc/if_pyth.txt | 2 +- runtime/doc/if_ruby.txt | 2 +- runtime/doc/if_sniff.txt | 2 +- runtime/doc/if_tcl.txt | 2 +- runtime/doc/indent.txt | 6 +- runtime/doc/index.txt | 2 +- runtime/doc/insert.txt | 2 +- runtime/doc/intro.txt | 2 +- runtime/doc/map.txt | 2 +- runtime/doc/mbyte.txt | 2 +- runtime/doc/message.txt | 2 +- runtime/doc/mlang.txt | 2 +- runtime/doc/motion.txt | 18 +-- runtime/doc/netbeans.txt | 2 +- runtime/doc/options.txt | 27 ++--- runtime/doc/os_390.txt | 2 +- runtime/doc/os_amiga.txt | 2 +- runtime/doc/os_beos.txt | 2 +- runtime/doc/os_dos.txt | 2 +- runtime/doc/os_mac.txt | 2 +- runtime/doc/os_mint.txt | 2 +- runtime/doc/os_msdos.txt | 2 +- runtime/doc/os_os2.txt | 2 +- runtime/doc/os_qnx.txt | 2 +- runtime/doc/os_risc.txt | 2 +- runtime/doc/os_unix.txt | 2 +- runtime/doc/os_vms.txt | 2 +- runtime/doc/os_win32.txt | 2 +- runtime/doc/pattern.txt | 4 +- runtime/doc/pi_getscript.txt | 2 +- runtime/doc/pi_gzip.txt | 2 +- runtime/doc/pi_netrw.txt | 84 +++++++++++--- runtime/doc/pi_paren.txt | 2 +- runtime/doc/pi_spec.txt | 2 +- runtime/doc/pi_tar.txt | 2 +- runtime/doc/pi_vimball.txt | 2 +- runtime/doc/pi_zip.txt | 2 +- runtime/doc/print.txt | 2 +- runtime/doc/quickfix.txt | 2 +- runtime/doc/quickref.txt | 2 +- runtime/doc/quotes.txt | 2 +- runtime/doc/recover.txt | 2 +- runtime/doc/remote.txt | 2 +- runtime/doc/repeat.txt | 2 +- runtime/doc/rileft.txt | 2 +- runtime/doc/russian.txt | 2 +- runtime/doc/scroll.txt | 2 +- runtime/doc/sign.txt | 2 +- runtime/doc/spell.txt | 2 +- runtime/doc/sponsor.txt | 2 +- runtime/doc/starting.txt | 2 +- runtime/doc/syntax.txt | 6 +- runtime/doc/tabpage.txt | 2 +- runtime/doc/tags | 3 + runtime/doc/tagsrch.txt | 2 +- runtime/doc/term.txt | 2 +- runtime/doc/tips.txt | 2 +- runtime/doc/todo.txt | 93 +++++++++++---- runtime/doc/uganda.txt | 2 +- runtime/doc/undo.txt | 2 +- runtime/doc/usr_01.txt | 2 +- runtime/doc/usr_02.txt | 2 +- runtime/doc/usr_03.txt | 2 +- runtime/doc/usr_04.txt | 2 +- runtime/doc/usr_05.txt | 2 +- runtime/doc/usr_06.txt | 2 +- runtime/doc/usr_07.txt | 2 +- runtime/doc/usr_08.txt | 2 +- runtime/doc/usr_09.txt | 2 +- runtime/doc/usr_10.txt | 2 +- runtime/doc/usr_11.txt | 2 +- runtime/doc/usr_12.txt | 2 +- runtime/doc/usr_20.txt | 2 +- runtime/doc/usr_21.txt | 2 +- runtime/doc/usr_22.txt | 2 +- runtime/doc/usr_23.txt | 2 +- runtime/doc/usr_24.txt | 2 +- runtime/doc/usr_25.txt | 2 +- runtime/doc/usr_26.txt | 2 +- runtime/doc/usr_27.txt | 2 +- runtime/doc/usr_28.txt | 2 +- runtime/doc/usr_29.txt | 2 +- runtime/doc/usr_30.txt | 2 +- runtime/doc/usr_31.txt | 2 +- runtime/doc/usr_32.txt | 2 +- runtime/doc/usr_40.txt | 2 +- runtime/doc/usr_41.txt | 2 +- runtime/doc/usr_42.txt | 2 +- runtime/doc/usr_43.txt | 2 +- runtime/doc/usr_44.txt | 2 +- runtime/doc/usr_45.txt | 2 +- runtime/doc/usr_90.txt | 2 +- runtime/doc/usr_toc.txt | 2 +- runtime/doc/various.txt | 9 +- runtime/doc/version4.txt | 2 +- runtime/doc/version5.txt | 2 +- runtime/doc/version6.txt | 4 +- runtime/doc/version7.txt | 181 ++++++++++++++++++++++++++++- runtime/doc/vi_diff.txt | 2 +- runtime/doc/vim-fr.1 | 2 +- runtime/doc/vim-fr.UTF-8.1 | 2 +- runtime/doc/vim-it.1 | 2 +- runtime/doc/vim-it.UTF-8.1 | 2 +- runtime/doc/vim-pl.1 | 2 +- runtime/doc/vim-pl.UTF-8.1 | 2 +- runtime/doc/vim-ru.1 | 2 +- runtime/doc/vim-ru.UTF-8.1 | 2 +- runtime/doc/vim.1 | 4 +- runtime/doc/vim.man | 8 +- runtime/doc/vimdiff.1 | 6 +- runtime/doc/vimdiff.man | 14 +-- runtime/doc/visual.txt | 2 +- runtime/doc/windows.txt | 2 +- runtime/doc/workshop.txt | 2 +- runtime/indent/bst.vim | 2 +- runtime/plugin/netrwPlugin.vim | 24 ++-- runtime/plugin/tarPlugin.vim | 2 +- runtime/plugin/vimballPlugin.vim | 2 +- runtime/plugin/zipPlugin.vim | 11 +- runtime/scripts.vim | 3 +- runtime/spell/pt/main.aap | 2 +- runtime/spell/pt/pt_BR.diff | 2 +- runtime/spell/pt/pt_PT.diff | 2 +- runtime/tools/vimm | 4 +- runtime/tools/vimspell.sh | 3 +- 170 files changed, 786 insertions(+), 470 deletions(-) diff --git a/README_src.txt b/README_src.txt index 5cd87f72..b907bc52 100644 --- a/README_src.txt +++ b/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 diff --git a/runtime/autoload/ada.vim b/runtime/autoload/ada.vim index 1b2bfd07..f4f9305e 100644 --- a/runtime/autoload/ada.vim +++ b/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 " Taylor Venable " Neil Bird " Ned Okie " $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. diff --git a/runtime/autoload/adacomplete.vim b/runtime/autoload/adacomplete.vim index 1fb817dd..5e584519 100644 --- a/runtime/autoload/adacomplete.vim +++ b/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. diff --git a/runtime/autoload/decada.vim b/runtime/autoload/decada.vim index f0fca6d1..ad656aea 100644 --- a/runtime/autoload/decada.vim +++ b/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 " $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 diff --git a/runtime/autoload/gnat.vim b/runtime/autoload/gnat.vim index b673ae6a..20cad2f0 100644 --- a/runtime/autoload/gnat.vim +++ b/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 k " Ned Okie " $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 diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 6221294b..8bd597aa 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -1,7 +1,7 @@ " netrw.vim: Handles file transfer and remote directory listing across " AUTOLOAD SECTION -" Date: Jul 12, 2008 -" Version: 127 +" Date: Aug 01, 2008 +" Version: 131 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1 @@ -27,7 +27,7 @@ if !exists("s:NOTE") let s:WARNING = 1 let s:ERROR = 2 endif -let g:loaded_netrw = "v127" +let g:loaded_netrw = "v131" " sanity checks if v:version < 700 @@ -76,7 +76,13 @@ if !exists("g:netrw_ftp_cmd") let g:netrw_ftp_cmd = "ftp" endif if !exists("g:netrw_http_cmd") - if executable("curl") + if executable("elinks") + let g:netrw_http_cmd = "elinks" + let g:netrw_http_xcmd= "-dump >" + elseif executable("links") + let g:netrw_http_cmd = "links" + let g:netrw_http_xcmd= "-dump >" + elseif executable("curl") let g:netrw_http_cmd = "curl -o" elseif executable("wget") let g:netrw_http_cmd = "wget -q -O" @@ -359,6 +365,7 @@ endif if !exists("g:netrw_tmpfile_escape") let g:netrw_tmpfile_escape= ' &;' endif +let s:netrw_map_escape = "<|\n\r\\\\"" " BufEnter event ignored by decho when following variable is true " Has a side effect that doau BufReadPost doesn't work, so @@ -712,15 +719,16 @@ fun! netrw#NetRead(mode,...) " call Decho("read via ftp+.netrc (method #2)") let netrw_fname= b:netrw_fname call s:SaveBufVars()|new|call s:RestoreBufVars() + let filtbuf= bufnr("%") setlocal ff=unix - exe "put ='".g:netrw_ftpmode."'" -" call Decho("filter input: ".getline('.')) + put =g:netrw_ftpmode +" call Decho("filter input: ".getline(line("$"))) if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" -" call Decho("filter input: ".getline('.')) + put =g:netrw_ftpextracmd +" call Decho("filter input: ".getline(line("$"))) endif - exe "put ='".'get \"'.netrw_fname.'\" '.tmpfile."'" -" call Decho("filter input: ".getline('.')) + call setline(line("$")+1,'get "'.netrw_fname.'" '.tmpfile) +" call Decho("filter input: ".getline(line("$"))) if exists("g:netrw_port") && g:netrw_port != "" " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine." ".g:netrw_port,1)) exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine." ".g:netrw_port,1) @@ -746,6 +754,7 @@ fun! netrw#NetRead(mode,...) " call Decho("read via ftp+mipf (method #3)") let netrw_fname= escape(b:netrw_fname,g:netrw_fname_escape) call s:SaveBufVars()|new|call s:RestoreBufVars() + let filtbuf= bufnr("%") setlocal ff=unix if exists("g:netrw_port") && g:netrw_port != "" put ='open '.g:netrw_machine.' '.g:netrw_port @@ -770,7 +779,7 @@ fun! netrw#NetRead(mode,...) " call Decho("filter input: ".getline('.')) endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('.')) endif put ='get \"'.netrw_fname.'\" '.tmpfile @@ -820,15 +829,20 @@ fun! netrw#NetRead(mode,...) return endif - if match(b:netrw_fname,"#") == -1 - " using g:netrw_http_cmd (usually wget or curl) + if match(b:netrw_fname,"#") == -1 || exists("g:netrw_http_xcmd") + " using g:netrw_http_cmd (usually elinks, links, curl, wget, or fetch) " call Decho('using '.g:netrw_http_cmd.' (# not in b:netrw_fname<'.b:netrw_fname.">)") -" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.netrw_fname,1)) - exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1) + if exists("g:netrw_http_xcmd") +" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1)." ".g:netrw_http_xcmd." ".shellescape(tmpfile,1)) + exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1)." ".g:netrw_http_xcmd." ".shellescape(tmpfile,1) + else +" call Decho("exe ".s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1)) + exe s:netrw_silentxfer."!".g:netrw_http_cmd." ".shellescape(tmpfile,1)." ".shellescape("http://".g:netrw_machine.b:netrw_fname,1) + endif let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method) else - " wget/curl plus a jump to an in-page marker (ie. http://abc/def.html#aMarker) + " wget/curl/fetch plus a jump to an in-page marker (ie. http://abc/def.html#aMarker) " call Decho(("wget/curl plus jump (# in b:netrw_fname<".b:netrw_fname.">)") let netrw_html= substitute(b:netrw_fname,"#.*$","","") let netrw_tag = substitute(b:netrw_fname,"^.*#","","") @@ -1084,14 +1098,14 @@ fun! netrw#NetWrite(...) range new " call Decho("filter input window#".winnr()) setlocal ff=unix - exe "put ='".g:netrw_ftpmode."'" -" call Decho("filter input: ".getline('.')) + put =g:netrw_ftpmode +" call Decho("filter input: ".getline('$')) if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" -" call Decho("filter input: ".getline('.')) + put =g:netrw_ftpextracmd +" call Decho("filter input: ".getline("$")) endif - exe "put ='".'put \"'.tmpfile.'\" \"'.netrw_fname.'\"'."'" -" call Decho("filter input: ".getline('.')) + call setline(line("$")+1,'put "'.tmpfile.'" "'.netrw_fname.'"') +" call Decho("filter input: ".getline("$")) if exists("g:netrw_port") && g:netrw_port != "" " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1)) exe s:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".shellescape(g:netrw_machine,1)." ".shellescape(g:netrw_port,1) @@ -1276,10 +1290,11 @@ fun! netrw#NetSource(...) let i= 1 while i <= a:0 call netrw#NetRead(3,a:{i}) -" call Decho("s:netread_tmpfile<".s:netrw_tmpfile.">") +" call Decho("(netrw#NetSource) s:netread_tmpfile<".s:netrw_tmpfile.">") if s:FileReadable(s:netrw_tmpfile) -" call Decho("exe so ".s:netrw_tmpfile) - exe "so ".s:netrw_tmpfile +" call Decho("(netrw#NetSource) exe so ".fnameescape(s:netrw_tmpfile)) + exe "so ".fnameescape(s:netrw_tmpfile) +" call Decho("(netrw#NetSource) delete(".s:netrw_tmpfile.")") call delete(s:netrw_tmpfile) unlet s:netrw_tmpfile else @@ -1654,6 +1669,7 @@ endfun fun! s:BrowserMaps(islocal) " call Dfunc("s:BrowserMaps(islocal=".a:islocal.") b:netrw_curdir<".b:netrw_curdir.">") if a:islocal +" call Decho("make local maps") nnoremap :call netrw#LocalBrowseCheck(NetrwBrowseChgDir(1,NetrwGetWord())) nnoremap - :exe "norm! 0"call netrw#LocalBrowseCheck(NetrwBrowseChgDir(1,'../')) nnoremap a :call NetrwHide(1) @@ -1709,23 +1725,25 @@ fun! s:BrowserMaps(islocal) if s:didstarstar || !mapcheck("","n") nnoremap :Pexplore endif + let mapsafecurdir = escape(b:netrw_curdir, s:netrw_map_escape) if g:netrw_mousemaps == 1 nnoremap :call NetrwLeftmouse(1) nnoremap :call NetrwPrevWinOpen(1) nnoremap :call NetrwMarkFile(1,NetrwGetWord()) - exe 'nnoremap :call NetrwLocalRm("'.b:netrw_curdir.'")' - exe 'vnoremap :call NetrwLocalRm("'.b:netrw_curdir.'")' - endif - exe 'nnoremap :call NetrwLocalRm("'.b:netrw_curdir.'")' - exe 'vnoremap :call NetrwLocalRm("'.b:netrw_curdir.'")' - exe 'nnoremap D :call NetrwLocalRm("'.b:netrw_curdir.'")' - exe 'vnoremap D :call NetrwLocalRm("'.b:netrw_curdir.'")' - exe 'nnoremap R :call NetrwLocalRename("'.b:netrw_curdir.'")' - exe 'vnoremap R :call NetrwLocalRename("'.b:netrw_curdir.'")' + exe 'nnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'vnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' + endif + exe 'nnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'vnoremap :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'nnoremap D :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'vnoremap D :call NetrwLocalRm("'.mapsafecurdir.'")' + exe 'nnoremap R :call NetrwLocalRename("'.mapsafecurdir.'")' + exe 'vnoremap R :call NetrwLocalRename("'.mapsafecurdir.'")' exe 'nnoremap m :call NetrwMakeDir("")' nnoremap :he netrw-quickhelp else " remote +" call Decho("make remote maps") call s:RemotePathAnalysis(b:netrw_curdir) nnoremap :call NetrwBrowse(0,NetrwBrowseChgDir(0,NetrwGetWord())) nnoremap :call NetrwRefresh(0,NetrwBrowseChgDir(0,'./')) @@ -1774,21 +1792,25 @@ fun! s:BrowserMaps(islocal) if !hasmapto('NetrwRefresh') nmap NetrwRefresh endif + + let mapsafepath = escape(s:path, s:netrw_map_escape) + let mapsafeusermach = escape(s:user.s:machine, s:netrw_map_escape) + nnoremap NetrwRefresh :call NetrwRefresh(0,NetrwBrowseChgDir(0,'./')) if g:netrw_mousemaps == 1 nnoremap :call NetrwLeftmouse(0) nnoremap :call NetrwPrevWinOpen(0) nnoremap :call NetrwMarkFile(0,NetrwGetWord()) - exe 'nnoremap :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - exe 'vnoremap :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - endif - exe 'nnoremap :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - exe 'vnoremap :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - exe 'nnoremap d :call NetrwMakeDir("'.s:user.s:machine.'")' - exe 'nnoremap D :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - exe 'vnoremap D :call NetrwRemoteRm("'.s:user.s:machine.'","'.s:path.'")' - exe 'nnoremap R :call NetrwRemoteRename("'.s:user.s:machine.'","'.s:path.'")' - exe 'vnoremap R :call NetrwRemoteRename("'.s:user.s:machine.'","'.s:path.'")' + exe 'nnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'vnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + endif + exe 'nnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'vnoremap :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'nnoremap d :call NetrwMakeDir("'.mapsafeusermach.'")' + exe 'nnoremap D :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'vnoremap D :call NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'nnoremap R :call NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")' + exe 'vnoremap R :call NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")' nnoremap :he netrw-quickhelp endif call s:SetRexDir(a:islocal,b:netrw_curdir) @@ -1842,7 +1864,7 @@ fun! s:NetrwBookmarkDir(chg,curdir) " change to the bookmarked directory " call Decho("(user: ) change to the bookmarked directory") if exists("g:NETRW_BOOKMARKDIR_{v:count}") - exe "e ".g:NETRW_BOOKMARKDIR_{v:count} + exe "e ".fnameescape(g:NETRW_BOOKMARKDIR_{v:count}) else echomsg "Sorry, bookmark#".v:count." doesn't exist!" endif @@ -2340,8 +2362,8 @@ fun! s:NetrwGetBuffer(islocal,dirname) " let v:errmsg= "" " Decho let escdirname= fnameescape(dirname) " call Decho(" errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">") -" call Decho(' exe silent! keepalt file '.fnameescape(escdirname)) - exe 'silent! keepalt file '.fnameescape(escdirname) +" call Decho(' exe silent! keepalt file '.escdirname) + exe 'silent! keepalt file '.escdirname " call Decho(" errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">") endif " call Decho(" named enew buffer#".bufnr("%")."<".bufname("%").">") @@ -3273,7 +3295,7 @@ fun! netrw#Explore(indx,dosplit,style,...) if starpat == 1 " starpat=1: Explore *//pattern (current directory only search for files containing pattern) " call Decho("starpat=".starpat.": build *//pattern list") - exe "vimgrep /".pattern."/gj ".b:netrw_curdir."/*" + exe "vimgrep /".pattern."/gj ".fnameescape(b:netrw_curdir)."/*" let w:netrw_explore_list = map(getqflist(),'bufname(v:val.bufnr)') if &hls | let keepregslash= s:ExplorePatHls(pattern) | endif @@ -3707,6 +3729,14 @@ endfun " of whatever may happen to be under the cursor at that " moment. When the mouse and gui are available, " shift-leftmouse may also be used to mark files. +" +" Creates two lists +" s:netrwmarkfilelist -- holds complete paths to all marked files +" s:netrwmarkfilelist_# -- holds list of marked files in current-buffer's directory (#==bufnr()) +" +" Creates a marked file match string +" s:netrwmarfilemtch_# -- used with 2match to display marked files +" fun! s:NetrwMarkFile(islocal,fname) " call Dfunc("s:NetrwMarkFile(islocal=".a:islocal." fname<".a:fname.">)") let curbufnr= bufnr("%") @@ -3826,7 +3856,7 @@ fun! s:NetrwMarkFileCompress(islocal) let fname= shellescape(s:ComposePath(curdir,fname)) endif else - let fname= shellescape(b:netrw_curdir.fname) + let fname= shellescape(b:netrw_curdir.fname,1) endif if executable(exe) if a:islocal @@ -3886,7 +3916,7 @@ fun! s:NetrwMarkFileCopy(islocal) if a:islocal && s:netrwmftgt_islocal " Copy marked files, local directory to local directory " call Decho("copy from local to local") - let args= join(map(copy(s:netrwmarkfilelist_{bufnr('%')}),"b:netrw_curdir.\"/\".shellescape(v:val)")) + let args= join(map(deepcopy(s:netrwmarkfilelist_{bufnr('%')}),"shellescape(b:netrw_curdir.\"/\".v:val)")) " call Decho("system(".g:netrw_localcopycmd." ".args." ".shellescape(s:netrwmftgt).")") call system(s:WinPath(g:netrw_localcopycmd)." ".args." ".shellescape(s:netrwmftgt)) @@ -3914,7 +3944,7 @@ fun! s:NetrwMarkFileCopy(islocal) if isdirectory(tmpdir) exe "keepjumps lcd ".fnameescape(tmpdir) call netrw#NetrwObtain(a:islocal,s:netrwmarkfilelist_{bufnr('%')},tmpdir) - let localfiles= map(copy(s:netrwmarkfilelist_{bufnr('%')}),'substitute(v:val,"^.*/","","")') + let localfiles= map(deepcopy(s:netrwmarkfilelist_{bufnr('%')}),'substitute(v:val,"^.*/","","")') call s:NetrwUpload(localfiles,s:netrwmftgt) if getcwd() == tmpdir for fname in s:netrwmarkfilelist_{bufnr('%')} @@ -3957,24 +3987,21 @@ endfun fun! s:NetrwMarkFileDiff(islocal) " call Dfunc("s:NetrwMarkFileDiff(islocal=".a:islocal.") b:netrw_curdir<".b:netrw_curdir.">") let curbufnr= bufnr("%") - if exists("s:netrwmarkfilelist_{curbufnr}") + if exists("s:netrwmarkfilelist_{curbufnr}") let cnt = 0 let curdir = b:netrw_curdir for fname in s:netrwmarkfilelist let cnt= cnt + 1 - if !a:islocal - let fname= curdir.fname - endif if cnt == 1 -" call Decho("diffthis: ".fname) - exe "e ".fname +" call Decho("diffthis: fname<".fname.">") + exe "e ".fnameescape(fname) diffthis elseif cnt == 2 || cnt == 3 vsplit wincmd l " call Decho("diffthis: ".fname) - exe "e ".fname + exe "e ".fnameescape(fname) diffthis else break @@ -3982,6 +4009,7 @@ fun! s:NetrwMarkFileDiff(islocal) endfor call s:NetrwUnmarkList(curbufnr,curdir) endif + " call Dret("s:NetrwMarkFileDiff") endfun @@ -3995,17 +4023,7 @@ fun! s:NetrwMarkFileEdit(islocal) let curbufnr = bufnr("%") if exists("s:netrwmarkfilelist_{curbufnr}") call s:SetRexDir(a:islocal,curdir) - if a:islocal && g:netrw_keepdir - " use complete paths if its local and keepdir enabled - let flist= "" - for fname in s:netrwmarkfilelist -" let flist= flist." ".s:ComposePath(curdir,fname) - let flist= flist." ".fname - endfor - else -" let flist= substitute(escape(join(s:netrwmarkfilelist_{curbufnr},"\t"),' '),"\t",' ','g') - let flist= substitute(escape(join(s:netrwmarkfilelist,"\t"),' '),"\t",' ','g') - endif + let flist= join(map(deepcopy(s:netrwmarkfilelist), "fnameescape(v:val)")) " unmark markedfile list " call s:NetrwUnmarkList(curbufnr,curdir) call s:NetrwUnmarkAll() @@ -4138,17 +4156,11 @@ endfun fun! s:NetrwMarkFileGrep(islocal) " call Dfunc("s:NetrwMarkFileGrep(islocal=".a:islocal.")") let svpos = netrw#NetrwSavePosn() - let curdir = b:netrw_curdir let curbufnr = bufnr("%") if exists("s:netrwmarkfilelist") " call Decho("s:netrwmarkfilelist".string(s:netrwmarkfilelist).">") - let netrwmarkfilelist= "" - for fname in s:netrwmarkfilelist -" call Decho("fname<".fname.">") - let fname = escape(substitute(fname,"[\"']","","g")," ") - let netrwmarkfilelist = netrwmarkfilelist." ".fname - endfor + let netrwmarkfilelist= join(map(deepcopy(s:netrwmarkfilelist), "fnameescape(v:val)")) call s:NetrwUnmarkAll() " ask user for pattern @@ -4295,7 +4307,7 @@ fun! s:NetrwMarkFilePrint(islocal) 1split " the autocmds will handle both local and remote files " call Decho("exe silent e ".escape(fname,' ')) - exe "silent e ".escape(fname,' ') + exe "silent e ".fnameescape(fname) " call Decho("hardcopy") hardcopy q @@ -4419,21 +4431,11 @@ fun! s:NetrwMarkFileTag(islocal) if exists("s:netrwmarkfilelist") " call Decho("s:netrwmarkfilelist".string(s:netrwmarkfilelist).">") - if a:islocal && g:netrw_keepdir - let netrwmarkfilelist= "" - for fname in s:netrwmarkfilelist -" let netrwmarkfilelist= netrwmarkfilelist." ".s:ComposePath(curdir,fname) - let netrwmarkfilelist= netrwmarkfilelist." ".fname - endfor - else - let netrwmarkfilelist= string(s:netrwmarkfilelist) - let netrwmarkfilelist= substitute(netrwmarkfilelist,'[[\],]','','g') - endif + let netrwmarkfilelist= join(map(deepcopy(s:netrwmarkfilelist), "shellescape(v:val,".!a:islocal.")")) call s:NetrwUnmarkAll() if a:islocal if executable(g:netrw_ctags) - call map(netrwmarkfilelist,"shellescape(v:val)") " call Decho("call system(".g:netrw_ctags." ".netrwmarkfilelist.")") call system(g:netrw_ctags." ".netrwmarkfilelist) else @@ -4447,7 +4449,7 @@ fun! s:NetrwMarkFileTag(islocal) e tags let path= substitute(curdir,'^\(.*\)/[^/]*$','\1/','') " call Decho("curdir<".curdir."> path<".path.">") - exe '%s/\t\(\S\+\)\t/\t'.escape(path,'/').'\1\t/e' + exe '%s/\t\(\S\+\)\t/\t'.escape(path,"/\n\r\\").'\1\t/e' wq! endif 2match none @@ -4771,7 +4773,7 @@ fun! netrw#NetrwObtain(islocal,fname,...) endfor else " transfer files with one command - let filelist= join(map(copy(fname),"shellescape(v:val)")) + let filelist= join(map(deepcopy(fname),"shellescape(v:val)")) " call Decho("system(".g:netrw_localcopycmd." ".filelist." ".shellescape(topath).")") call system(g:netrw_localcopycmd." ".filelist." ".shellescape(topath)) endif @@ -4801,7 +4803,7 @@ fun! netrw#NetrwObtain(islocal,fname,...) else let path= "" endif - let filelist= join(map(copy(fnamelist),'shellescape(g:netrw_machine.":".path.v:val,1))')) + let filelist= join(map(deepcopy(fnamelist),'shellescape(g:netrw_machine.":".path.v:val,1)')) " call Decho("exe ".s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".filelist." ".shellescape(tgtdir,1)) exe s:netrw_silentxfer."!".g:netrw_scp_cmd.shellescape(useport,1)." ".filelist." ".shellescape(tgtdir,1) @@ -4812,7 +4814,7 @@ fun! netrw#NetrwObtain(islocal,fname,...) let tmpbufnr= bufnr("%") setlocal ff=unix if exists("g:netrw_ftpmode") && g:netrw_ftpmode != "" - exe "put ='".g:netrw_ftpmode."'" + put =g:netrw_ftpmode " call Decho("filter input: ".getline('$')) endif @@ -4822,7 +4824,7 @@ fun! netrw#NetrwObtain(islocal,fname,...) endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('$')) endif for fname in fnamelist @@ -4880,12 +4882,12 @@ fun! netrw#NetrwObtain(islocal,fname,...) endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('$')) endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('$')) endif for fname in fnamelist @@ -5053,15 +5055,13 @@ fun! s:NetrwUpload(fname,tgt,...) " handle uploading a single file using NetWrite " call Decho("handle uploading a single file via NetWrite") 1split - let efname= escape(a:fname,g:netrw_fname_escape) -" call Decho("exe e ".efname) - exe "e ".efname +" call Decho("exe e ".fnameescape(a:fname)) + exe "e ".fnameescape(a:fname) " call Decho("now locally editing<".expand("%").">, has ".line("$")." lines") if a:tgt =~ '/$' let wfname= substitute(a:fname,'^.*/','','') - let wfname= escape(a:tgt.wfname,g:netrw_fname_escape) " call Decho("exe w! ".fnameescape(wfname)) - exe "w! ".fnameescape(wfname) + exe "w! ".fnameescape(a:tgt.wfname) else " call Decho("writing local->remote: exe w ".fnameescape(a:tgt)) exe "w ".fnameescape(a:tgt) @@ -5075,8 +5075,8 @@ fun! s:NetrwUpload(fname,tgt,...) let curdir= getcwd() if a:tgt =~ '^scp:' exe "keepjumps silent lcd ".fnameescape(fromdir) - let filelist= copy(s:netrwmarkfilelist_{bufnr('%')}) - let args = join(map(filelist,"shellescape(v:val)")) + let filelist= deepcopy(s:netrwmarkfilelist_{bufnr('%')}) + let args = join(map(filelist,"shellescape(v:val, 1)")) if exists("g:netrw_port") && g:netrw_port != "" let useport= " ".g:netrw_scpport." ".g:netrw_port else @@ -5097,11 +5097,11 @@ fun! s:NetrwUpload(fname,tgt,...) silent keepjumps new " call Decho("filter input window#".winnr()) - exe "put ='".g:netrw_ftpmode."'" + put =g:netrw_ftpmode " call Decho("filter input: ".getline('$')) if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('$')) endif @@ -5166,7 +5166,7 @@ fun! s:NetrwUpload(fname,tgt,...) endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('$')) endif @@ -5210,7 +5210,7 @@ fun! s:NetrwPreview(path) range call s:NetrwSafeOptions() if has("quickfix") if !isdirectory(a:path) - exe (g:netrw_preview? "vert " : "")."pedit ".escape(a:path,g:netrw_fname_escape) + exe (g:netrw_preview? "vert " : "")."pedit ".fnameescape(a:path) elseif !exists("g:netrw_quiet") call netrw#ErrorMsg(s:WARNING,"sorry, cannot preview a directory such as <".a:path.">",38) endif @@ -6027,8 +6027,8 @@ fun! s:NetrwRemoteListing() let listcmd= s:MakeSshCmd(g:netrw_list_cmd) " call Decho("listcmd<".listcmd."> (using g:netrw_list_cmd)") if g:netrw_scp_cmd =~ '^pscp' -" call Decho("1: exe silent r! ".listcmd.s:path) - exe "silent r! ".listcmd.s:path +" call Decho("1: exe silent r! ".shellescape(listcmd.s:path, 1)) + exe "silent r! ".listcmd.shellescape(s:path, 1) " remove rubbish and adjust listing format of 'pscp' to 'ssh ls -FLa' like g/^Listing directory/d g/^d[-rwx][-rwx][-rwx]/s+$+/+e @@ -6286,7 +6286,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd) put ='cd \"'.a:path.'\"' endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('.')) endif call setline(line("$")+1,a:listcmd) @@ -6320,7 +6320,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd) put ='cd \"'.a:path.'\"' endif if exists("g:netrw_ftpextracmd") - exe "put ='".g:netrw_ftpextracmd."'" + put =g:netrw_ftpextracmd " call Decho("filter input: ".getline('.')) endif call setline(line("$")+1,a:listcmd) @@ -6669,7 +6669,7 @@ fun! s:LocalBrowseShellCmdRefresh() if bufwinnr(ibuf) == -1 && index(buftablist,ibuf) == -1 " wipe out any non-displaying netrw buffer " call Decho("wiping buf#".ibuf,"<".bufname(ibuf).">") - exe "silent! bd ".ibuf + exe "silent! bd ".fnameescape(ibuf) call remove(s:netrw_browselist,ibl) " call Decho("browselist=".string(s:netrw_browselist)) continue @@ -6860,7 +6860,7 @@ fun! s:NetrwLocalRename(path) range let newname = substitute(oldname,subfrom,subto,'') endif endif - let ret= rename(oldname,newname) + call rename(oldname,newname) endfor 2match none unlet s:netrwmarkfilelist_{bufnr("%")} @@ -6891,7 +6891,7 @@ fun! s:NetrwLocalRename(path) range let newname= input("Moving ".oldname." to : ",substitute(oldname,'/*$','','e')) call inputrestore() - let ret= rename(oldname,newname) + call rename(oldname,newname) " call Decho("renaming <".oldname."> to <".newname.">") let ctr= ctr + 1 @@ -7570,22 +7570,24 @@ fun! s:SetRexDir(islocal,dirname) " call Dfunc("s:SetRexDir(islocal=".a:islocal." dirname<".a:dirname.">)") " set up Rex and leftmouse-double-click if a:islocal - exe 'com! Rexplore call s:NetrwRexplore(1,"'.a:dirname.'")' + exe 'com! Rexplore call s:NetrwRexplore(1,"'.escape(a:dirname,'"\').'")' if g:netrw_retmap silent! unmap <2-leftmouse> if !hasmapto("NetrwReturn") nmap <2-leftmouse> NetrwReturn endif - exe 'nnoremap NetrwReturn :call NetrwRexplore(1,"'.a:dirname.'")' + let dir = escape(a:dirname, s:netrw_map_escape) + exe 'nnoremap NetrwReturn :call NetrwRexplore(1,"'.dir.'")' endif else - exe 'com! Rexplore call s:NetrwRexplore(0,"'.a:dirname.'")' + exe 'com! Rexplore call s:NetrwRexplore(0,"'.escape(a:dirname,'"\').'")' if g:netrw_retmap silent! unmap <2-leftmouse> if !hasmapto("NetrwReturn") nmap <2-leftmouse> NetrwReturn endif - exe 'nnoremap NetrwReturn :call NetrwRexplore(0,"'.a:dirname.'")' + let dir = escape(a:dirname, s:netrw_map_escape) + exe 'nnoremap NetrwReturn :call NetrwRexplore(0,"'.dir.'")' endif endif " call Dret("s:SetRexDir") diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim index 265c408c..70c08a0f 100644 --- a/runtime/autoload/rubycomplete.vim +++ b/runtime/autoload/rubycomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: Ruby " Maintainer: Mark Guzman -" 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 diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim index b1529d60..fc168e80 100644 --- a/runtime/autoload/tar.vim +++ b/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 " License: Vim License (see vim's :help license) " @@ -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" diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index d69c6453..4f6292b9 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 +" 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 @@ -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 @@ -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("$")) @@ -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" @@ -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 @@ -578,27 +575,6 @@ fun! s:ChgDir(newdir) 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) " call Dfunc("RecordInVar(home<".a:home."> cmd<".a:cmd.">)") @@ -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 @@ -745,7 +721,7 @@ 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 @@ -753,7 +729,7 @@ fun! vimball#RestoreSettings() 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)) diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index b35a411d..af56944c 100644 --- a/runtime/autoload/zip.vim +++ b/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 " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005-2008 Charles E. Campbell, Jr. {{{1 @@ -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 @@ -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" @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/runtime/compiler/decada.vim b/runtime/compiler/decada.vim index 99b44de8..95d41667 100644 --- a/runtime/compiler/decada.vim +++ b/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 " $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 diff --git a/runtime/compiler/eruby.vim b/runtime/compiler/eruby.vim index 142e889c..1dda588e 100644 --- a/runtime/compiler/eruby.vim +++ b/runtime/compiler/eruby.vim @@ -1,7 +1,7 @@ " Vim compiler file " Language: eRuby " Maintainer: Doug Kearns -" 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 diff --git a/runtime/compiler/gnat.vim b/runtime/compiler/gnat.vim index 001ed314..d5bd9c45 100644 --- a/runtime/compiler/gnat.vim +++ b/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 k " Ned Okie " $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 diff --git a/runtime/compiler/rspec.vim b/runtime/compiler/rspec.vim index fd0a49f4..5e09ddcc 100644 --- a/runtime/compiler/rspec.vim +++ b/runtime/compiler/rspec.vim @@ -1,7 +1,7 @@ " Vim compiler file " Language: RSpec " Maintainer: Tim Pope -" 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 diff --git a/runtime/compiler/ruby.vim b/runtime/compiler/ruby.vim index 26d2f9c2..269873fc 100644 --- a/runtime/compiler/ruby.vim +++ b/runtime/compiler/ruby.vim @@ -2,7 +2,7 @@ " Language: Ruby " Function: Syntax check and/or error reporting " Maintainer: Tim Hammerquist -" 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 diff --git a/runtime/compiler/rubyunit.vim b/runtime/compiler/rubyunit.vim index 8866f521..60a6f058 100644 --- a/runtime/compiler/rubyunit.vim +++ b/runtime/compiler/rubyunit.vim @@ -1,7 +1,7 @@ " Vim compiler file " Language: Test::Unit - Ruby Unit Testing Framework " Maintainer: Doug Kearns -" 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 diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 3a289d7b..2f697508 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -287,6 +287,11 @@ CONVERTED = \ vimdiff-it.UTF-8.1 \ vimtutor-it.UTF-8.1 \ xxd-it.UTF-8.1 \ + vim-pl.UTF-8.1 \ + evim-pl.UTF-8.1 \ + vimdiff-pl.UTF-8.1 \ + vimtutor-pl.UTF-8.1 \ + xxd-pl.UTF-8.1 \ vim-ru.UTF-8.1 \ evim-ru.UTF-8.1 \ vimdiff-ru.UTF-8.1 \ @@ -296,7 +301,7 @@ CONVERTED = \ .SUFFIXES: .SUFFIXES: .c .o .txt .html -all: tags vim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) +all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED) # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. @@ -314,6 +319,9 @@ doctags: doctags.c vim.man: vim.1 nroff -man vim.1 | sed -e s/.//g > vim.man +evim.man: evim.1 + nroff -man evim.1 | sed -e s/.//g > evim.man + vimdiff.man: vimdiff.1 nroff -man vimdiff.1 | sed -e s/.//g > vimdiff.man @@ -445,6 +453,21 @@ vimtutor-it.UTF-8.1: vimtutor-it.1 xxd-it.UTF-8.1: xxd-it.1 iconv -f latin1 -t utf-8 $< >$@ +vim-pl.UTF-8.1: vim-pl.1 + iconv -f latin2 -t utf-8 $< >$@ + +evim-pl.UTF-8.1: evim-pl.1 + iconv -f latin2 -t utf-8 $< >$@ + +vimdiff-pl.UTF-8.1: vimdiff-pl.1 + iconv -f latin2 -t utf-8 $< >$@ + +vimtutor-pl.UTF-8.1: vimtutor-pl.1 + iconv -f latin2 -t utf-8 $< >$@ + +xxd-pl.UTF-8.1: xxd-pl.1 + iconv -f latin2 -t utf-8 $< >$@ + vim-ru.UTF-8.1: vim-ru.1 iconv -f KOI8-R -t utf-8 $< >$@ diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index dc8e9b17..164764c5 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index e892f4c4..271dd5cb 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.2b. Last change: 2008 Jun 27 +*autocmd.txt* For Vim version 7.2c. Last change: 2008 Jun 27 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 65af5fc1..e38cc24e 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.2b. Last change: 2008 Jul 09 +*change.txt* For Vim version 7.2c. Last change: 2008 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1561,10 +1561,12 @@ found here: |sort()|. With [n] sorting is done on the first decimal number in the line (after or inside a {pattern} match). + One leading '-' is included in the number. With [x] sorting is done on the first hexadecimal number in the line (after or inside a {pattern} match). A leading "0x" or "0X" is ignored. + One leading '-' is included in the number. With [o] sorting is done on the first octal number in the line (after or inside a {pattern} match). diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 8f577c87..66a8de30 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.2b. Last change: 2008 Jul 11 +*cmdline.txt* For Vim version 7.2c. Last change: 2008 Jul 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -99,19 +99,20 @@ CTRL-E or *c_CTRL-E* *c_* cursor to end of command-line *c_* - cursor to position of mouse click. + Move the cursor to the position of the mouse click. CTRL-H *c_* *c_CTRL-H* - delete the character in front of the cursor (see |:fixdel| if + Delete the character in front of the cursor (see |:fixdel| if your key does not do what you want). *c_* - delete the character under the cursor (at end of line: + Delete the character under the cursor (at end of line: character before the cursor) (see |:fixdel| if your key does not do what you want). *c_CTRL-W* -CTRL-W delete the word before the cursor +CTRL-W Delete the |word| before the cursor. This depends on the + 'iskeyword' option. *c_CTRL-U* -CTRL-U remove all characters between the cursor position and +CTRL-U Remove all characters between the cursor position and the beginning of the line. Previous versions of vim deleted all characters on the line. If that is the preferred behavior, add the following to your .vimrc: > @@ -997,7 +998,7 @@ other than the one that is executed with are lost. If you would like to execute the command under the cursor and then have the command-line window open again, you may find this mapping useful: > - :map q: + :autocmd CmdwinEnter * map q: VARIOUS @@ -1044,9 +1045,9 @@ events are not triggered. You can use the Cmdwin events to do settings specifically for the command-line window. Be careful not to cause side effects! Example: > - :au CmdwinEnter : let b:cpt_save = &cpt | set cpt=v + :au CmdwinEnter : let b:cpt_save = &cpt | set cpt=. :au CmdwinLeave : let &cpt = b:cpt_save -This sets 'complete' to use command-line completion in Insert mode for CTRL-N. +This sets 'complete' to use completion in the current window for |i_CTRL-N|. Another example: > :au CmdwinEnter [/?] startinsert This will make Vim start in Insert mode in the command-line window. diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 1eb20afb..aac589fb 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.2b. Last change: 2006 May 01 +*debug.txt* For Vim version 7.2c. Last change: 2006 May 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index ea9858a7..dfb302de 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*debugger.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 85bf1c57..d18b9542 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.2b. Last change: 2007 May 11 +*develop.txt* For Vim version 7.2c. Last change: 2007 May 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 379f6a6b..2177c569 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,12 +1,12 @@ -*diff.txt* For Vim version 7.2b. Last change: 2006 Oct 02 +*diff.txt* For Vim version 7.2c. Last change: 2008 Jul 21 VIM REFERENCE MANUAL by Bram Moolenaar *diff* *vimdiff* *gvimdiff* *diff-mode* -This file describes the +diff feature: Showing differences between two or -three versions of the same file. +This file describes the +diff feature: Showing differences between two, +three or four versions of the same file. The basics are explained in section |08.7| of the user manual. @@ -49,7 +49,7 @@ What happens is that Vim opens a window for each of the files. This is like using the |-O| argument. This uses vertical splits. If you prefer horizontal splits add the |-o| argument: > - vimdiff -o file1 file2 [file3] + vimdiff -o file1 file2 [file3 [file4]] If you always prefer horizontal splits include "horizontal" in 'diffopt'. diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index b15651d7..7cc2558a 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.2b. Last change: 2007 Sep 10 +*digraph.txt* For Vim version 7.2c. Last change: 2008 Jul 17 VIM REFERENCE MANUAL by Bram Moolenaar @@ -53,7 +53,9 @@ this file. The decimal number normally is the Unicode number of the character. Note that the meaning doesn't change when 'encoding' changes. The character will be converted from Unicode to 'encoding' when needed. This does require the -conversion to be available, it might fail. +conversion to be available, it might fail. For the NUL character you will see +"10". That's because NUL characters are internally represented with a NL +character. When you write the file it will become a NUL character. When Vim was compiled without the +multi_byte feature, you need to specify the character in the encoding given with 'encoding'. You might want to use diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 65a11344..05a9e146 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.2b. Last change: 2008 Jul 05 +*editing.txt* For Vim version 7.2c. Last change: 2008 Jul 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 20fa361d..ffe5ea9e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.2b. Last change: 2008 Jul 09 +*eval.txt* For Vim version 7.2c. Last change: 2008 Jul 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -967,11 +967,16 @@ These are INVALID: 3. empty {M} 1e40 missing .{M} + *float-pi* *float-e* +A few useful values to copy&paste: > + :let pi = 3.14159265359 + :let e = 2.71828182846 + Rationale: Before floating point was introduced, the text "123.456" was interpreted as the two numbers "123" and "456", both converted to a string and concatenated, resulting in the string "123456". Since this was considered pointless, and we -could not find it actually being used in Vim scripts, this backwards +could not find it intentionally being used in Vim scripts, this backwards incompatibility was accepted in favor of being able to use the normal notation for floating point numbers. @@ -4963,9 +4968,16 @@ shellescape({string} [, {special}]) *shellescape()* and replace all "'" with "'\''". When the {special} argument is present and it's a non-zero Number or a non-empty String (|non-zero-arg|), then special - items such as "%", "#" and "" will be preceded by a - backslash. This backslash will be removed again by the |:!| + items such as "!", "%", "#" and "" will be preceded by + a backslash. This backslash will be removed again by the |:!| command. + The "!" character will be escaped (again with a |non-zero-arg| + {special}) when 'shell' contains "csh" in the tail. That is + because for csh and tcsh "!" is used for history replacement + even when inside single quotes. + The character is also escaped. With a |non-zero-arg| + {special} and 'shell' containing "csh" in the tail it's + escaped a second time. Example of use with a |:!| command: > :exe '!dir ' . shellescape(expand(''), 1) < This results in a directory listing for the file under the @@ -5918,7 +5930,7 @@ It's also possible to use curly braces, see |curly-braces-names|. And the A function local to a script must start with "s:". A local script function can only be called from within the script and from functions, user commands and autocommands defined in the script. It is also possible to call the -function from a mappings defined in the script, but then || must be used +function from a mapping defined in the script, but then || must be used instead of "s:" when the mapping is expanded outside of the script. *:fu* *:function* *E128* *E129* *E123* @@ -6028,7 +6040,7 @@ can be 0). "a:000" is set to a |List| that contains these arguments. Note that "a:1" is the same as "a:000[0]". *E742* The a: scope and the variables in it cannot be changed, they are fixed. -However, if a |List| or |Dictionary| is used, you can changes their contents. +However, if a |List| or |Dictionary| is used, you can change their contents. Thus you can pass a |List| to a function and have the function add an item to it. If you want to make sure the function cannot change a |List| or |Dictionary| use |:lockvar|. diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index 5a42e439..f044e0fd 100644 --- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -1,4 +1,4 @@ -*farsi.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*farsi.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 4bff42d5..4b5ac9e2 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.2b. Last change: 2008 Jun 27 +*filetype.txt* For Vim version 7.2c. Last change: 2008 Jul 15 VIM REFERENCE MANUAL by Bram Moolenaar @@ -482,6 +482,29 @@ g:changelog_date_end_entry_search The default is '^\s*$' which finds lines that contain only whitespace or are completely empty. +b:changelog_name *b:changelog_name* + Name of the ChangeLog file to look for. + The default is 'ChangeLog'. + +b:changelog_path + Path of the ChangeLog to use for the current buffer. + The default is empty, thus looking for a file named + |b:changelog_name| in the same directory as the + current buffer. If not found, the parent directory of + the current buffer is searched. This continues + recursively until a file is found or there are no more + parent directories to search. + +b:changelog_entry_prefix + Name of a function to call to generate a prefix to a + new entry. This function takes no arguments and + should return a string containing the prefix. + Returning an empty prefix is fine. + The default generates the shortest path between the + ChangeLog's pathname and the current buffers pathname. + In the future, it will also be possible to use other + variable contexts for this variable, for example, g:. + The Changelog entries are inserted where they add the least amount of text. After figuring out the current date and user, the file is searched for an entry beginning with the current date and user and if found adds another item diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index 8a8d800e..f4aa7991 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.2b. Last change: 2007 May 11 +*fold.txt* For Vim version 7.2c. Last change: 2007 May 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/ft_ada.txt b/runtime/doc/ft_ada.txt index 621d5834..92d1433f 100644 --- a/runtime/doc/ft_ada.txt +++ b/runtime/doc/ft_ada.txt @@ -1,4 +1,4 @@ -*ft_ada.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*ft_ada.txt* For Vim version 7.2c. Last change: 2008 Jun 21 ADA FILE TYPE PLUG-INS REFERENCE MANUAL~ diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index 8d236a10..38b5b583 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -1,4 +1,4 @@ -*ft_sql.txt* For Vim version 7.2b. Last change: Wed Apr 26 2006 3:05:33 PM +*ft_sql.txt* For Vim version 7.2c. Last change: Wed Apr 26 2006 3:05:33 PM by David Fishburn diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 58123b1e..c3b84c0a 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.2b. Last change: 2008 Jun 14 +*gui.txt* For Vim version 7.2c. Last change: 2008 Jun 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt index db1f8311..e75416ac 100644 --- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index 85b910f5..ed42122c 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 7.2b. Last change: 2007 Aug 30 +*gui_w32.txt* For Vim version 7.2c. Last change: 2007 Aug 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index ff848564..d33f56bf 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.2b. Last change: 2007 Dec 09 +*gui_x11.txt* For Vim version 7.2c. Last change: 2007 Dec 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 29a828a7..c743fc65 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 7.2b. Last change: 2006 Apr 02 +*hangulin.txt* For Vim version 7.2c. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index d28c33d6..c9b141f5 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* For Vim version 7.2b. Last change: 2007 Jun 14 +*hebrew.txt* For Vim version 7.2c. Last change: 2007 Jun 14 VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem) diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index e81dd3a4..db3f1b61 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*help.txt* For Vim version 7.2c. Last change: 2008 Jul 21 VIM - main help file k @@ -126,7 +126,7 @@ Advanced editing ~ |tabpage.txt| commands for using multiple tab pages |syntax.txt| syntax highlighting |spell.txt| spell checking -|diff.txt| working with two or three versions of the same file +|diff.txt| working with two to four versions of the same file |autocmd.txt| automatically executing commands on an event |filetype.txt| settings done specifically for a type of file |eval.txt| expression evaluation, conditional commands diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt index fbad7beb..3e2bf25e 100644 --- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -1,4 +1,4 @@ -*howto.txt* For Vim version 7.2b. Last change: 2006 Apr 02 +*howto.txt* For Vim version 7.2c. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index 97bb4b12..290e2f29 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*if_cscop.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Andy Kahn diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt index 559c4396..84e90ddd 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*if_mzsch.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Sergey Khorev diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt index d1a30634..6a31d3a0 100644 --- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 7.2b. Last change: 2007 May 10 +*if_ole.txt* For Vim version 7.2c. Last change: 2007 May 10 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 97e99b98..aa9cd256 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.2b. Last change: 2006 Mar 06 +*if_perl.txt* For Vim version 7.2c. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Sven Verdoolaege diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index efdc37ef..bc455e2e 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.2b. Last change: 2006 Apr 30 +*if_pyth.txt* For Vim version 7.2c. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 6de1f10d..836cb851 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.2b. Last change: 2006 Apr 30 +*if_ruby.txt* For Vim version 7.2c. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Shugo Maeda diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index 3129c140..c5e29968 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index a9f5af78..223d3651 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.2b. Last change: 2008 Jun 26 +*if_tcl.txt* For Vim version 7.2c. Last change: 2008 Jun 26 VIM REFERENCE MANUAL by Ingo Wilken diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 542e03d7..ffd366dd 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.2b. Last change: 2008 Jun 30 +*indent.txt* For Vim version 7.2c. Last change: 2008 Jul 30 VIM REFERENCE MANUAL by Bram Moolenaar @@ -584,8 +584,8 @@ unnecessary indentation) PYTHON *ft-python-indent* The amount of indent can be set for the following situations. The examples -given are de the defaults. Note that the variables are set to an expression, -so that you can change the value of 'shiftwidth' later. +given are the defaults. Note that the variables are set to an expression, so +that you can change the value of 'shiftwidth' later. Indent after an open paren: > let g:pyindent_open_paren = '&sw * 2' diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 35f50447..731a607a 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.2b. Last change: 2008 May 04 +*index.txt* For Vim version 7.2c. Last change: 2008 May 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 6752ba60..51f0657b 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*insert.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index ac750eee..9a27ccea 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.2b. Last change: 2008 Jun 24 +*intro.txt* For Vim version 7.2c. Last change: 2008 Jun 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 131e1bdf..06eaa4f0 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.2b. Last change: 2008 Jul 09 +*map.txt* For Vim version 7.2c. Last change: 2008 Jul 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 60445d14..6633fbe8 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*mbyte.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 4731a71b..cd958893 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.2b. Last change: 2007 Aug 19 +*message.txt* For Vim version 7.2c. Last change: 2007 Aug 19 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index d214c27a..b8ce3cc5 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 7.2b. Last change: 2008 Jun 08 +*mlang.txt* For Vim version 7.2c. Last change: 2008 Jun 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index c1b8d38c..9b8cd0b9 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.2b. Last change: 2008 May 02 +*motion.txt* For Vim version 7.2c. Last change: 2008 Aug 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -851,16 +851,16 @@ when using blockwise Visual mode. These commands do not work when no change was made yet in the current file. *'<* *`<* -'< `< To the first character of the last selected Visual - area in the current buffer. For block mode it may - also be the last character in the first line (to be - able to define the block). {not in Vi}. +'< `< To the first line or character of the last selected + Visual area in the current buffer. For block mode it + may also be the last character in the first line (to + be able to define the block). {not in Vi}. *'>* *`>* -'> `> To the last character of the last selected Visual - area in the current buffer. For block mode it may - also be the first character of the last line (to be - able to define the block). Note that 'selection' +'> `> To the last line or character of the last selected + Visual area in the current buffer. For block mode it + may also be the first character of the last line (to + be able to define the block). Note that 'selection' applies, the position may be just after the Visual area. {not in Vi}. diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index b8074c78..01266a78 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*netbeans.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Gordon Prieur et al. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 22c04196..1302f169 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.2b. Last change: 2008 Jul 05 +*options.txt* For Vim version 7.2c. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2292,6 +2292,8 @@ A jump table for the options with a short description can be found at |Q_op|. or "\\", the swap file name will be built from the complete path to the file with all path separators substituted to percent '%' signs. This will ensure file name uniqueness in the preserve directory. + On Win32, when a separating comma is following, you must use "//", + since "\\" will include the comma in the file name. - Spaces after the comma are ignored, other spaces are considered part of the directory name. To have a space at the start of a directory name, precede it with a backslash. @@ -4898,7 +4900,7 @@ A jump table for the options with a short description can be found at |Q_op|. name, datestamp and permissions. This option contains the extra information, the nature of which will vary between systems. The value of this option is usually set when the file is loaded, and - use to set the file type when file is written. + is used to set the operating system file type when file is written. It can affect the pattern matching of the automatic commands. |autocmd-osfiletypes| @@ -6306,15 +6308,15 @@ A jump table for the options with a short description can be found at |Q_op|. directory. F S Full path to the file in the buffer. t S File name (tail) of file in the buffer. - m F Modified flag, text is " [+]"; " [-]" if 'modifiable' is off. + m F Modified flag, text is "[+]"; "[-]" if 'modifiable' is off. M F Modified flag, text is ",+" or ",-". - r F Readonly flag, text is " [RO]". + r F Readonly flag, text is "[RO]". R F Readonly flag, text is ",RO". - h F Help buffer flag, text is " [help]". + h F Help buffer flag, text is "[help]". H F Help buffer flag, text is ",HLP". - w F Preview window flag, text is " [Preview]". + w F Preview window flag, text is "[Preview]". W F Preview window flag, text is ",PRV". - y F Type of file in the buffer, e.g., " [vim]". See 'filetype'. + y F Type of file in the buffer, e.g., "[vim]". See 'filetype'. Y F Type of file in the buffer, e.g., ",VIM". See 'filetype'. {not available when compiled without |+autocmd| feature} k S Value of "b:keymap_name" or 'keymap' when |:lmap| mappings are @@ -6361,14 +6363,9 @@ A jump table for the options with a short description can be found at |Q_op|. to StatusLineNC for the statusline of non-current windows. The number N must be between 1 and 9. See |hl-User1..9| - Display of flags are controlled by the following heuristic: - If a flag text starts with comma it is assumed that it wants to - separate itself from anything but preceding plaintext. If it starts - with a space it is assumed that it wants to separate itself from - anything but other flags. That is: A leading comma is removed if the - preceding character stems from plaintext. A leading space is removed - if the preceding character stems from another active flag. This will - make a nice display when flags are used like in the examples below. + When displaying a flag, Vim removes the leading comma, if any, when + that flag comes right after plaintext. This will make a nice display + when flags are used like in the examples below. When all items in a group becomes an empty string (i.e. flags that are not set) and a minwid is not set for the group, the whole group will diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index 59074a69..0b0e836a 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_390.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Ralf Schandl diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index 1e21121e..7e262bf6 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_amiga.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index c7bbf372..e5f54b8c 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_beos.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index e4cfb707..085b295b 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -1,4 +1,4 @@ -*os_dos.txt* For Vim version 7.2b. Last change: 2006 Mar 30 +*os_dos.txt* For Vim version 7.2c. Last change: 2006 Mar 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 68dbcfb7..5521a938 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 7.2b. Last change: 2006 Apr 30 +*os_mac.txt* For Vim version 7.2c. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index 1afd335f..e5298874 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Jens M. Felderhoff diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt index a9fd7bed..1cb38035 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_msdos.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index fbae5f96..072922ab 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.2b. Last change: 2007 Apr 22 +*os_os2.txt* For Vim version 7.2c. Last change: 2007 Apr 22 VIM REFERENCE MANUAL by Paul Slootman diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index c199a975..3b50ace4 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Julian Kinraid diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt index e7fb8061..a54576e2 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*os_risc.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Thomas Leonard diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 036f5970..740712ea 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.2b. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.2c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 8b969294..8fd6712f 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.2b. Last change: 2006 Nov 18 +*os_vms.txt* For Vim version 7.2c. Last change: 2006 Nov 18 VIM REFERENCE MANUAL diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index 73d55e94..92392c16 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -1,4 +1,4 @@ -*os_win32.txt* For Vim version 7.2b. Last change: 2008 May 02 +*os_win32.txt* For Vim version 7.2c. Last change: 2008 May 02 VIM REFERENCE MANUAL by George Reilly diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index ae60b83b..d48d9f14 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*pattern.txt* For Vim version 7.2c. Last change: 2008 Jul 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1122,7 +1122,7 @@ in the file. {Vi cannot handle characters in the file at all} *CR-used-for-NL* When 'fileformat' is "mac", characters in the file are stored as -characters internally. In the display they are shown as "^M". Otherwise this +characters internally. In the text they are shown as "^J". Otherwise this works similar to the usage of for a . When working with expression evaluation, a character in the pattern diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt index 2d7edb88..dc0b2ff3 100644 --- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -1,4 +1,4 @@ -*pi_getscript.txt* For Vim version 7.2b. Last change: 2008 Jun 29 +*pi_getscript.txt* For Vim version 7.2c. Last change: 2008 Jun 29 > GETSCRIPT REFERENCE MANUAL by Charles E. Campbell, Jr. < diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index e9e224be..4f20124e 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 7.2b. Last change: 2002 Oct 29 +*pi_gzip.txt* For Vim version 7.2c. Last change: 2002 Oct 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 7e0c597c..1879dd8e 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.2b. Last change: 2008 Jul 13 +*pi_netrw.txt* For Vim version 7.2c. Last change: 2008 Aug 01 ----------------------------------------------------- NETRW REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -1437,21 +1437,56 @@ tips & tools" by Rob Flickenger (O'Reilly, ISBN 0-596-00461-3) gives a tip for setting up no-password ssh and scp and discusses associated security issues. It used to be available at http://hacks.oreilly.com/pub/h/66 , but apparently that address is now being redirected to some "hackzine". -I'll attempt a summary: - - 1. Generate a public/private key pair on the ssh server: - ssh-keygen -t rsa - (saving the file in ~/.ssh/id_rsa is ok) - 2. Just hit the when asked for passphrase (twice). - 3. This creates two files: - ~/.ssh/id_rsa - ~/.ssh/id_rsa.pub - 4. On the client: - cd - mkdir .ssh - chmod 0700 .ssh - scp {serverhostname}:.ssh/id_rsa.pub . - cat id_rsa.pub >> .ssh/authorized_keys2 +I'll attempt a summary based on that article and on a communication from +Ben Schmidt: + + 1. Generate a public/private key pair on the local machine + (ssh client): > + ssh-keygen -t rsa + (saving the file in ~/.ssh/id_rsa as prompted) +< + 2. Just hit the when asked for passphrase (twice) for no + passphrase. If you do use a passphrase, you will also need to use + ssh-agent so you only have to type the passphrase once per session. + If you don't use a passphrase, simply logging onto your local + computer or getting access to the keyfile in any way will suffice + to access any ssh servers which have that key authorized for login. + + 3. This creates two files: > + ~/.ssh/id_rsa + ~/.ssh/id_rsa.pub +< + 4. On the target machine (ssh server): > + cd + mkdir -p .ssh + chmod 0700 .ssh +< + 5. On your local machine (ssh client): (one line) > + ssh {serverhostname} + cat '>>' '~/.ssh/authorized_keys2' < ~/.ssh/id_rsa.pub +< + or, for OpenSSH, (one line) > + ssh {serverhostname} + cat '>>' '~/.ssh/authorized_keys' < ~/.ssh/id_rsa.pub +< +You can test it out with > + ssh {serverhostname} +and you should be log onto the server machine without further need to type +anything. + +If you decided to use a passphrase, do: > + ssh-agent $SHELL + ssh-add + ssh {serverhostname} +You will be prompted for your key passphrase when you use ssh-add, but not +subsequently when you use ssh. For use with vim, you can use > + ssh-agent vim +and, when next within vim, use > + :!ssh-add +Alternatively, you can apply ssh-agent to the terminal you're planning on +running vim in: > + ssh-agent xterm & +and do ssh-add whenever you need. For Windows, folks on the vim mailing list have mentioned that Pageant helps with avoiding the constant need to enter the password. @@ -1628,6 +1663,13 @@ MARKED FILES: MOVING *netrw-mm* {{{2 (See |netrw-mf| and |netrw-mr| for how to mark files) (uses the global marked file list) + WARNING: moving files is more dangerous than copying them. + A file being moved is first copied and then deleted; if the + copy operation fails and the delete succeeds, you will lose + the file. Either try things out with unimportant files + first or do the copy and then delete yourself using mc and D. + Use at your own risk! + Select a target directory with mT (|netrw-mt|). Then change directory, select file(s) (see |netrw-mf|), and press "mm". @@ -2387,6 +2429,16 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 12. History *netrw-history* {{{1 + v130: Jul 31, 2008 * trying out elinks/links for http://host/ + requests. One problem: in-page links + (such as with ...#LABEL) are not supported + * verified that Bram's modified netrwPlugin works + Aug 01, 2008 * fixed a bug: when sourcing a file via ftp, the + "filter window" was left behind. + v129: Jul 31, 2008 * bug found in non-mouse enabled vim and some + local maps + v128: Jul 30, 2008 * much work done in using shellescape() and + fnameescape() v126: Jun 30, 2008 * after having gone to a remote directory, was no longer taking one to the correct entry in the help (|netrw-quickhelp|). Fixed. diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index faa889bc..3a539a9c 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.2b. Last change: 2008 Jun 16 +*pi_paren.txt* For Vim version 7.2c. Last change: 2008 Jun 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt index e5cb3daf..80e10aaa 100644 --- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -1,4 +1,4 @@ -*pi_spec.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*pi_spec.txt* For Vim version 7.2c. Last change: 2006 Apr 24 by Gustavo Niemeyer ~ diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index c6926cdd..e1ef0972 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*pi_tar.txt* For Vim version 7.2b. Last change: 2008 Jul 13 +*pi_tar.txt* For Vim version 7.2c. Last change: 2008 Jul 13 +====================+ | Tar File Interface | diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt index 7220d0ed..258f307e 100644 --- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -1,4 +1,4 @@ -*pi_vimball.txt* For Vim version 7.2b. Last change: 2008 Jun 05 +*pi_vimball.txt* For Vim version 7.2c. Last change: 2008 Jul 30 ---------------- Vimball Archiver diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index d4e3f67a..b28dcf0b 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*pi_zip.txt* For Vim version 7.2b. Last change: 2008 Jun 29 +*pi_zip.txt* For Vim version 7.2c. Last change: 2008 Jul 30 +====================+ | Zip File Interface | diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index af1e2c0a..4e92d76a 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.2b. Last change: 2008 Apr 30 +*print.txt* For Vim version 7.2c. Last change: 2008 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 5c48e671..75f59c45 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.2b. Last change: 2008 Mar 14 +*quickfix.txt* For Vim version 7.2c. Last change: 2008 Mar 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 230a110f..b9a7ee32 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.2b. Last change: 2008 Jan 22 +*quickref.txt* For Vim version 7.2c. Last change: 2008 Jan 22 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index af874514..71e82d25 100644 --- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*quotes.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 75f5d7e9..879f56fd 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*recover.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index bbf1c127..2037398b 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -1,4 +1,4 @@ -*remote.txt* For Vim version 7.2b. Last change: 2008 May 24 +*remote.txt* For Vim version 7.2c. Last change: 2008 May 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index 577c0de8..e9c02c86 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.2b. Last change: 2007 Aug 12 +*repeat.txt* For Vim version 7.2c. Last change: 2007 Aug 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index 40f00bca..5b288b97 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*rileft.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Avner Lottem diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index 0ba9be79..b6b7985e 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*russian.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 141eee6e..72a59aaf 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 7.2b. Last change: 2006 Aug 27 +*scroll.txt* For Vim version 7.2c. Last change: 2006 Aug 27 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 7e295203..26e6aeba 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*sign.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index ea4da257..bc52a9a4 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*spell.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 9e67ec46..c2a9994f 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*sponsor.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index dfb403bc..d259a9f1 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*starting.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 839ab344..c4779cb0 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*syntax.txt* For Vim version 7.2c. Last change: 2008 Jul 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -852,8 +852,8 @@ If this variable is undefined or zero, btm syntax is selected. DOXYGEN *doxygen.vim* *doxygen-syntax* Doxygen generates code documentation using a special documentation format -(similar to Javadoc). This syntax script adds doxygen highlighting to c, cpp -and idl files, and should also work with java. +(similar to Javadoc). This syntax script adds doxygen highlighting to c, cpp, +idl and php files, and should also work with java. There are a few of ways to turn on doxygen formatting. It can be done explicitly or in a modeline by appending '.doxygen' to the syntax of the file. diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 518f9802..166e26a9 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.2b. Last change: 2007 Mar 11 +*tabpage.txt* For Vim version 7.2c. Last change: 2007 Mar 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tags b/runtime/doc/tags index b955aaf0..7e2ef9ae 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4615,6 +4615,7 @@ a{ motion.txt /*a{* a} motion.txt /*a}* b motion.txt /*b* b:changedtick-variable eval.txt /*b:changedtick-variable* +b:changelog_name filetype.txt /*b:changelog_name* b:current_syntax-variable syntax.txt /*b:current_syntax-variable* b:netrw_lastfile pi_netrw.txt /*b:netrw_lastfile* b:var eval.txt /*b:var* @@ -5329,6 +5330,8 @@ fixed-6.4 version6.txt /*fixed-6.4* fixed-7.1 version7.txt /*fixed-7.1* fixed-7.2 version7.txt /*fixed-7.2* flexwiki.vim syntax.txt /*flexwiki.vim* +float-e eval.txt /*float-e* +float-pi eval.txt /*float-pi* float2nr() eval.txt /*float2nr()* floating-point-format eval.txt /*floating-point-format* floating-point-precision eval.txt /*floating-point-precision* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 952bb96f..c08e6331 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*tagsrch.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index cf960bd5..57235c0a 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*term.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index ffeea0fb..2dfe35dd 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.2b. Last change: 2006 Jul 24 +*tips.txt* For Vim version 7.2c. Last change: 2006 Jul 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 03e49813..dba4c8e9 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.2b. Last change: 2008 Jul 13 +*todo.txt* For Vim version 7.2c. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -31,10 +31,13 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. -------------------- Known bugs and current work ----------------------- ":pedit %" with a BufReadPre autocommand causes the cursor to move to the -first line. (Ingo Karkat, 2008 Jul 1) +first line. (Ingo Karkat, 2008 Jul 1) Ian Kelling is working on this. Have a look at patch for utf-8 line breaking. (Yongwei Wu, 2008 Mar 1, Mar 23) +netrw: dragging status line causes selection of entry. Should check row +number to be below last visible line. + Runtime files for Clojure. (Toralf Wittner, 2008 Jun 25) Patch to add extra argument to glob() and globpath() to ignore 'wildignore'. @@ -52,6 +55,13 @@ Wildmenu not deleted: "gvim -u NONE", ":set nocp wildmenu cmdheight=3 laststatus=2", CTRL-D CTRL-H CTRL-H CTRL-H. (A.Politz, 2008 April 1) Works OK with Vim in an xterm. +When using ":e ++enc=foo file" and the file is already loaded with +'fileencoding' set to "bar", then do_ecmd() uses that buffer, even though the +fileencoding differs. Reload the buffer in this situation? Need to check for +the buffer to be unmodified. +Unfinished patch by Ian Kelling, 2008 Jul 11. Followup Jul 14, need to have +another look at it. + Fix for matchparen HL doesn't work. beep. Win32: associating a type with Vim doesn't take care of space after a @@ -59,17 +69,22 @@ backslash? (Robert Vibrant, 2008 Jun 5) After using for command line completion after ":ta blah" and getting E33 (no tags file), further editing the command to e.g., ":echo 'blah'", the -command is not executed. +command is not executed. Fix by Ian Kelling? When 'bomb' is changed the window title is updated to show/hide a "+", but the tab page label isn't. (Patrick Texier, 2008 Jun 24) +":help s/~" jumps to *s/\~*, while ":help s/\~" doesn't find anything. (Tim +Chase) Fix by Ian Kelling, 2008 Jul 14. + Despite adding save_subexpr() this still doesn't work properly: Regexp: matchlist('12a4aaa', '^\(.\{-}\)\(\%5c\@<=a\+\)\(.\+\)\?') Returns ['12a4', 'aaa', '4aaa'], should be ['12a4', 'aaa', ''] Backreference not cleared when retrying after \@<= fails? (Brett Stahlman, 2008 March 8) +Patch for 2html.vim to avoid "&nbsp;". (Markus Heidelberg, 2008 Jul 19) + Win32: remote editing fails when the current directory name contains "[". (Ivan Tishchenko, Liu Yubao) Suggested patch by Chris Lubinski: Avoid escaping characters where the backslash is not removed later. Asked Chris for @@ -111,6 +126,9 @@ changed or the window is resized. Mac: Patch for configure: remove arch from ruby link args. (Knezevic, 2008 Mar 5) Alternative: Kazuki Sakamoto, Mar 7. +Mac: trouble compiling with Motif, requires --disable-darwin. (Raf, 2008 Aug +1) Reply by Ben Schmidt. + ":emenu" works with the translated menu name. Should also work with the untranslated name. Would need to store both the English and the translated name. Patch by Bjorn Winckler, 2008 Mar 30. @@ -125,8 +143,6 @@ Await response to question to make the register writable. Problem with 'ts' set to 9 and 'showbreak' to ">>>". (Matthew Winn, 2007 Oct 1) -"vim -O aa aa" gives only one window. (Zdenek Sekera, 2008 Apr 16) - Including NFA regexp code: Use "\%#= to set the engine: 0 = automatic, 1 = backtracking, 2 = new. Useful in tests. @@ -158,6 +174,10 @@ New PHP syntax file, use it? (Peter Hodge) 'foldcolumn' in modeline applied to wrong window when using a session. (Teemu Likonen, March 19) +The documentation mentions the priority for ":2match" and ":3match", but it +appears the last one wins. (John Beckett, 2008 Jul 22) Caused by adding +matchadd()? Suggested patch by John, 2008 Jul 24. + Replace ccomplete.vim by cppcomplete.vim from www.vim.org? script 1520 by Vissale Neang. (Martin Stubenschrott) Asked Vissale to make the scripts more friendly for the Vim distribution. @@ -168,8 +188,9 @@ Asked about latest version: 0.77.1 is on www.vim.org. More AmigaOS4 patches. (Peter Bengtsson, Nov 9) -Error when cancelling completion menu and auto-formatting. (Tim Weber, 2008 -Apr 17) +Insert mode completion: When editing the text and pressing CTRL-N again goes +back to originally completed text, edited text is gone. (Peng Yu, 2008 Jul 24) +Suggestion by Ben Schmidt, 2008 Aug 6. Problem with compound words? (Bert, 2008 May 6) No warning for when flags are defined after they are used in an affix. @@ -193,6 +214,9 @@ popup menu over it, first draw the new popup menu, remember its position and size and then redraw the text, skipping the characters under the popup menu. This should avoid flicker. Other solution by A.Politz, 2007 Aug 22. +When the popup menu is close to the edge of the window it is truncated. Patch +to anchor the popup menu in a different way. (James Vega, 2008 Jul 30) + Spell checking: Add a way to specify punctuation characters. Add the superscript numbers by default: 0x2070, 0xb9, 0xb2, 0xb3, 0x2074 - 0x2079. @@ -200,9 +224,9 @@ Windows 98: pasting from the clipboard with text from another application has a trailing NUL. (Joachim Hofmann) Perhaps the length specified for CF_TEXT isn't right? -Completion: Scanning for tags doesn't check for typed key now and then? -Hangs for about 5 seconds. Appears to be caused by finding include files with -"foo/**" in 'path'. (Kalisiak, 2006 July 15) +Command line completion: Scanning for tags doesn't check for typed key now and +then? Hangs for about 5 seconds. Appears to be caused by finding include +files with "foo/**" in 'path'. (Kalisiak, 2006 July 15) Additional info: When using the |wildcards| ** globing, vim hangs indefinitely on lots of directories. The |file-searching| globing, like in ":set path=/**" does not hang as often as with globing with |wildcards|, like @@ -247,6 +271,9 @@ Win32: Patch for convert_filterW(). (Taro Muraoka, 2007 Mar 2) Win32: Patch for cscope external command. (Mike Williams, 2007 Aug 7) +":cscope find f filename" doesn't work because of the extra space. (Ethan +Mallove) + Win32: XPM support only works with path without spaces. Patch by Mathias Michaelis, 2006 Jun 9. Another patch for more path names, 2006 May 31. New version: http://members.tcnet.ch/michaelis/vim/patches.zip (also for other @@ -280,6 +307,10 @@ pointer in long and seek offset in 64 bit var. Win32: patch for fullscreen mode. (Liushaolin, 2008 April 17) +When file b is a link to file a and editing b twice you get the correct +warning for existing swap file, but when trying to recover it doesn't find the +swapfile. (Matt Wozniski, 2008 Aug 5) + Pressing the 'pastetoggle' key doesn't update the statusline. (Jan Christoph Ebersbach, 2008 Feb 1) @@ -321,6 +352,8 @@ use a different dialog: "busy saving, really quit? yes / no". Check other interfaces for changing curbuf in a wrong way. Patch like for if_ruby.c. +Problem with cursorcolumn highlighting and folds. (John Mullin, 2008 Jul 18) + Spell checking in popup menu: If the only problem is the case of the first character, don't offer "ignore" and "add to word list". @@ -381,12 +414,19 @@ Jun 5) Mac: Using gvim: netrw window disappears. (Nick Lo, 2006 Jun 21) +When 'ff' is "mac" then "ga" on a ^J shows 0x0d instead of 0x0a. Compare with +using "ga" on a NUL when 'ff' is "unix". (Andy Wokula, 2008 Jul 16) + Add an option to specify the character to use when a double-width character is moved to the next line. Default '>', set to a space to blank it out. Check that char is single width when it's set (compare with 'listchars'). The generated vim.bat can avoid the loop for NT. (Carl Zmola, 2006 Sep 3) +In a C file with spell checking, in "% integer" "nteger" is seen as an error, +but "]s" doesn't find it. "nteger" by itself is found. (Ralf Wildenhues, 2008 +Jul 22) + Session file creation: 'autochdir' causes trouble. Keep it off until after loading all files. @@ -443,7 +483,7 @@ show more text of the completions. Shorten the items that don't fit in the middle? When running inside screen it's possible to kill the X server and restart it -(using pty's the program can keep on running). Vim dies because it looses the +(using pty's the program can keep on running). Vim dies because it loses the connection to the X server. Can Vim simply quit using the X server instead of dying? Also relevant when running in a console. @@ -463,9 +503,6 @@ Campbell 2006 Jul 06. Syntax HL error caused by "containedin". (Peter Hodge, 2006 Oct 6) -":help s/~" jumps to *s/\~*, while ":help s/\~" doesn't find anything. (Tim -Chase) - A custom completion function in a ":command" cannot be a Funcref. (Andy Wokula, 2007 Aug 25) @@ -487,10 +524,6 @@ number. (Tony Mechelynck, 2007 Feb 6) GTK: when using the -geom argument with an offset from the right edge and the size is smaller than the default, the Vim window is not positioned properly. -GTK: when editing a directory with the netrw plugin in a terminal and doing -":gui" Vim hangs in obtaining the selection. Workaround patch 7.1.209 is a -hack (timeout after 3 seconds). Why don't we get the selection here? - After starting Vim, using '0 to jump somewhere in a file, ":sp" doesn't center the cursor line. It works OK after some other commands. @@ -626,6 +659,16 @@ More patches: - gettabvar() and settabvar() functions. (Yegappan Lakshmanan, 2007 Sep 13, 2008 Jun 12) - recognize hex numbers better. (Mark Manning, 2006 Sep 13) +- Add key, to expand an abbreviation in a mapping. (Kana + Natsuno, 2008 Jul 17) +- Add 'wspara' option, also accept blank lines like empty lines for "{" and + "}". (Mark Lundquist, 2008 Jul 18) +- Patch to add CTRL-T to delete part of a path on cmdline. (Adek, 2008 Jul + 21) +- Instead of creating a copy of the tutor in all the shell scripts, do it in + vimtutor.vim. (Jan Minar, 2008 Jul 20) +- When fsync() fails there is no hint about what went wrong. Patch by Ben + Schmidt, 2008 Jul 22. Awaiting updated patches: @@ -1204,11 +1247,6 @@ Macintosh: the :catch commands are always executed, also when the file is edited normally. Should reset did_emsg and undo side effects. Also make sure the ATTENTION message shows up. Servatius Brandt works on this. -9 When using ":e ++enc=foo file" and the file is already loaded with - 'fileencoding' set to "bar", then do_ecmd() uses that buffer, even though - the fileencoding differs. Reload the buffer in this situation? Need to - check for the buffer to be unmodified. - Unfinished patch by Ian Kelling, 2008 Jul 11. 8 ":g//" gives "Pattern not found error" with E486. Should not use the error number, it's not a regular error message. 7 Vimtutor leaves escape sequence in terminal. This is the xterm response to @@ -1307,7 +1345,7 @@ Macintosh: 9 When editing a file with 'readonly' set, there is no check for an existing swap file. Then using ":write" (without making any changes) doesn't give a warning either. Should check for an existing swap file without creating - one. Unfinished patch by Ian Kelling, 2008 July 7. + one. Unfinished patch by Ian Kelling, 2008 July 14. 7 When 'showbreak' is set, the amount of space a Tab occupies changes. Should work like 'showbreak' is inserted without changing the Tabs. 7 When 'mousefocus' is set and switching to another window with a typed @@ -1477,6 +1515,13 @@ Problems that will (probably) not be solved: - GTK: when using the popup menu with spelling suggestions and releasing the right mouse button before the menu appears selecting an item with the right mouse button has no effect. GTK does not produce an event for this. +- GTK 2: Cannot use the file selector. When using it many things become + slow. This is caused by some code in GTK that writes + ~/.recently-used.xbel every time an event is handled. It assumes the main + loop is never quit, which is a wrong assumption. Also, it overwrites the + file with different file permissions, which is a privacy issue. This + needs to be fixed in GTK. A solution in Vim would be really complicated. + (2008 Jul 31) - xterm title: The following scenario may occur (esp. when running the Vim test script): Vim 1 sets the title to "file1", then restores the title to "xterm" with an ESC sequence when exiting. Vim 2 obtains the old title diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index 655725f4..ed8b9548 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*uganda.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 6940102f..eb87dac4 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.2b. Last change: 2006 Apr 30 +*undo.txt* For Vim version 7.2c. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 3a56abed..3c450794 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 7.2b. Last change: 2008 May 07 +*usr_01.txt* For Vim version 7.2c. Last change: 2008 May 07 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index f47c63e2..5e6613e6 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 7.2b. Last change: 2007 Feb 28 +*usr_02.txt* For Vim version 7.2c. Last change: 2007 Feb 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index 47d24d45..75191e2f 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -1,4 +1,4 @@ -*usr_03.txt* For Vim version 7.2b. Last change: 2006 Jun 21 +*usr_03.txt* For Vim version 7.2c. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index dd6a84c0..19ebba0c 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -1,4 +1,4 @@ -*usr_04.txt* For Vim version 7.2b. Last change: 2006 Jun 21 +*usr_04.txt* For Vim version 7.2c. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 93c34ded..f832ebb4 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 7.2b. Last change: 2007 May 11 +*usr_05.txt* For Vim version 7.2c. Last change: 2007 May 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index 8ee32c43..0daec597 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -1,4 +1,4 @@ -*usr_06.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_06.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index ac216496..25b82c38 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -1,4 +1,4 @@ -*usr_07.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_07.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index 5c3a93e5..5c26f589 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -1,4 +1,4 @@ -*usr_08.txt* For Vim version 7.2b. Last change: 2006 Jul 18 +*usr_08.txt* For Vim version 7.2c. Last change: 2006 Jul 18 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index d2c652e9..73b61c67 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -1,4 +1,4 @@ -*usr_09.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_09.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index b41976f5..5ff20126 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -1,4 +1,4 @@ -*usr_10.txt* For Vim version 7.2b. Last change: 2006 Nov 05 +*usr_10.txt* For Vim version 7.2c. Last change: 2006 Nov 05 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index d23743af..6a1a0de2 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_11.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt index 3988de8f..438b3304 100644 --- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -1,4 +1,4 @@ -*usr_12.txt* For Vim version 7.2b. Last change: 2007 May 11 +*usr_12.txt* For Vim version 7.2c. Last change: 2007 May 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index 864559c5..fab7714e 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -1,4 +1,4 @@ -*usr_20.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_20.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index b15e7f01..c0f5cc94 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.2b. Last change: 2007 May 01 +*usr_21.txt* For Vim version 7.2c. Last change: 2007 May 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index a642c59b..6b19b041 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 7.2b. Last change: 2007 Aug 14 +*usr_22.txt* For Vim version 7.2c. Last change: 2007 Aug 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index ead8711c..01434882 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_23.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt index eab8a36d..5976cb71 100644 --- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 7.2b. Last change: 2006 Jul 23 +*usr_24.txt* For Vim version 7.2c. Last change: 2006 Jul 23 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 22ddddf1..5d167a63 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 7.2b. Last change: 2007 May 11 +*usr_25.txt* For Vim version 7.2c. Last change: 2007 May 11 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt index b8252dd4..96e04c37 100644 --- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -1,4 +1,4 @@ -*usr_26.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_26.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index d2d0cc4e..f4aa914b 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 7.2b. Last change: 2007 Nov 10 +*usr_27.txt* For Vim version 7.2c. Last change: 2007 Nov 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 045aef8f..dc7388dc 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.2b. Last change: 2008 Jun 14 +*usr_28.txt* For Vim version 7.2c. Last change: 2008 Jun 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 20f72ea2..07c4a43d 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*usr_29.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index 51ffcdfa..18c6108b 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -1,4 +1,4 @@ -*usr_30.txt* For Vim version 7.2b. Last change: 2007 Nov 10 +*usr_30.txt* For Vim version 7.2c. Last change: 2007 Nov 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index 403086fb..f00a76c2 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -1,4 +1,4 @@ -*usr_31.txt* For Vim version 7.2b. Last change: 2007 May 08 +*usr_31.txt* For Vim version 7.2c. Last change: 2007 May 08 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt index b049540b..852c7c8b 100644 --- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -1,4 +1,4 @@ -*usr_32.txt* For Vim version 7.2b. Last change: 2006 Apr 30 +*usr_32.txt* For Vim version 7.2c. Last change: 2006 Apr 30 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index cc8acc18..e21d2f9d 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.2b. Last change: 2006 Jun 21 +*usr_40.txt* For Vim version 7.2c. Last change: 2006 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 25e911ac..3673de46 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.2b. Last change: 2008 Jun 21 +*usr_41.txt* For Vim version 7.2c. Last change: 2008 Jun 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index b8c4eea0..5082ba9b 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -1,4 +1,4 @@ -*usr_42.txt* For Vim version 7.2b. Last change: 2008 May 05 +*usr_42.txt* For Vim version 7.2c. Last change: 2008 May 05 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index dbf3b867..1ddbb262 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_43.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt index 19165d47..d409bf56 100644 --- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -1,4 +1,4 @@ -*usr_44.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_44.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index 5f6a14f0..5bea5d86 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.2b. Last change: 2008 Apr 30 +*usr_45.txt* For Vim version 7.2c. Last change: 2008 Apr 30 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index 24efda2e..f31af736 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_90.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 75f29ce6..d473d453 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*usr_toc.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index e8f4de16..5163adc1 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.2b. Last change: 2008 Jun 08 +*various.txt* For Vim version 7.2c. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -644,7 +644,12 @@ g CTRL-A Only when Vim was compiled with MEM_PROFILING defined ":tnext" command can then be used to jump to other matches, "tselect" to list matches and choose one. > :help index| :tse z. -< This command can be followed by '|' and another +< When there is no argument you will see matches for + "help", to avoid listing all possible matches (that + would be very slow). + The number of matches displayed is limited to 300. + + This command can be followed by '|' and another command, but you don't need to escape the '|' inside a help command. So these both work: > :help | diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index 5eb62412..9bdcafc1 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*version4.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index 81205778..778dd1a6 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*version5.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index 0ab4d1de..5f7c8c80 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 7.2b. Last change: 2007 May 11 +*version6.txt* For Vim version 7.2c. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5894,7 +5894,7 @@ Files: src/move.c Patch 6.1b.023 Problem: On MS-Windows system() may cause checking timestamps, because Vim - looses and gains input focus, while this doesn't happen on Unix. + loses and gains input focus, while this doesn't happen on Unix. Solution: Don't check timestamps while system() is busy. Files: src/ex_cmds2.c, src/fileio.c, src/globals.h, src/misc1.c diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 7f450f42..bea46a3e 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.2b. Last change: 2008 Jul 13 +*version7.txt* For Vim version 7.2c. Last change: 2008 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4727,6 +4727,7 @@ New keymap files: Other new runtime files: Esperanto menus and message translations. (Dominique Pelle) Finnish translation of menus and messages. (Flammie Pirinen) + Brazilian Portugese message translations. (Eduardo Dobay) Added floating point support. |Float| @@ -6847,7 +6848,7 @@ Problem: When a file name has an illegal byte sequence Vim may read Solution: Don't use UTF_COMPOSINGLIKE() on an illegal byte. In msg_outtrans_len_attr() use char2cells() instead of ptr2cells(). In utf_ptr2char() don't check second byte when first byte is - illega. (Dominique Pelle) + illegal. (Dominique Pelle) Files: src/mbyte.c, src/message.c Patch 7.2a.011 @@ -6916,7 +6917,7 @@ Overlapping STRCPY() arguments when using %r item in 'errorformat'. Use STRMOVE() instead. (Ralf Wildenhues) Mac: On Leopard gvim, when using the mouse wheel nothing would happen until -another event occures, such as moving the mouse. Then the recorded scrolling +another event occurs, such as moving the mouse. Then the recorded scrolling would take place all at once. (Eckehard Berns) Solution for cursor color not reflecting IM status for GTK 2. Add @@ -6936,5 +6937,179 @@ characters may not be cleared properly. (Yukihiro Nakadaira) The #ifdef for including "vimio.h" was inconsistent. In a few files it depended on MSWIN, which isn't defined until later. +Patch 7.2b.001 +Problem: Compilation problem: mb_fix_col() missing with multi-byte feature + but without GUI or clipboard. +Solution: Remove #ifdef. +Files: src/mbyte.c + +Patch 7.2b.002 +Problem: Compiler warnings for signed/unsigned mismatch. +Solution: Add type casts. +Files: src/screen.c + +Patch 7.2b.003 +Problem: Still a compilation problem, check_col() and check_row() missing. +Solution: Add FEAT_MBYTE to the #if. +Files: src/ui.c + +Patch 7.2b.004 +Problem: Trying to free memory for a static string when using ":helpgrep". + (George Reilly) +Solution: Set 'cpo' to empty_option instead of an empty string. Also for + searchpair() and substitute(). +Files: src/quickfix.c, src/eval.c + +Patch 7.2b.005 +Problem: The special character "!" isn't handled properly in shellescape(). + (Jan Minar) +Solution: Escape "!" when using a "csh" like shell and with + shellescape(s, 1). Twice for both. Also escape . +Files: src/misc2.c + +Patch 7.2b.006 +Problem: Reading past end of string when reading info from tags line. +Solution: Break the loop when encountering a NUL. (Dominique Pelle) +Files: src/tag.c + +Patch 7.2b.007 +Problem: Part of a message cannot be translated. +Solution: Put _() around the message. +Files: src/search.c + +Patch 7.2b.008 +Problem: A few filetypes are not detected or not detected properly. +Solution: Add filetype detection patterns. (Nikolai Weibull) +Files: runtime/filetype.vim + +Patch 7.2b.009 +Problem: Reading past end of screen line. (Epicurus) +Solution: Avoid going past the value of Columns. +Files: src/screen.c + +Patch 7.2b.010 +Problem: ":mksession" doesn't work for ":map , foo", ":sunmap ,". (Ethan + Mallove) +Solution: Check for "nxo", "nso" and other strange mapping combinations. +Files: src/getchar.c + +Patch 7.2b.011 +Problem: Configure for TCL ends up with include file in compiler command. + (Richard Hogg) +Solution: Delete items from $TCL_DEFS that do not start with a dash. +Files: src/auto/configure, src/configure.in + +Patch 7.2b.012 +Problem: Build failure with +multi_byte but without +diff. +Solution: Add #ifdef. (Patrick Texier) +Files: src/main.c + +Patch 7.2b.013 +Problem: Build fails with tiny features and Perl. (Dominique Pelle) +Solution: Define missing functions. Also when compiling Python. +Files: src/if_perl.xs, src/if_python.c + +Patch 7.2b.014 +Problem: Configure uses an unsafe temp file to store commands. +Solution: Create the temp file in local directory. +Files: src/auto/configure, src/configure.in + +Patch 7.2b.015 +Problem: Build fails on Mac when using Aap. +Solution: Fix typo in configure script. +Files: src/auto/configure, src/configure.in + +Patch 7.2b.016 +Problem: Build fails with normal features but without +autocmd. +Solution: Fix #ifdefs. (Ian Kelling) +Files: src/eval.c, src/ex_cmds.c, src/quickfix.c, src/option.c, + src/ex_docmd.c + +Patch 7.2b.017 +Problem: "vim -O foo foo" results in only one window. (Zdenek Sekera) +Solution: Handle result of ATTENTION prompt properly. (Ian Kelling) +Files: src/main.c + +Patch 7.2b.018 +Problem: When doing command line completion on a file name for a csh-like + shell argument a '!' character isn't escaped properly. +Solution: Add another backslash. +Files: src/ex_getln.c, src/misc2.c, src/proto/misc2.pro, src/screen.c + +Patch 7.2b.019 (extra) +Problem: Win32: Various compiler warnings. +Solution: Use __w64 attribute. Comment-out unused parameters. Adjust a few + #ifdefs. (George Reilly) +Files: src/gui_w48.c, src/GvimExt/gvimext.cpp, src/Make_mvc.mak, + src/os_mswin.c, src/os_win32.c, src/vim.h + +Patch 7.2b.020 +Problem: ":sort n" doesn't handle negative numbers. (James Vega) +Solution: Include '-' in the number. +Files: src/charset.c, src/ex_cmds.c + +Patch 7.2b.021 +Problem: Reloading doesn't read the BOM correctly. (Steve Gardner) +Solution: Accept utf-8 BOM when specified file encoding is utf-8. +Files: src/fileio.c + +Patch 7.2b.022 +Problem: When using ":normal" while updating the status line the count of + an operator is lost. (Dominique Pelle) +Solution: Save and restore "opcount". +Files: src/ex_docmd.c, src/globals.h, src/normal.c + +Patch 7.2b.023 +Problem: Crash when using the result of synstack(0,0). (Matt Wozniski) +Solution: Check for v_list to be NULL in a few more places. +Files: src/eval.c + +Patch 7.2b.024 +Problem: Using ":gui" while the netrw plugin is active causes a delay in + updating the display. +Solution: Don't check for terminal codes when starting the GUI. +Files: src/term.c + +Patch 7.2b.025 +Problem: When the CursorHold event triggers a pending count is lost. + (Juergen Kraemer) +Solution: Save the counts and restore them. +Files: src/normal.c, src/structs.h + +Patch 7.2b.026 +Problem: The GTK 2 file chooser causes the ~/.recently-used.xbel file to be + written over and over again. This may cause a significant + slowdown. (Guido Berhoerster) +Solution: Don't use the GTK 2 file chooser. +Files: src/gui_gtk.c + +Patch 7.2b.027 +Problem: Memory leak for Python, Perl, etc. script command with end marker. +Solution: Free the memory of the end marker. (Andy Kittner) +Files: src/ex_getln.c + +Patch 7.2b.028 +Problem: Reading uninitialized memory when doing ":gui -f". (Dominique + Pelle) +Solution: Don't position the cursor when the screen size is invalid. +Files: src/gui.c + +Patch 7.2b.029 +Problem: ":help a" doesn't jump to "a" tag in docs. (Tony Mechelynck) +Solution: Get all tags and throw away more than TAG_MANY after sorting. + When there is no argument find matches for "help" to avoid a long + delay. +Files: src/ex_cmds.c, src/ex_getln.c + +Patch 7.2b.030 +Problem: When changing the value of t_Co from 8 to 16 the Visual + highlighting keeps both reverse and a background color. +Solution: Remove the attribute when setting the default highlight color. + (Markus Heidelberg) +Files: src/syntax.c + +Error when cancelling completion menu and auto-formatting. (fixed by Ian +Kelling) + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index bd5df64d..47c5494f 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.2b. Last change: 2008 Jun 28 +*vi_diff.txt* For Vim version 7.2c. Last change: 2008 Jun 28 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 index 58434406..3b49351b 100644 --- a/runtime/doc/vim-fr.1 +++ b/runtime/doc/vim-fr.1 @@ -549,7 +549,7 @@ Voir ":help 'filetype'". Script pour détecter le type d'un fichier d'après son contenu. Voir ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Fichiers utilisés pour l'impression PostScript. .PP Pour disposer d'informations récentes, consulter le site Internet de VIM : diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 index aa2c3c95..6e7b183b 100644 --- a/runtime/doc/vim-fr.UTF-8.1 +++ b/runtime/doc/vim-fr.UTF-8.1 @@ -549,7 +549,7 @@ Voir ":help 'filetype'". Script pour détecter le type d'un fichier d'après son contenu. Voir ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Fichiers utilisés pour l'impression PostScript. .PP Pour disposer d'informations récentes, consulter le site Internet de VIM : diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 index d712af46..1a8967fd 100755 --- a/runtime/doc/vim-it.1 +++ b/runtime/doc/vim-it.1 @@ -534,7 +534,7 @@ Vedere ":help 'filetype'". Script Vim per determinare il tipo di un file a partire dal suo contenuto. Vedere ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps File usati per stampa PostScript. .PP Per informazioni aggiornate [in inglese \- NdT] vedere la home page di Vim: diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 index f41691df..a7ea5f99 100644 --- a/runtime/doc/vim-it.UTF-8.1 +++ b/runtime/doc/vim-it.UTF-8.1 @@ -534,7 +534,7 @@ Vedere ":help 'filetype'". Script Vim per determinare il tipo di un file a partire dal suo contenuto. Vedere ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps File usati per stampa PostScript. .PP Per informazioni aggiornate [in inglese \- NdT] vedere la home page di Vim: diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1 index 25dd7869..3fa34e29 100644 --- a/runtime/doc/vim-pl.1 +++ b/runtime/doc/vim-pl.1 @@ -523,7 +523,7 @@ Skrypt do wykrywania typu pliku wed /usr/local/lib/vim/scripts.vim Skrypt do wykrywania typu pliku wed³ug jego zawarto¶ci. Zobacz ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Pliku u¿ywane do drukowania PostScriptu. .PP Naj¶wie¿sze wiadomo¶ci na stronie diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/vim-pl.UTF-8.1 index ab19a527..365da5a4 100644 --- a/runtime/doc/vim-pl.UTF-8.1 +++ b/runtime/doc/vim-pl.UTF-8.1 @@ -523,7 +523,7 @@ Skrypt do wykrywania typu pliku według jego nazwy. Zobacz ":help 'filetype'". /usr/local/lib/vim/scripts.vim Skrypt do wykrywania typu pliku według jego zawartości. Zobacz ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Pliku używane do drukowania PostScriptu. .PP Najświeższe wiadomości na stronie diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/vim-ru.1 index 11e30174..bb2597fe 100644 --- a/runtime/doc/vim-ru.1 +++ b/runtime/doc/vim-ru.1 @@ -452,7 +452,7 @@ rvim rview rgvim rgview /usr/local/lib/vim/scripts.vim óÃÅÎÁÒÉÊ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÔÉÐÁ ÆÁÊÌÁ ÐÏ ÓÏÄÅÒÖÉÍÏÍÕ. óÍ. ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps æÁÊÌÙ ÄÌÑ ÐÅÞÁÔÉ PostScript. .PP âÏÌÅÅ Ó×ÅÖÁÑ ÉÎÆÏÒÍÁÃÉÑ -- ÎÁ ÓÁÊÔÅ VIM: diff --git a/runtime/doc/vim-ru.UTF-8.1 b/runtime/doc/vim-ru.UTF-8.1 index b4d88edb..78127a1c 100644 --- a/runtime/doc/vim-ru.UTF-8.1 +++ b/runtime/doc/vim-ru.UTF-8.1 @@ -452,7 +452,7 @@ rvim rview rgvim rgview /usr/local/lib/vim/scripts.vim Сценарий для определения типа файла по содержимому. См. ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Файлы для печати PostScript. .PP Более свежая информация -- на сайте VIM: diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index 4e90da27..820caa24 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -187,7 +187,7 @@ behave mostly like Vi, even though a .vimrc file exists. .TP \-d Start in diff mode. -There should be two or three file name arguments. +There should be two, three or four file name arguments. .B Vim will open all the files and show differences between them. Works like vimdiff(1). @@ -522,7 +522,7 @@ Script to detect the type of a file by its name. See ":help 'filetype'". /usr/local/lib/vim/scripts.vim Script to detect the type of a file by its contents. See ":help 'filetype'". .TP -/usr/local/lib/vim/*.ps +/usr/local/lib/vim/print/*.ps Files used for PostScript printing. .PP For recent info read the VIM home page: diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man index fa5c5c85..5b9b83cb 100644 --- a/runtime/doc/vim.man +++ b/runtime/doc/vim.man @@ -135,9 +135,9 @@ OPTIONS Vim behave mostly like Vi, even though a .vimrc file exists. - -d Start in diff mode. There should be two or three file name - arguments. Vim will open all the files and show differ- - ences between them. Works like vimdiff(1). + -d Start in diff mode. There should be two, three or four + file name arguments. Vim will open all the files and show + differences between them. Works like vimdiff(1). -d {device} Open {device} for use as a terminal. Only on the Amiga. Example: "-d con:20/30/600/150". @@ -398,7 +398,7 @@ FILES Script to detect the type of a file by its contents. See ":help 'filetype'". - /usr/local/lib/vim/*.ps + /usr/local/lib/vim/print/*.ps Files used for PostScript printing. For recent info read the VIM home page: diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/vimdiff.1 index 90ed8b80..bed2b328 100644 --- a/runtime/doc/vimdiff.1 +++ b/runtime/doc/vimdiff.1 @@ -1,17 +1,17 @@ .TH VIMDIFF 1 "2001 March 30" .SH NAME -vimdiff \- edit two or three versions of a file with Vim and show differences +vimdiff \- edit two, three or four versions of a file with Vim and show differences .SH SYNOPSIS .br .B vimdiff -[options] file1 file2 [file3] +[options] file1 file2 [file3 [file4]] .PP .B gvimdiff .SH DESCRIPTION .B Vimdiff starts .B Vim -on two (or three) files. +on two (or three or four) files. Each file gets its own window. The differences between the files are highlighted. This is a nice way to inspect changes and to move changes from one version diff --git a/runtime/doc/vimdiff.man b/runtime/doc/vimdiff.man index 41ef47f3..913ac138 100644 --- a/runtime/doc/vimdiff.man +++ b/runtime/doc/vimdiff.man @@ -3,19 +3,19 @@ VIMDIFF(1) VIMDIFF(1) NAME - vimdiff - edit two or three versions of a file with Vim and show dif- - ferences + vimdiff - edit two, three or four versions of a file with Vim and show + differences SYNOPSIS - vimdiff [options] file1 file2 [file3] + vimdiff [options] file1 file2 [file3 [file4]] gvimdiff DESCRIPTION - Vimdiff starts Vim on two (or three) files. Each file gets its own - window. The differences between the files are highlighted. This is a - nice way to inspect changes and to move changes from one version to - another version of the same file. + Vimdiff starts Vim on two (or three or four) files. Each file gets its + own window. The differences between the files are highlighted. This + is a nice way to inspect changes and to move changes from one version + to another version of the same file. See vim(1) for details about Vim itself. diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index fca71f36..6968f774 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.2b. Last change: 2006 Sep 26 +*visual.txt* For Vim version 7.2c. Last change: 2006 Sep 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 40e98c44..62917700 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.2b. Last change: 2008 Jul 05 +*windows.txt* For Vim version 7.2c. Last change: 2008 Jul 05 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index e6768525..da56f287 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -1,4 +1,4 @@ -*workshop.txt* For Vim version 7.2b. Last change: 2006 Apr 24 +*workshop.txt* For Vim version 7.2c. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/indent/bst.vim b/runtime/indent/bst.vim index e6731031..16618eee 100644 --- a/runtime/indent/bst.vim +++ b/runtime/indent/bst.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: bst " Author: Tim Pope -" $Id: bst.vim,v 1.7 2008/07/13 17:36:41 vimboss Exp $ +" $Id: bst.vim,v 1.8 2008/08/06 16:59:11 vimboss Exp $ if exists("b:did_indent") finish diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim index f84aadcf..36f576cd 100644 --- a/runtime/plugin/netrwPlugin.vim +++ b/runtime/plugin/netrwPlugin.vim @@ -1,9 +1,9 @@ " netrwPlugin.vim: Handles file transfer and remote directory listing across a network " PLUGIN SECTION -" Date: Apr 07, 2008 +" Date: Aug 01, 2008 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim -" Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 +" Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1 " Permission is hereby granted to use and distribute this code, " with or without modifications, provided that this copyright " notice is copied with it. Like anything else that's free, @@ -22,7 +22,7 @@ if &cp || exists("g:loaded_netrwPlugin") finish endif -let g:loaded_netrwPlugin = "v127" +let g:loaded_netrwPlugin = "v131" let s:keepcpo = &cpo if v:version < 700 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 for this version of netrw" | echohl None @@ -47,19 +47,19 @@ augroup END augroup Network au! if has("win32") || has("win95") || has("win64") || has("win16") - au BufReadCmd file://* exe "silent doau BufReadPre ".netrw#RFC2396(expand(""))|exe 'e '.substitute(netrw#RFC2396(expand("")),'file://\(.*\)','\1',"")|exe "bwipe ".expand("")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("")) + au BufReadCmd file://* exe "silent doau BufReadPre ".fnameescape(netrw#RFC2396(expand("")))|exe 'e '.fnameescape(substitute(netrw#RFC2396(expand("")),'file://\(.*\)','\1',""))|exe "bwipe ".fnameescape(expand(""))|exe "silent doau BufReadPost ".fnameescape(netrw#RFC2396(expand(""))) else - au BufReadCmd file://* exe "silent doau BufReadPre ".netrw#RFC2396(expand(""))|exe 'e '.substitute(netrw#RFC2396(expand("")),'file://\(.*\)','\1',"")|exe "bwipe ".expand("")|exe "silent doau BufReadPost ".netrw#RFC2396(expand("")) - au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".netrw#RFC2396(expand(""))|exe 'e '.substitute(netrw#RFC2396(expand("")),'file://localhost/\(.*\)','\1',"")|exe "bwipe ".substitute(expand(""),'file://\(\k\+@\)\=','','')|exe "silent doau BufReadPost ".netrw#RFC2396(expand("")) + au BufReadCmd file://* exe "silent doau BufReadPre ".fnameescape(netrw#RFC2396(expand("")))|exe 'e '.fnameescape(substitute(netrw#RFC2396(expand("")),'file://\(.*\)','\1',""))|exe "bwipe ".fnameescape(expand(""))|exe "silent doau BufReadPost ".fnameescape(netrw#RFC2396(expand(""))) + au BufReadCmd file://localhost/* exe "silent doau BufReadPre ".fnameescape(netrw#RFC2396(expand("")))|exe 'e '.fnameescape(substitute(netrw#RFC2396(expand("")),'file://localhost/\(.*\)','\1',""))|exe "bwipe ".fnameescape(substitute(expand(""),'file://\(\k\+@\)\=','',''))|exe "silent doau BufReadPost ".fnameescape(netrw#RFC2396(expand(""))) endif - au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufReadPre ".expand("")|exe '2Nread "'.expand("").'"'|exe "silent doau BufReadPost ".expand("") - au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileReadPre ".expand("")|exe 'Nread "' .expand("").'"'|exe "silent doau FileReadPost ".expand("") - au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufWritePre ".expand("")|exe 'Nwrite "' .expand("").'"'|exe "silent doau BufWritePost ".expand("") - au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileWritePre ".expand("")|exe "'[,']".'Nwrite "' .expand("").'"'|exe "silent doau FileWritePost ".expand("") + au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufReadPre ".fnameescape(expand(""))|exe '2Nread '.fnameescape(expand(""))|exe "silent doau BufReadPost ".fnameescape(expand("")) + au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileReadPre ".fnameescape(expand(""))|exe 'Nread '.fnameescape(expand(""))|exe "silent doau FileReadPost ".fnameescape(expand("")) + au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau BufWritePre ".fnameescape(expand(""))|exe 'Nwrite '.fnameescape(expand(""))|exe "silent doau BufWritePost ".fnameescape(expand("")) + au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,davs://*,rsync://*,sftp://* exe "silent doau FileWritePre ".fnameescape(expand(""))|exe "'[,']".'Nwrite '.fnameescape(expand(""))|exe "silent doau FileWritePost ".fnameescape(expand("")) try - au SourceCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource "'.expand("").'"' + au SourceCmd ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource '.fnameescape(expand("")) catch /^Vim\%((\a\+)\)\=:E216/ - au SourcePre ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource "'.expand("").'"' + au SourcePre ftp://*,rcp://*,scp://*,http://*,dav://*,davs://*,rsync://*,sftp://* exe 'Nsource '.fnameescape(expand("")) endtry augroup END diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim index 412ceed7..9a28a103 100644 --- a/runtime/plugin/tarPlugin.vim +++ b/runtime/plugin/tarPlugin.vim @@ -14,7 +14,7 @@ if &cp || exists("g:loaded_tarPlugin") finish endif -let g:loaded_tarPlugin = "v19" +let g:loaded_tarPlugin = "v20" let s:keepcpo = &cpo set cpo&vim diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim index 502c8216..630bb9fb 100644 --- a/runtime/plugin/vimballPlugin.vim +++ b/runtime/plugin/vimballPlugin.vim @@ -16,7 +16,7 @@ if &cp || exists("g:loaded_vimballPlugin") finish endif -let g:loaded_vimballPlugin = "v27" +let g:loaded_vimballPlugin = "v29" let s:keepcpo = &cpo set cpo&vim diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim index e198c66e..b80ecc61 100644 --- a/runtime/plugin/zipPlugin.vim +++ b/runtime/plugin/zipPlugin.vim @@ -20,16 +20,7 @@ if &cp || exists("g:loaded_zipPlugin") finish endif - -" Don't use the plugin if fnameescape() is not available -if !exists("*fnameescape") - if &verbose > 1 - echoerr "zipPlugin not loaded because fnameescape() is not available" - endif - finish -endif - -let g:loaded_zipPlugin = "v21+b" +let g:loaded_zipPlugin = "v22" let s:keepcpo = &cpo set cpo&vim diff --git a/runtime/scripts.vim b/runtime/scripts.vim index 201c3756..a5869204 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar -" Last change: 2008 Jun 30 +" Last change: 2008 Jul 17 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by @@ -276,6 +276,7 @@ else " Strace elseif s:line1 =~ '^[0-9]* *execve(' + elseif s:line1 =~ '^\(\[pid \d\+\] \)\=[0-9:.]* *execve(' || s:line1 =~ '^__libc_start_main' set ft=strace " VSE JCL diff --git a/runtime/spell/pt/main.aap b/runtime/spell/pt/main.aap index 17ba24d3..b2ad65bf 100644 --- a/runtime/spell/pt/main.aap +++ b/runtime/spell/pt/main.aap @@ -1,5 +1,5 @@ # Aap recipe for Portuguese Vim spell files. -# +# See ftp://ftp.vim.org/pub/vim/runtime/spell/README.txt # Use a freshly compiled Vim if it exists. @if os.path.exists('../../../src/vim'): diff --git a/runtime/spell/pt/pt_BR.diff b/runtime/spell/pt/pt_BR.diff index 0bd44e2c..f4814af1 100644 --- a/runtime/spell/pt/pt_BR.diff +++ b/runtime/spell/pt/pt_BR.diff @@ -14,7 +14,7 @@ --- 13,32 ---- + NAME Brazilian Portuguese -+ VERSION 20080221V ++ VERSION 2008-07-07V + HOME http://www.broffice.org/verortografico + AUTHOR Raimundo Santos Moura + EMAIL raimundomoura AT openoffice DOT org diff --git a/runtime/spell/pt/pt_PT.diff b/runtime/spell/pt/pt_PT.diff index 4b048eb6..36a12ace 100644 --- a/runtime/spell/pt/pt_PT.diff +++ b/runtime/spell/pt/pt_PT.diff @@ -10,7 +10,7 @@ SET ISO8859-1 + NAME European Portuguese -+ VERSION 2008-03-20 ++ VERSION 2008-07-05 + HOME http://natura.di.uminho.pt/ + AUTHOR Rui Vilela + EMAIL ruivilela AT di DOT uminho DOT pt diff --git a/runtime/tools/vimm b/runtime/tools/vimm index 042c4a02..7b84cb25 100755 --- a/runtime/tools/vimm +++ b/runtime/tools/vimm @@ -1,6 +1,6 @@ #!/bin/sh # enable DEC locator input model on remote terminal -echo "\033[1;2'z\033[1;3'{\c" +printf "\033[1;2'z\033[1;3'{\c" vim "$@" # disable DEC locator input model on remote terminal -echo "\033[2;4'{\033[0'z\c" +printf "\033[2;4'{\033[0'z\c" diff --git a/runtime/tools/vimspell.sh b/runtime/tools/vimspell.sh index b405b7ad..d336fe6c 100755 --- a/runtime/tools/vimspell.sh +++ b/runtime/tools/vimspell.sh @@ -11,6 +11,7 @@ # # Neil Schemenauer # March 1999 +# updated 2008 Jul 17 by Bram # # Safe method for the temp file by Javier Fernández-Sanguino_Peña @@ -22,7 +23,7 @@ OUTFILE=`mktemp -t vimspellXXXXXX || tempfile -p vimspell || echo none` # create a file in the safest way possible. if test "$OUTFILE" = none; then OUTFILE=$tmp/vimspell$$ - [ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!; exit 1 ; } + [ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!"; exit 1 ; } (umask 077; touch $OUTFILE) fi # Note the copy of vimspell cannot be deleted on exit since it is -- 2.11.4.GIT