From c01140a1a069caf3ced83eac7d4866048c4b723e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 24 Mar 2006 22:21:52 +0000 Subject: updated for version 7.0b --- Makefile | 12 +- README.txt | 2 +- README_ami.txt | 2 +- README_amibin.txt | 2 +- README_dos.txt | 2 +- README_extra.txt | 2 +- README_mac.txt | 2 +- README_ole.txt | 2 +- README_os390.txt | 2 +- README_w32s.txt | 2 +- nsis/gvim.nsi | 8 +- runtime/autoload/netrw.vim | 32 ++- runtime/autoload/zip.vim | 2 +- runtime/doc/Makefile | 2 + runtime/doc/autocmd.txt | 2 +- runtime/doc/change.txt | 2 +- runtime/doc/cmdline.txt | 2 +- runtime/doc/debug.txt | 2 +- runtime/doc/debugger.txt | 2 +- runtime/doc/develop.txt | 2 +- runtime/doc/diff.txt | 2 +- runtime/doc/digraph.txt | 2 +- runtime/doc/editing.txt | 2 +- runtime/doc/fold.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/help.txt | 10 +- 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 | 2 +- runtime/doc/index.txt | 4 +- runtime/doc/insert.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 | 2 +- runtime/doc/netbeans.txt | 2 +- runtime/doc/options.txt | 2 +- runtime/doc/os_390.txt | 2 +- runtime/doc/os_beos.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/pi_gzip.txt | 2 +- runtime/doc/pi_netrw.txt | 20 +- runtime/doc/pi_paren.txt | 2 +- runtime/doc/pi_tar.txt | 4 +- runtime/doc/pi_zip.txt | 4 +- runtime/doc/print.txt | 2 +- runtime/doc/quickref.txt | 2 +- runtime/doc/recover.txt | 2 +- runtime/doc/rileft.txt | 2 +- runtime/doc/russian.txt | 2 +- runtime/doc/sign.txt | 2 +- runtime/doc/sponsor.txt | 76 ++--- runtime/doc/tabpage.txt | 2 +- runtime/doc/tags | 5 + runtime/doc/term.txt | 2 +- runtime/doc/tips.txt | 2 +- runtime/doc/uganda.nsis.txt | 292 +++++++++++++++++++ runtime/doc/uganda.txt | 15 +- runtime/doc/undo.txt | 6 +- runtime/doc/usr_02.txt | 4 +- runtime/doc/usr_03.txt | 2 +- runtime/doc/usr_08.txt | 2 +- runtime/doc/usr_09.txt | 2 +- runtime/doc/usr_10.txt | 2 +- runtime/doc/usr_21.txt | 2 +- runtime/doc/usr_22.txt | 2 +- runtime/doc/usr_24.txt | 2 +- runtime/doc/usr_25.txt | 2 +- runtime/doc/usr_26.txt | 2 +- runtime/doc/usr_29.txt | 2 +- runtime/doc/usr_32.txt | 151 ++++++++++ runtime/doc/usr_41.txt | 4 +- 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 | 11 +- runtime/doc/version4.txt | 2 +- runtime/doc/version5.txt | 2 +- runtime/doc/version6.txt | 2 +- runtime/doc/vi_diff.txt | 2 +- runtime/doc/visual.txt | 2 +- runtime/ftplugin/plaintex.vim | 48 ++++ runtime/ftplugin/tex.vim | 91 +----- runtime/keymap/greek_utf-8.vim | 96 ++++--- runtime/macros/matchit.txt | 10 +- runtime/makemenu.vim | 44 ++- runtime/spell/es/main.aap | 4 +- runtime/synmenu.vim | 619 ++++++++++++++++++++++------------------- runtime/syntax/groovy.vim | 450 ++++++++++++++++++++++++++++++ src/GvimExt/GvimExt.reg | 4 +- src/Make_bc3.mak | 4 +- src/Make_bc5.mak | 4 +- src/Make_ivc.mak | 8 +- src/Make_manx.mak | 20 +- src/Make_ming.mak | 4 +- src/Make_mvc.mak | 12 +- src/Make_os2.mak | 8 +- src/Make_ro.mak | 8 +- src/Make_sas.mak | 20 +- src/Makefile | 441 +++++++++++++++-------------- src/fileio.c | 4 +- src/hashtab.c | 518 ++++++++++++++++++++++++++++++++++ src/message.c | 4 +- src/os_msdos.c | 4 +- src/os_msdos.h | 1 + src/proto.h | 8 +- src/proto/buffer.pro | 134 ++++----- src/proto/charset.pro | 108 +++---- src/proto/diff.pro | 48 ++-- src/proto/digraph.pro | 14 +- src/proto/eval.pro | 194 ++++++------- src/proto/ex_docmd.pro | 100 +++---- src/proto/ex_eval.pro | 60 ++-- src/proto/ex_getln.pro | 102 +++---- src/proto/fold.pro | 78 +++--- src/proto/getchar.pro | 122 ++++---- src/proto/gui.pro | 124 ++++----- src/proto/gui_athena.pro | 58 ++-- src/proto/gui_gtk.pro | 42 +-- src/proto/gui_gtk_x11.pro | 142 +++++----- src/proto/gui_photon.pro | 130 ++++----- src/proto/gui_w16.pro | 146 +++++----- src/proto/gui_w32.pro | 180 ++++++------ src/proto/gui_xmdlg.pro | 2 +- src/proto/hardcopy.pro | 37 ++- src/proto/hashtab.pro | 14 + src/proto/if_cscope.pro | 14 +- src/proto/if_perlsfio.pro | 2 +- src/proto/if_tcl.pro | 16 +- src/proto/main.pro | 48 ++-- src/proto/mark.pro | 56 ++-- src/proto/memfile.pro | 32 +-- src/proto/message.pro | 136 ++++----- src/proto/netbeans.pro | 46 +-- src/proto/normal.pro | 48 ++-- src/proto/ops.pro | 116 ++++---- src/proto/option.pro | 109 ++++---- src/proto/os_amiga.pro | 88 +++--- src/proto/os_mswin.pro | 122 ++++---- src/proto/os_riscos.pro | 94 +++---- src/proto/os_vms.pro | 24 +- src/proto/os_win16.pro | 20 +- src/proto/popupmnu.pro | 8 + src/proto/regexp.pro | 30 +- src/proto/syntax.pro | 88 +++--- src/proto/undo.pro | 38 +-- src/proto/version.pro | 14 +- src/proto/window.pro | 114 ++++---- src/proto/workshop.pro | 94 +++---- src/tag.c | 7 +- src/testdir/Make_dos.mak | 2 +- src/version.h | 18 +- src/vim.h | 2 +- 173 files changed, 4011 insertions(+), 2470 deletions(-) create mode 100644 runtime/doc/uganda.nsis.txt create mode 100644 runtime/doc/usr_32.txt create mode 100644 runtime/ftplugin/plaintex.vim create mode 100644 runtime/syntax/groovy.vim create mode 100644 src/hashtab.c create mode 100644 src/proto/hashtab.pro create mode 100644 src/proto/popupmnu.pro diff --git a/Makefile b/Makefile index 7fc8d5a802..7ccceab10d 100644 --- a/Makefile +++ b/Makefile @@ -69,15 +69,15 @@ all install uninstall tools config configure proto depend lint tags types test t # Before creating an archive first delete all backup files, *.orig, etc. MAJOR = 7 -MINOR = 0aa +MINOR = 0b # Uncomment this line if the Win32s version is to be included. -#DOSBIN_S = dosbin_s +DOSBIN_S = dosbin_s # CHECKLIST for creating a new version: # # - Update Vim version number. For a test version in: src/version.h, Contents, -# MAJOR/MINOR above, VIMRTDIR and VERSION in src/Makefile, README*.txt, +# MAJOR/MINOR above, VIMMAJOR and VIMMINOR in src/Makefile, README*.txt, # runtime/doc/*.txt and nsis/gvim.nsi. Other things in README_os2.txt. For a # minor/major version: src/GvimExt/GvimExt.reg, src/vim.def, src/vim16.def. # - Correct included_patches[] in src/version.c. @@ -92,7 +92,7 @@ MINOR = 0aa # - Check for missing entries in runtime/makemenu.vim (with checkmenu script). # - Check for missing options in runtime/optwin.vim et al. (with check.vim). # - Do "make menu" to update the runtime/synmenu.vim file. -# - Add remarks for changes to runtime/doc/version6.txt. +# - Add remarks for changes to runtime/doc/version7.txt. # - In runtime/doc run "make" and "make html" to check for errors. # - Check if src/Makefile and src/feature.h don't contain any personal # preferences or the GTK, Perl, etc. mentioned above. @@ -139,13 +139,13 @@ MINOR = 0aa # Win32 GUI version: # - "nmake -f Make_mvc.mak GUI=yes. # - move "gvim.exe" to here (otherwise the OLE version will overwrite it). -# - Move ObjC/gvim.pdb to here. +# - Move ObjG/gvim.pdb to here. # - Delete vimrun.exe, install.exe and uninstall.exe. # - Copy "GvimExt/gvimext.dll" to here. # Win32 GUI version with OLE, PERL, TCL, PYTHON and dynamic IME: # - Run src/bigvim.bat ("nmake -f Make_mvc.mak GUI=yes OLE=yes IME=yes ...) # - Rename "gvim.exe" to "gvim_ole.exe". -# - Rename ObjC/gvim.pdb to "gvim_ole.pdb". +# - Rename ObjGOLYTR/gvim.pdb to "gvim_ole.pdb". # - Delete install.exe and uninstall.exe. # - If building the Win32s version delete vimrun.exe. # Win32s GUI version: diff --git a/README.txt b/README.txt index fe32229b4b..8d26a3bce8 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt for version 7.0aa of Vim: Vi IMproved. +README.txt for version 7.0b of Vim: Vi IMproved. WHAT IS VIM diff --git a/README_ami.txt b/README_ami.txt index ba54262d47..c1e58dba4e 100644 --- a/README_ami.txt +++ b/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 7.0aa of Vim: Vi IMproved. +README_ami.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on Amiga systems. See README.txt for general information about Vim. diff --git a/README_amibin.txt b/README_amibin.txt index 9d784a24fb..f39eb5e590 100644 --- a/README_amibin.txt +++ b/README_amibin.txt @@ -1,4 +1,4 @@ -README_amibin.txt for version 7.0aa of Vim: Vi IMproved. +README_amibin.txt for version 7.0b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. diff --git a/README_dos.txt b/README_dos.txt index 3cdc532a19..9ecfec60af 100644 --- a/README_dos.txt +++ b/README_dos.txt @@ -1,4 +1,4 @@ -README_dos.txt for version 7.0aa of Vim: Vi IMproved. +README_dos.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on MS-DOS and MS-Windows systems. See "README.txt" for general information about Vim. diff --git a/README_extra.txt b/README_extra.txt index d9358568fe..5d49a4f258 100644 --- a/README_extra.txt +++ b/README_extra.txt @@ -1,4 +1,4 @@ -README_extra.txt for version 7.0aa of Vim: Vi IMproved. +README_extra.txt for version 7.0b of Vim: Vi IMproved. The extra archive of Vim is to be used in combination with the source archive (vim-6.0-src.tar.gz). The extra archive is useless without it. diff --git a/README_mac.txt b/README_mac.txt index 83e3c64ccf..26d809a4e0 100644 --- a/README_mac.txt +++ b/README_mac.txt @@ -1,4 +1,4 @@ -README_mac.txt for version 7.0aa of Vim: Vi IMproved. +README_mac.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on Macintosh systems. See "README.txt" for general information about Vim. diff --git a/README_ole.txt b/README_ole.txt index 90fcfa0780..bfbe4ec135 100644 --- a/README_ole.txt +++ b/README_ole.txt @@ -1,4 +1,4 @@ -README_ole.txt for version 7.0aa of Vim: Vi IMproved. +README_ole.txt for version 7.0b of Vim: Vi IMproved. This archive contains gvim.exe with OLE interface and VisVim. This version of gvim.exe can also load a number of interface dynamically (you diff --git a/README_os390.txt b/README_os390.txt index 213ee36a00..3761c0f82a 100644 --- a/README_os390.txt +++ b/README_os390.txt @@ -1,4 +1,4 @@ -README_os_390.txt for version 7.0aa of Vim: Vi IMproved. +README_os_390.txt for version 7.0b of Vim: Vi IMproved. Welcome to the OS/390 Unix port of VIM. diff --git a/README_w32s.txt b/README_w32s.txt index 41b0cdca80..027e3120ad 100644 --- a/README_w32s.txt +++ b/README_w32s.txt @@ -1,4 +1,4 @@ -README_w32s.txt for version 7.0aa of Vim: Vi IMproved. +README_w32s.txt for version 7.0b of Vim: Vi IMproved. This archive contains the gvim.exe that was specifically compiled for use in the Win32s subsystem in MS-Windows 3.1 and 3.11. diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index e184239b24..8698f93f84 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -22,7 +22,7 @@ !define HAVE_NLS !define VER_MAJOR 7 -!define VER_MINOR 0aa +!define VER_MINOR 0b # ----------- No configurable settings below this line ----------- @@ -217,6 +217,12 @@ Section "Vim executables and runtime files" SetOutPath $0\syntax File ${VIMRT}\syntax\*.* + SetOutPath $0\spell + File ${VIMRT}\spell\*.txt + File ${VIMRT}\spell\*.vim + File ${VIMRT}\spell\*.spl + File ${VIMRT}\spell\*.sug + SetOutPath $0\tools File ${VIMRT}\tools\*.* diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 4f8f0a1c07..399f671e0d 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 a network " AUTOLOAD PORTION -" Date: Mar 21, 2006 -" Version: 82 +" Date: Mar 22, 2006 +" Version: 83 " Maintainer: Charles E Campbell, Jr " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim " Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1 @@ -23,7 +23,7 @@ if &cp || exists("g:loaded_netrw") finish endif -let g:loaded_netrw = "v82" +let g:loaded_netrw = "v83" if v:version < 700 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None finish @@ -1280,6 +1280,8 @@ fun! s:NetBrowse(dirname) setlocal bt=nofile nobl nonu noswf if g:netrw_fastbrowse >= 1 setlocal bh=hide + else + setlocal bh=delete endif " save current directory on directory history list @@ -1508,6 +1510,8 @@ fun! s:NetBrowseChgDir(dirname,newdir) setlocal ma nobl if g:netrw_fastbrowse >= 1 setlocal bh=hide + else + setlocal bh=delete endif %d @@ -1538,7 +1542,7 @@ endfun " --------------------------------------------------------------------- " NetGetWord: it gets the directory named under the cursor {{{2 fun! s:NetGetWord() -" call Dfunc("NetGetWord() line#".line(".")) +" call Dfunc("NetGetWord() line#".line(".")." longlist=".g:netrw_longlist." virtcol=".virtcol(".")) call s:UseBufWinVars() " insure that w:netrw_longlist is set up @@ -1548,6 +1552,7 @@ fun! s:NetGetWord() else let w:netrw_longlist= 0 endif +" call Decho("w:netrw_longlist=".w:netrw_longlist) endif if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt @@ -1596,7 +1601,7 @@ fun! s:NetGetWord() endif let filestart = (virtcol(".")/b:netrw_cpf)*b:netrw_cpf -" call Decho("virtcol=".virtcol(".")." cpf=".b:netrw_cpf." bannercnt=".w:netrw_bannercnt." filestart=".filestart) +" call Decho("filestart= ([virtcol=".virtcol(".")."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart." bannercnt=".w:netrw_bannercnt) " call Decho("1: dirname<".dirname.">") if filestart > 0|let dirname= substitute(dirname,'^.\{'.filestart.'}','','')|endif " call Decho("2: dirname<".dirname.">") @@ -1613,7 +1618,7 @@ endfun " --------------------------------------------------------------------- " NetBrowseRm: remove/delete a remote file or directory {{{2 fun! s:NetBrowseRm(usrhost,path) range -" call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">)") +" call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">) virtcol=".virtcol(".")) " call Decho("firstline=".a:firstline." lastline=".a:lastline) " preparation for removing multiple files/directories @@ -1624,7 +1629,6 @@ fun! s:NetBrowseRm(usrhost,path) range while ctr <= a:lastline exe ctr - norm! 0 let rmfile= s:NetGetWord() " call Decho("rmfile<".rmfile.">") @@ -2849,6 +2853,8 @@ fun! netrw#DirBrowse(dirname) setlocal bt=nofile nobl ma nonu noswf nowrap if g:netrw_fastbrowse >= 2 setlocal bh=hide + else + setlocal bh=delete endif keepalt silent! %d @@ -3178,7 +3184,7 @@ fun! s:LocalBrowseShellCmdRefresh() for ibuf in s:netrw_browselist if bufwinnr(ibuf) == -1 " call Decho("wiping buf#".ibuf) - exe "bw ".ibuf + exe "silent! bw ".ibuf call remove(s:netrw_browselist,ibl) " call Decho("browselist=".string(s:netrw_browselist)) continue @@ -3898,11 +3904,11 @@ fun! s:NetOptionSave() " Get Temporary Filename let w:aikeep = &ai - " record autochdir setting and then insure its unset (tnx to David Fishburn) - if &acd && (has("netbeans_intg") || has("sun_workshop")) - set noacd - echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None - endif +" " netrw and the acd option do not work together properly +" if &acd && (has("netbeans_intg") || has("sun_workshop")) +" set noacd +" echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None +" endif let w:fokeep = &fo let w:aikeep = &ai let w:cikeep = &ci diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 2243ea8a38..45aa3532a0 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -75,7 +75,7 @@ fun! zip#Browse(zipfile) 0d $ - call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'") +" call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'") exe "silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'" $d silent 4,$v/^\s\+\d\+\s\{0,5}\d/d diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 7dcbcf5f9e..532cc2df6e 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -123,6 +123,7 @@ DOCS = \ usr_29.txt \ usr_30.txt \ usr_31.txt \ + usr_32.txt \ usr_40.txt \ usr_41.txt \ usr_42.txt \ @@ -251,6 +252,7 @@ HTMLS = \ usr_29.html \ usr_30.html \ usr_31.html \ + usr_32.html \ usr_40.html \ usr_41.html \ usr_42.html \ diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 4c19f1d4d6..cce7745ff8 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2006 Mar 15 +*autocmd.txt* For Vim version 7.0b. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 408632291f..00269e7498 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0aa. Last change: 2006 Mar 16 +*change.txt* For Vim version 7.0b. Last change: 2006 Mar 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 4393c44147..082415b3fc 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0aa. Last change: 2006 Mar 16 +*cmdline.txt* For Vim version 7.0b. Last change: 2006 Mar 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 17bbe52f41..0000a3ed96 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.0aa. Last change: 2005 Dec 17 +*debug.txt* For Vim version 7.0b. Last change: 2005 Dec 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 566b83a843..4f4d98c651 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*debugger.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index b9e4b90a8f..85f5027dc6 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.0aa. Last change: 2006 Mar 09 +*develop.txt* For Vim version 7.0b. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index 577b216ef7..dfd9ac1239 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.0aa. Last change: 2006 Mar 15 +*diff.txt* For Vim version 7.0b. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index c75708ebc8..995e0d4e58 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.0aa. Last change: 2005 Sep 11 +*digraph.txt* For Vim version 7.0b. Last change: 2005 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 38115aac73..9c8063eeb9 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*editing.txt* For Vim version 7.0b. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index c7a0a79f08..fa8568e9a6 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.0aa. Last change: 2005 Sep 10 +*fold.txt* For Vim version 7.0b. Last change: 2005 Sep 10 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index f79f84e57b..c1446da520 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0aa. Last change: 2006 Mar 20 +*gui.txt* For Vim version 7.0b. Last change: 2006 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt index 605e77ec8f..b20bf44de5 100644 --- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.0b. 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 2c70eb7247..472bf4f2b4 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*gui_w32.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 825ff3c6a3..97b914cfe2 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0aa. Last change: 2005 Dec 06 +*gui_x11.txt* For Vim version 7.0b. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 7487e62257..2f2fb757c1 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*hangulin.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index e6e3bfadb2..8bc4b31945 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.0aa. Last change: 2006 Mar 17 +*help.txt* For Vim version 7.0b. Last change: 2006 Mar 24 VIM - main help file k @@ -71,6 +71,7 @@ Editing Effectively ~ |usr_29.txt| Moving through programs |usr_30.txt| Editing programs |usr_31.txt| Exploiting the GUI +|usr_32.txt| The undo tree Tuning Vim ~ |usr_40.txt| Make new commands @@ -194,13 +195,6 @@ Standard plugins ~ |pi_zip.txt| Zip archive explorer LOCAL ADDITIONS: *local-additions* -|cecutil.txt| DrChip's Utilities Jun 11, 2004 -|engspchk.txt| English Spelling Checker (v61) Mar 14, 2005 -|example.txt| Example for a locally added help file -|matchit.txt| Extended "%" matching -|test.txt| Testing the hélp cömmånd nôw -|typecorr.txt| Plugin for correcting typing mistakes -|helpp.txt| Dummy line to avoid an error message ------------------------------------------------------------------------------ *bars* Bars example diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index 183ca30ad3..f0937d7575 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*if_cscop.txt* For Vim version 7.0b. 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 5d41b4b9ba..c8a24147e9 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*if_mzsch.txt* For Vim version 7.0b. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Sergey Khorev diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt index eff7bb2e78..2842242fc3 100644 --- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*if_ole.txt* For Vim version 7.0b. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 7308c0d369..6917bd8ef5 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*if_perl.txt* For Vim version 7.0b. 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 b0f6286164..9dd2087395 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.0aa. Last change: 2006 Jan 20 +*if_pyth.txt* For Vim version 7.0b. Last change: 2006 Jan 20 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 194b8d14d8..ceb3282aa3 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*if_ruby.txt* For Vim version 7.0b. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Shugo Maeda diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index a55c7c16fd..6f18d1207f 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index cee0370b7f..e7280c7d47 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.0aa. Last change: 2006 Mar 06 +*if_tcl.txt* For Vim version 7.0b. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Ingo Wilken diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index f26c5406c5..5805d3b520 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.0aa. Last change: 2005 Aug 30 +*indent.txt* For Vim version 7.0b. Last change: 2005 Aug 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 72fa5e3826..305d9a3c27 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 20 +*index.txt* For Vim version 7.0b. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1088,6 +1088,7 @@ The commands are sorted on the non-optional part of their name. |:cexpr| :cex[pr] read errors from expr and jump to first |:cfile| :cf[ile] read file with error messages and jump to first |:cfirst| :cfir[st] go to the specified error, default first one +|:cgetbuffer| :cgetb[uffer] get errors from buffer |:cgetexpr| :cgete[xpr] get errors from expr |:cgetfile| :cg[etfile] read file with error messages |:changes| :cha[nges] print the change list @@ -1242,6 +1243,7 @@ The commands are sorted on the non-optional part of their name. |:lexpr| :lex[pr] read locations from expr and jump to first |:lfile| :lf[ile] read file with locations and jump to first |:lfirst| :lfir[st] go to the specified location, default first one +|:lgetbuffer| :lgetb[uffer] get locations from buffer |:lgetexpr| :lgete[xpr] get locations from expr |:lgetfile| :lg[etfile] read file with locations |:lgrep| :lgr[ep] run 'grepprg' and jump to first match diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 1bf8f6dc35..2bcfe6b9bf 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0aa. Last change: 2006 Mar 21 +*insert.txt* For Vim version 7.0b. Last change: 2006 Mar 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index defc308a3c..f6011fc405 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0aa. Last change: 2006 Mar 20 +*map.txt* For Vim version 7.0b. Last change: 2006 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 54dcba8a4e..c194d6b4ad 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.0aa. Last change: 2006 Mar 05 +*mbyte.txt* For Vim version 7.0b. Last change: 2006 Mar 05 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index dad5e0d9d6..70c43d74af 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 +*message.txt* For Vim version 7.0b. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index 3045b46a1d..88edfc42c6 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 7.0aa. Last change: 2004 Feb 24 +*mlang.txt* For Vim version 7.0b. Last change: 2004 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 5570d7303f..134c492df4 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0aa. Last change: 2006 Jan 02 +*motion.txt* For Vim version 7.0b. Last change: 2006 Jan 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index 789fbbc17a..143659b248 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.0aa. Last change: 2006 Mar 09 +*netbeans.txt* For Vim version 7.0b. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ae9f517a85..801311a038 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2006 Mar 18 +*options.txt* For Vim version 7.0b. Last change: 2006 Mar 18 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index 998a5532e8..cda7b3b28d 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_390.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Ralf Schandl diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index da8b7dc43c..d799ed7984 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_beos.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 1f0b4d1b2a..9d06ba823b 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 7.0aa. Last change: 2006 Mar 09 +*os_mac.txt* For Vim version 7.0b. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar et al. diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index d84f6f5668..46c876c0de 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.0b. 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 057ef15eb5..5d00ae45a0 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_msdos.txt* For Vim version 7.0b. 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 539e0518a7..acbd42791a 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_os2.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Paul Slootman diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index 90dde33f7e..46efd461c6 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.0b. 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 77e555c57a..362329574f 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_risc.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Thomas Leonard diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 0a69e70c63..37b8e7d6e6 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.0b. 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 5a91158a0a..fbf52ad8fd 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.0aa. Last change: 2006 Mar 02 +*os_vms.txt* For Vim version 7.0b. Last change: 2006 Mar 02 VIM REFERENCE MANUAL diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index 19ecdc430b..89f284e7dd 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 7.0aa. Last change: 2002 Oct 29 +*pi_gzip.txt* For Vim version 7.0b. 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 23c634e028..86dd652ad4 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.0. Last change: Mar 21, 2006 +*pi_netrw.txt* For Vim version 7.0b. Last change: Mar 22, 2006 VIM REFERENCE MANUAL by Charles E. Campbell, Jr. @@ -365,7 +365,7 @@ Both the :Nread and the :Nwrite ex-commands can accept multiple filenames. NETRC *netrw-netrc* The typical syntax for lines in a <.netrc> file is given as shown below. -Ftp under Unix usually support <.netrc>; Windows' ftp usually doesn't. +Ftp under Unix usually supports <.netrc>; ftp under Windows usually doesn't. > machine {full machine name} login {user-id} password "{password}" default login {user-id} password "{password}" @@ -395,11 +395,12 @@ However, |netrw-listhack| can help with this problem. ============================================================================== 4. Activation *netrw-activate* -Network-oriented file transfers are available by default whenever +Network-oriented file transfers are available by default whenever Vim's |'nocompatible'| mode is enabled. The file resides in your system's vim-plugin directory and is sourced automatically whenever you bring up vim. I suggest that, at a minimum, you have at least the following in your <.vimrc> customization file: > + set nocp if version >= 600 filetype plugin indent on @@ -420,11 +421,14 @@ Thus one may use files across networks just as simply as if they were local. > See |netrw-activate| for more on how to encourage your vim to use plugins such as netrw. + ============================================================================== 6. Ex Commands *netrw-ex* -The usual read/write commands are supported. There are also a couple of -additional commands available. +The usual read/write commands are supported. There are also a few +additional commands available. Often you won't need to use Nw or +Nread as shown in |netrw-transparent| (ie. use :e url, :r url, :w url; +see |netrw-urls|). :[range]Nw Write the specified lines to the current file as specified in b:netrw_lastfile. @@ -455,7 +459,7 @@ additional commands available. strings. :NetrwSettings This command is desribed in |netrw-settings| -- used to - display netrw settings and change netrw behavior + display netrw settings and change netrw behavior. ============================================================================== @@ -1444,6 +1448,10 @@ which is loaded automatically at startup (assuming :set nocp). ============================================================================== 11. History *netrw-history* {{{1 + v83: * disabled stop-acd handling; the change in directory handling + may allow acd to be used again. Awaiting feedback. + * D was refusing to delete remote files/directories in wide + listing mode. v81: * FocusGained also used to refresh/wipe local browser directory buffers * (bugfix) netrw was leaving [Scratch] buffers behind when the diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index b8cf4dcf7f..32107f01ee 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 +*pi_paren.txt* For Vim version 7.0b. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index 567ecf1083..c246037c61 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,6 @@ -*tar.txt* Tar File Interface Dec 21, 2005 +*tar.txt* For Vim version 7.0b. Last change: 2006 Mar 24 + + Tar File Interface Author: Charles E. Campbell, Jr. (remove NOSPAM from Campbell's email first) diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index 040ed045e5..ebd3b82393 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,6 @@ -*zip.txt* Zip File Interface Mar 22, 2006 +*zip.txt* For Vim version 7.0b. Last change: 2006 Mar 24 + + Zip File Interface Author: Charles E. Campbell, Jr. (remove NOSPAM from Campbell's email first) diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 56fa49fab9..9741324fc9 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.0aa. Last change: 2005 Apr 01 +*print.txt* For Vim version 7.0b. Last change: 2005 Apr 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index c5f0c76f64..5fac446daf 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0aa. Last change: 2006 Mar 23 +*quickref.txt* For Vim version 7.0b. Last change: 2006 Mar 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index d6efe640b5..485369797e 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.0aa. Last change: 2005 Dec 12 +*recover.txt* For Vim version 7.0b. Last change: 2005 Dec 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index b83dc54fe7..db2c584366 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 7.0aa. Last change: 2005 Apr 04 +*rileft.txt* For Vim version 7.0b. Last change: 2005 Apr 04 VIM REFERENCE MANUAL by Avner Lottem diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index 4d9d0368ec..c78e043138 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 7.0aa. Last change: 2005 Apr 01 +*russian.txt* For Vim version 7.0b. Last change: 2005 Apr 01 VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index adeb7fc0f6..1e68f78ce9 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.0aa. Last change: 2005 Apr 04 +*sign.txt* For Vim version 7.0b. Last change: 2005 Apr 04 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 766c3d8c0a..8e4011dec0 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 +*sponsor.txt* For Vim version 7.0b. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7,13 +7,13 @@ SPONSOR VIM DEVELOPMENT *sponsor* -Fixing bugs and adding new features takes a lot of effort. For a few years -Bram has attempted to do this next to a full-time job. During that time the -todo list kept getting longer and longer. +Fixing bugs and adding new features takes a lot of time and effort. To show +your appreciation for the work and motivate Bram and others to continue +working on Vim please send a donation. -In order for Bram to support Vim properly he needs your support. Through your -donations Bram will be able to have a part-time job and spend more time on -fixing bugs and adding new features. +Since Bram is back to a paid job the money will now be used to help children +in Uganda. See |uganda|. But at the same time donations increase Bram's +motivation to work on Vim! For the most recent information about sponsoring look on the Vim web site: @@ -58,7 +58,7 @@ But only if you enable this on your account page. HOW TO SEND MONEY *send-money* -Creditcard Through PayPal, see the PayPal site for information: +Credit card Through PayPal, see the PayPal site for information: https://www.paypal.com The e-mail address for sending sponsorship money is: donate@vim.org @@ -68,15 +68,7 @@ Creditcard Through PayPal, see the PayPal site for information: In Euro countries a bank transfer is preferred, this has lower costs. -Bank transfer Transfer to Bram's account at the Postbank: 1644503. For - international transfers you can use these numbers: - IBAN: NL79 PSTB 0001 6445 03 - SWIFT/BIC: PSTBNL21 - This is the address of the bank: - ING Bank Amsterdam, Foreign Operations - PO Box 1800 - 1000 BV Amsterdam - The Netherlands +Other methods See |iccf-donations|. Include "Vim sponsor" or "Vim registration" in the comment of your money transfer. Send me an e-mail that mentions the amount you transferred if you want to vote for features and @@ -88,37 +80,26 @@ Cash Small amounts can be send with ordinary mail. Put something features and show others you are a registered Vim user or sponsor. -This is Bram's address: Bram Moolenaar - Clematisstraat 30 - 5925 BE Venlo +You can use this permanent address: + Bram Moolenaar + Molenstraat 2 + 2161 HP Lisse The Netherlands -ALTERNATIVE - -If you don't care about sponsoring Vim Development or becoming a registered -Vim user, but do care about helping needy children, consider giving to the -ICCF Holland foundation. This is the charity recommended by Vim's author. -The money is used for a children centre in the south of Uganda, where AIDS has -caused many victims. See |uganda|. - QUESTIONS AND ANSWERS *sponsor-faq* *register-faq* Why should I give money? -Bram has tried to work on Vim next to a full-time job. The list of known bugs -and ideas for new features has constantly been growing during this time. Bram -simply can't spend enough time on Vim development when he has a full-time job. -Your contribution will make it possible for Bram to have a part-time job and -spend much more time on Vim development. Bugs will be fixed quicker and new -Vim releases will become available more often. +If you do not show your appreciation for Vim then Bram will be less motivated +to fix bugs and add new features. How much money should I send? -That is up to you. The more you give, the more time Bram can work on Vim. An -indication for individuals that use Vim at home: 10 Euro per year. For +That is up to you. The more you give, the more children will be helped. +An indication for individuals that use Vim at home: 10 Euro per year. For professional use: 30 Euro per year per person. Send at least 10 euro to be able to vote for features. @@ -198,33 +179,30 @@ sent money. The points will be counted right away. How about Charityware? -You have to decide yourself whether you want to sponsor Vim development, help -the poor children in Uganda (see |uganda|) or both. Bram will certainly keep -on supporting the project in Uganda. In the (unlikely) situation that Bram -gets more donations for Vim development than he needs, he will send the money -to Uganda. +Currently the Vim donations go to |uganda| anyway. Thus it doesn't matter if +you sponsor Vim or ICCF. Except that Vim sponsoring will allow you to vote +for features. I donated $$$, now please add feature XYZ! There is no direct relation between your donation and the work Bram does. -Otherwise you would be paying for work and Bram has to pay income tax over the +Otherwise you would be paying for work and we would have to pay tax over the donation. If you want to hire Bram for specific work, contact him directly, don't use the donation system. -Are the donations tax deductable? +Are the donations tax deductible? -No. Setting up a system for this is complex and imposes too many restrictions. -The donations to help the children in |Uganda| are tax deductable in Holland, -Germany, Canada and probably also in the USA. +That depends on your country. The donations to help the children in |Uganda| +are tax deductible in Holland, Germany, Canada and in the USA. See the ICCF +website http://www.iccf.nl/donate.html. You must send an e-mail to Bram to +let him know that the donation is done because of the use of Vim. Can you send me a bill? -Sending a bill would mean Bram does something in return for your contribution. -That is work and would mean Bram has to pay income tax over the amount. It is -possible, but the net amount will be lower. +No. But a receipt is possible. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 5c7c2ed2f6..d6b32994ea 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.0aa. Last change: 2006 Mar 03 +*tabpage.txt* For Vim version 7.0b. Last change: 2006 Mar 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tags b/runtime/doc/tags index 5a8086f0ce..6629dab82e 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1609,6 +1609,9 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 31.3 usr_31.txt /*31.3* 31.4 usr_31.txt /*31.4* 31.5 usr_31.txt /*31.5* +32.1 usr_32.txt /*32.1* +32.2 usr_32.txt /*32.2* +32.3 usr_32.txt /*32.3* 40.1 usr_40.txt /*40.1* 40.2 usr_40.txt /*40.2* 40.3 usr_40.txt /*40.3* @@ -5803,6 +5806,7 @@ i` motion.txt /*i`* ia64.vim syntax.txt /*ia64.vim* ib motion.txt /*ib* iccf uganda.txt /*iccf* +iccf-donations uganda.txt /*iccf-donations* icon-changed version4.txt /*icon-changed* iconise starting.txt /*iconise* iconize starting.txt /*iconize* @@ -7352,6 +7356,7 @@ usr_28.txt usr_28.txt /*usr_28.txt* usr_29.txt usr_29.txt /*usr_29.txt* usr_30.txt usr_30.txt /*usr_30.txt* usr_31.txt usr_31.txt /*usr_31.txt* +usr_32.txt usr_32.txt /*usr_32.txt* usr_40.txt usr_40.txt /*usr_40.txt* usr_41.txt usr_41.txt /*usr_41.txt* usr_42.txt usr_42.txt /*usr_42.txt* diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index b0a4bd8869..da60776651 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.0aa. Last change: 2006 Feb 14 +*term.txt* For Vim version 7.0b. Last change: 2006 Feb 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index e3a62fba5d..6563e261fb 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.0aa. Last change: 2006 Mar 01 +*tips.txt* For Vim version 7.0b. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/uganda.nsis.txt b/runtime/doc/uganda.nsis.txt new file mode 100644 index 0000000000..21b0a48e50 --- /dev/null +++ b/runtime/doc/uganda.nsis.txt @@ -0,0 +1,292 @@ + For Vim version 7.0b. Last change: 2006 Mar 24 + + VIM REFERENCE MANUAL by Bram Moolenaar + +SUMMARY + +Vim is Charityware. You can use and copy it as much as you like, but you are +encouraged to make a donation for needy children in Uganda. Please see |kcc| +below or visit the ICCF web site, available at these URLs: + + http://iccf-holland.org/ + http://www.vim.org/iccf/ + +You can also sponsor the development of Vim. Vim sponsors can vote for +features. See |sponsor|. The money goes to Uganda anyway. + +The Open Publication License applies to the Vim documentation, see +|manual-copyright|. + +=== begin of license === + +VIM LICENSE + +I) There are no restrictions on distributing unmodified copies of Vim except + that they must include this license text. You can also distribute + unmodified parts of Vim, likewise unrestricted except that they must + include this license text. You are also allowed to include executables + that you made from the unmodified Vim sources, plus your own usage + examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, + including executables and/or source code, when the following four + conditions are met: + 1) This license text must be included unmodified. + 2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. + 3) A message must be added, at least in the output of the ":version" + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. + 4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred way to do this is + by e-mail or by uploading the files to a server and e-mailing the URL. + If the number of changes is small (e.g., a modified Makefile) e-mailing a + context diff will do. The e-mail address to be used is + + +IV) It is not allowed to remove this license from the distribution of the Vim + sources, parts of it or from a modified version. You may use this + license for previous Vim releases instead of the license that they came + with, at your option. + +=== end of license === + +Note: + +- If you are happy with Vim, please express that by reading the rest of this + file and consider helping needy children in Uganda. + +- If you want to support further Vim development consider becoming a + |sponsor|. The money goes to Uganda anyway. + +- According to Richard Stallman the Vim license is GNU GPL compatible. + A few minor changes have been made since he checked it, but that should not + make a difference. + +- If you link Vim with a library that goes under the GNU GPL, this limits + further distribution to the GNU GPL. Also when you didn't actually change + anything in Vim. + +- Once a change is included that goes under the GNU GPL, this forces all + further changes to also be made under the GNU GPL or a compatible license. + +- If you distribute a modified version of Vim, you can include your name and + contact information with the "--with-modified-by" configure argument or the + MODIFIED_BY define. + +============================================================================== +Kibaale Children's Centre + +Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the +south of Uganda, near Tanzania, in East Africa. The area is known as Rakai +District. The population is mostly farmers. Although people are poor, there +is enough food. But this district is suffering from AIDS more than any other +part of the world. Some say that it started there. Estimations are that 10 +to 30% of the Ugandans are infected with HIV. Because parents die, there are +many orphans. In this district about 60,000 children have lost one or both +parents, out of a population of 350,000. And this is still continuing. + +The children need a lot of help. The KCC is working hard to provide the needy +with food, medical care and education. Food and medical care to keep them +healthy now, and education so that they can take care of themselves in the +future. KCC works on a Christian base, but help is given to children of any +religion. + +The key to solving the problems in this area is education. This has been +neglected in the past years with president Idi Amin and the following civil +wars. Now that the government is stable again, the children and parents have +to learn how to take care of themselves and how to avoid infections. There is +also help for people who are ill and hungry, but the primary goal is to +prevent people from getting ill and to teach them how to grow healthy food. + +Most of the orphans are living in an extended family. An uncle or older +sister is taking care of them. Because these families are big and the income +(if any) is low, a child is lucky if it gets healthy food. Clothes, medical +care and schooling is beyond its reach. To help these needy children, a +sponsorship program was put into place. A child can be financially adopted. +For a few dollars a month KCC sees to it that the child gets indispensable +items, is healthy, goes to school and KCC takes care of anything else that +needs to be done for the child and the family that supports it. + +Besides helping the child directly, the environment where the child grows up +needs to be improved. KCC helps schools to improve their teaching methods. +There is a demonstration school at the centre and teacher trainings are given. +Health workers are being trained, hygiene education is carried out and +households are stimulated to build a proper latrine. I helped setting up a +production site for cement slabs. These are used to build a good latrine. +They are sold below cost price. + +There is a small clinic at the project, which provides children and their +family with medical help. When needed, transport to a hospital is offered. +Immunization programs are carried out and help is provided when an epidemic is +breaking out (measles and cholera have been a problem). + +Summer 1994 to summer 1995 I spent a whole year at the centre, working as a +volunteer. I have helped to expand the centre and worked in the area of water +and sanitation. I learned that the help that the KCC provides really helps. +Now that I'm back in Holland, I would like to continue supporting KCC. To do +this I'm raising funds and organizing the sponsorship program. Please +consider one of these possibilities: + +1. Sponsor a child in primary school: 17 euro a month (or more). +2. Sponsor a child in secondary school: 25 euro a month (or more). +3. Sponsor the clinic: Any amount a month or quarter +4. A one-time donation + +Compared with other organizations that do child sponsorship the amounts are +very low. This is because the money goes directly to the centre. Less than +5% is used for administration. This is possible because this is a small +organization that works with volunteers. If you would like to sponsor a +child, you should have the intention to do this for at least one year. + +How do you know that the money will be spent right? First of all you have my +personal guarantee as the author of Vim. I trust the people that are working +at the centre, I know them personally. Further more, the centre is +co-sponsored and inspected by World Vision, Save the Children Fund and +International Child Care Fund. The centre is visited about once a year to +check the progress (at our own cost). I have visited the centre myself in +1996, 1998, 2000, 2001 and 2003. The visit reports are on the ICCF web site. + +If you have any further questions, send me e-mail: . + +The address of the centre is: + Kibaale Children's Centre + p.o. box 1658 + Masaka, Uganda, East Africa + +Sending money: + +Check the ICCF web site for the latest information! See |iccf| for the URL. + +USA: The methods mentioned below can be used. Alternatively, you + can send a check to the Nehemiah Group Outreach Society + (NGOS). This will reduce banking costs and you can get an IRS + tax receipt. The NGOS forwards the funds directly to the + Kibaale project in Uganda. Checks must be made payable to + NGOS but please note on the check "donation Kibaale". Mail + checks to: + NGOS + P.O. Box 50862 + Indianapolis, IN 45250 + Questions regarding the Nehemiah Group Outreach Society (NGOS) + should be directed to: Ross deMerchant, Executive Director - + r.demerchant AT sbcglobal DOT net. + For sponsoring a child contact KCF in Canada (see below) and + send the check to NGOS in Indianapolis. + +Canada: Contact Kibaale Children's Fund (KCF) in Surrey, Canada. They + take care of the Canadian sponsors for the children in + Kibaale. KCF forwards 100% of the money to the project in + Uganda. You can send them a one time donation directly. + Please send me a note so that I know what has been donated + because of Vim. Ask KCF for information about sponsorship. + Kibaale Children's Fund c/o Pacific Academy + 10238-168 Street + Surrey, B.C. V4N 1Z4 + Canada + Phone: 604-581-5353 + If you make a donation to Kibaale Children's Fund (KCF) you + will receive a tax receipt which can be submitted with your + tax return. + +Holland: Transfer to the account of "Stichting ICCF Holland" in Venlo. + This will allow for tax deduction if you live in Holland. + Postbank, nr. 4548774 + +Germany: It is possible to make donations that allow for a tax return. + Check the ICCF web site for the latest information: + http://iccf-holland.org/germany.html + +World: Use a postal money order. That should be possible from any + country, mostly from the post office. Use this name (which is + in my passport): "Abraham Moolenaar". Use Euro for the + currency if possible. + +Europe: Use a bank transfer if possible. Your bank should have a form + that you can use for this. See "Others" below for the swift + code and IBAN number. + Any other method should work. Ask for information about + sponsorship. + +Credit Card: You can use PayPal to send money with a Credit card. This is + the most widely used Internet based payment system. It's + really simple to use. Use this link to fin