Mercurial > vim
changeset 874:4bac29d27e2f v7.0
updated for version 7.0
line wrap: on
line diff
--- a/Contents +++ b/Contents @@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX t messages, shows current file name in window title, on-line help, rectangular cut/paste, etc., etc., etc... - Version 7.0g. Also runs under UNIX, MSDOS and other systems. - vim70grt.tgz contains the documentation and syntax files. - vim70gbin.tgz contains the binaries. - vim70gsrc.tgz contains the sources. + Version 7.0. Also runs under UNIX, MSDOS and other systems. + vim70rt.tgz contains the documentation and syntax files. + vim70bin.tgz contains the binaries. + vim70src.tgz contains the sources. Author: Bram Moolenaar et al.
--- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ all install uninstall tools config confi # Before creating an archive first delete all backup files, *.orig, etc. MAJOR = 7 -MINOR = 0g +MINOR = 0 # Uncomment this line if the Win32s version is to be included. DOSBIN_S = dosbin_s
--- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt for version 7.0g of Vim: Vi IMproved. +README.txt for version 7.0 of Vim: Vi IMproved. WHAT IS VIM
--- a/README_ami.txt +++ b/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 7.0g of Vim: Vi IMproved. +README_ami.txt for version 7.0 of Vim: Vi IMproved. This file explains the installation of Vim on Amiga systems. See README.txt for general information about Vim.
--- a/README_amibin.txt +++ b/README_amibin.txt @@ -1,4 +1,4 @@ -README_amibin.txt for version 7.0g of Vim: Vi IMproved. +README_amibin.txt for version 7.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga.
--- a/README_amisrc.txt +++ b/README_amisrc.txt @@ -1,4 +1,4 @@ -README_amisrc.txt for version 7.0g of Vim: Vi IMproved. +README_amisrc.txt for version 7.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga.
--- a/README_bindos.txt +++ b/README_bindos.txt @@ -1,19 +1,19 @@ -README_bindos.txt for version 7.0g of Vim: Vi IMproved. +README_bindos.txt for version 7.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. -These files are in the runtime archive (vim60rt.zip). +These files are in the runtime archive (vim70rt.zip). There are several binary distributions of Vim for the PC. You would normally pick only one of them, but it's also possible to install several. These ones are available (the version number may differ): - vim60d16.zip 16 bit DOS version - vim60d32.zip 32 bit DOS version - vim60w32.zip Windows 95/98/NT/etc. console version - gvim60.zip Windows 95/98/NT/etc. GUI version - gvim60ole.zip Windows 95/98/NT/etc. GUI version with OLE - gvim60_s.zip Windows 3.1 GUI version + vim70d16.zip 16 bit DOS version + vim70d32.zip 32 bit DOS version + vim70w32.zip Windows 95/98/NT/etc. console version + gvim70.zip Windows 95/98/NT/etc. GUI version + gvim70ole.zip Windows 95/98/NT/etc. GUI version with OLE + gvim70_s.zip Windows 3.1 GUI version -You MUST also get the runtime archive (vim60rt.zip). -The sources are also available (vim60src.zip). +You MUST also get the runtime archive (vim70rt.zip). +The sources are also available (vim70src.zip).
--- a/README_dos.txt +++ b/README_dos.txt @@ -1,4 +1,4 @@ -README_dos.txt for version 7.0g of Vim: Vi IMproved. +README_dos.txt for version 7.0 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. @@ -47,13 +47,13 @@ 1. Go to the directory where you want to Binary and runtime Vim archives are normally unpacked in the same location, on top of each other. -2. Unpack the zip archives. This will create a new directory "vim\vim60", +2. Unpack the zip archives. This will create a new directory "vim\vim70", in which all the distributed Vim files are placed. Since the directory name includes the version number, it is unlikely that you overwrite existing files. Examples: - pkunzip -d gvim60.zip - unzip vim60w32.zip + pkunzip -d gvim70.zip + unzip vim70w32.zip You need to unpack the runtime archive and at least one of the binary archives. When using more than one binary version, be careful not to @@ -69,7 +69,7 @@ 2. Unpack the zip archives. This will c archive and follow the instructions in the documentation. 3. Change to the new directory: - cd vim\vim60 + cd vim\vim70 Run the "install.exe" program. It will ask you a number of questions about how you would like to have your Vim setup. Among these are: - You can tell it to write a "_vimrc" file with your preferences in the @@ -80,8 +80,8 @@ 3. Change to the new directory: console or in a shell. You can select one of the directories in your $PATH. If you skip this, you can add Vim to the search path manually: The simplest is to add a line to your autoexec.bat. Examples: - set path=%path%;C:\vim\vim60 - set path=%path%;D:\editors\vim\vim60 + set path=%path%;C:\vim\vim70 + set path=%path%;D:\editors\vim\vim70 - Create entries for Vim on the desktop and in the Start menu. That's it! @@ -94,7 +94,7 @@ Remarks: point to the top directory of your Vim files. Example: set VIM=C:\editors\vim Vim version 6.0 will look for your vimrc file in $VIM, and for the runtime - files in $VIM/vim60. See ":help $VIM" for more information. + files in $VIM/vim70. See ":help $VIM" for more information. - To avoid confusion between distributed files of different versions and your own modified vim scripts, it is recommended to use this directory layout: @@ -105,14 +105,14 @@ Remarks: C:\vim\vimfiles\ftplugin\*.vim Filetype plugins C:\vim\... Other files you made. Distributed files: - C:\vim\vim60\vim.exe The Vim version 6.0 executable. - C:\vim\vim60\doc\*.txt The version 6.0 documentation files. - C:\vim\vim60\bugreport.vim A Vim version 6.0 script. - C:\vim\vim60\... Other version 6.0 distributed files. + C:\vim\vim70\vim.exe The Vim version 6.0 executable. + C:\vim\vim70\doc\*.txt The version 6.0 documentation files. + C:\vim\vim70\bugreport.vim A Vim version 6.0 script. + C:\vim\vim70\... Other version 6.0 distributed files. In this case the $VIM environment variable would be set like this: set VIM=C:\vim - Then $VIMRUNTIME will automatically be set to "$VIM\vim60". Don't add - "vim60" to $VIM, that won't work. + Then $VIMRUNTIME will automatically be set to "$VIM\vim70". Don't add + "vim70" to $VIM, that won't work. - You can put your Vim executable anywhere else. If the executable is not with the other Vim files, you should set $VIM. The simplest is to add a line @@ -136,8 +136,8 @@ Remarks: Select Properties. 5. In the Program tab, change the "Cmdline" to add "/c" and the name of the Vim executable. Examples: - C:\command.com /c C:\vim\vim60\vim.exe - C:\command.com /c D:\editors\vim\vim60\vim.exe + C:\command.com /c C:\vim\vim70\vim.exe + C:\command.com /c D:\editors\vim\vim70\vim.exe 6. Select the font, window size, etc. that you like. If this isn't possible, select "Advanced" in the Program tab, and deselect "MS-DOS mode".
--- a/README_extra.txt +++ b/README_extra.txt @@ -1,17 +1,17 @@ -README_extra.txt for version 7.0g of Vim: Vi IMproved. +README_extra.txt for version 7.0 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. +(vim-7.0-src.tar.gz). The extra archive is useless without it. For more information, see the "README.txt" file that comes with the runtime -archive (vim-6.0-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive (vim-7.0-rt.tar.gz). To be able to run Vim you MUST get the runtime archive too! The extra archive plus the source and runtime achives make up the complete sources of Vim for all systems. -The extra archive contains: +Some of the things that the extra archive contains: Farsi Files for the Farsi (persian) language. If you don't know what Farsi is, this is not for you. @@ -19,7 +19,6 @@ Farsi Files for the Farsi (persian) lan if_sniff Interface to SNiFF. If you don't know what SNiFF is, this is not for you. -gui_amiga os_amiga Files for the Amiga port. gui_riscos @@ -45,7 +44,8 @@ os_w32 os_win32 Files for the Win32 port. gui_w32 Files for the Win32 GUI. -Gvim_vc.mak MS Visual C++ makefile for the Win32 GUI. +gui_w48 Files for the Win32 and Win16 GUI. +Make_mvc.mak MS Visual C++ makefile for the Win32 GUI. rgb.txt File with color definitions for the Win32 GUI. if_ole OLE automation interface, for MS Windows 95 and NT.
--- a/README_lang.txt +++ b/README_lang.txt @@ -1,4 +1,4 @@ -README_lang.txt for version 7.0g of Vim: Vi IMproved. +README_lang.txt for version 7.0 of Vim: Vi IMproved. This file contains files for non-English languages: - Translated messages.
--- a/README_mac.txt +++ b/README_mac.txt @@ -1,4 +1,4 @@ -README_mac.txt for version 7.0g of Vim: Vi IMproved. +README_mac.txt for version 7.0 of Vim: Vi IMproved. This file explains the installation of Vim on Macintosh systems. See "README.txt" for general information about Vim.
--- a/README_ole.txt +++ b/README_ole.txt @@ -1,4 +1,4 @@ -README_ole.txt for version 7.0g of Vim: Vi IMproved. +README_ole.txt for version 7.0 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
--- a/README_os2.txt +++ b/README_os2.txt @@ -1,4 +1,4 @@ -README_os2.txt for version 7.0g of Vim: Vi IMproved. +README_os2.txt for version 7.0 of Vim: Vi IMproved. This file explains the installation of Vim on OS/2 systems. See "README.txt" for general information about Vim.
--- a/README_os390.txt +++ b/README_os390.txt @@ -1,4 +1,4 @@ -README_os_390.txt for version 7.0g of Vim: Vi IMproved. +README_os_390.txt for version 7.0 of Vim: Vi IMproved. Welcome to the OS/390 Unix port of VIM.
--- a/README_src.txt +++ b/README_src.txt @@ -1,10 +1,10 @@ -README_src.txt for version 7.0g of Vim: Vi IMproved. +README_src.txt for version 7.0 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 -systems in combination with the extra archive (vim-6.0-extra.tar.gz, in the +systems in combination with the extra archive (vim-7.0-extra.tar.gz, in the "extra" directory of ftp.vim.org). For more information, see the README.txt file that comes with the runtime -archive (vim-6.0-rt.tar.gz). To be able to run Vim you MUST get the runtime +archive (vim-7.0-rt.tar.gz). To be able to run Vim you MUST get the runtime archive too!
--- a/README_srcdos.txt +++ b/README_srcdos.txt @@ -1,8 +1,8 @@ -README_srcdos.txt for version 7.0g of Vim: Vi IMproved. +README_srcdos.txt for version 7.0 of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. -These files are in the runtime archive (vim60rt.zip). +These files are in the runtime archive (vim70rt.zip). The DOS source archive contains the files needed to compile Vim on MS-DOS or
--- a/README_unix.txt +++ b/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 7.0g of Vim: Vi IMproved. +README_unix.txt for version 7.0 of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim.
--- a/README_vms.txt +++ b/README_vms.txt @@ -1,4 +1,4 @@ -README_vms.txt for version 7.0g of Vim: Vi IMproved. +README_vms.txt for version 7.0 of Vim: Vi IMproved. This file explains the installation of Vim on VMS systems. See "README.txt" in the runtime archive for information about Vim.
--- a/README_w32s.txt +++ b/README_w32s.txt @@ -1,4 +1,4 @@ -README_w32s.txt for version 7.0g of Vim: Vi IMproved. +README_w32s.txt for version 7.0 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.
--- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -22,7 +22,7 @@ !define HAVE_NLS !define VER_MAJOR 7 -!define VER_MINOR 0g +!define VER_MINOR 0 # ----------- No configurable settings below this line -----------
--- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli
--- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0g. Last change: 2006 May 06 +*autocmd.txt* For Vim version 7.0. Last change: 2006 May 06 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0g. Last change: 2006 May 05 +*change.txt* For Vim version 7.0. Last change: 2006 May 05 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*cmdline.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.0g. Last change: 2006 May 01 +*debug.txt* For Vim version 7.0. Last change: 2006 May 01 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*debugger.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur
--- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.0g. Last change: 2006 Mar 09 +*develop.txt* For Vim version 7.0. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.0g. Last change: 2006 Apr 14 +*diff.txt* For Vim version 7.0. Last change: 2006 Apr 14 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.0g. Last change: 2006 Apr 25 +*digraph.txt* For Vim version 7.0. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*editing.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0g. Last change: 2006 May 06 +*eval.txt* For Vim version 7.0. Last change: 2006 May 06 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -1,4 +1,4 @@ -*farsi.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*farsi.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran
--- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.0g. Last change: 2006 Apr 28 +*filetype.txt* For Vim version 7.0. Last change: 2006 Apr 28 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.0g. Last change: 2006 Mar 29 +*fold.txt* For Vim version 7.0. Last change: 2006 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/getscript.txt +++ b/runtime/doc/getscript.txt @@ -1,4 +1,4 @@ -*getscript.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*getscript.txt* For Vim version 7.0. Last change: 2006 Apr 30 Get the Latest VimScripts
--- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0g. Last change: 2006 May 04 +*gui.txt* For Vim version 7.0. Last change: 2006 May 04 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*gui_w32.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*gui_x11.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 7.0g. Last change: 2006 Apr 02 +*hangulin.txt* For Vim version 7.0. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam
--- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* For Vim version 7.0g. Last change: 2003 May 11 +*hebrew.txt* For Vim version 7.0. Last change: 2003 May 11 VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem)
--- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.0g. Last change: 2006 May 05 +*help.txt* For Vim version 7.0. Last change: 2006 May 07 VIM - main help file k @@ -13,7 +13,7 @@ Jump to a subject: Position the cursor Jump back: Type CTRL-T or CTRL-O (repeat to go further back). Get specific help: It is possible to go directly to whatever you want help - on, by giving an argument to the ":help" command |:help|. + on, by giving an argument to the |:help| command. It is possible to further specify the context: *help-context* WHAT PREPEND EXAMPLE ~ @@ -196,18 +196,6 @@ Standard plugins ~ |pi_zip.txt| Zip archive explorer LOCAL ADDITIONS: *local-additions* -|cecutil.txt| DrChip's Utilities Jun 11, 2004 -|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 -|cecutil.txt| DrChip's Utilities Jun 11, 2004 -|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
--- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -1,4 +1,4 @@ -*howto.txt* For Vim version 7.0g. Last change: 2006 Apr 02 +*howto.txt* For Vim version 7.0. Last change: 2006 Apr 02 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*if_cscop.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Andy Kahn
--- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*if_mzsch.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Sergey Khorev
--- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*if_ole.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Paul Moore
--- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.0g. Last change: 2006 Mar 06 +*if_perl.txt* For Vim version 7.0. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Sven Verdoolaege
--- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*if_pyth.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Paul Moore
--- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*if_ruby.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Shugo Maeda
--- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL
--- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.0g. Last change: 2006 Mar 06 +*if_tcl.txt* For Vim version 7.0. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Ingo Wilken
--- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*indent.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*index.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0g. Last change: 2006 May 05 +*insert.txt* For Vim version 7.0. Last change: 2006 May 05 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.0g. Last change: 2006 Apr 20 +*intro.txt* For Vim version 7.0. Last change: 2006 Apr 20 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0g. Last change: 2006 May 03 +*map.txt* For Vim version 7.0. Last change: 2006 May 03 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*mbyte.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar et al.
--- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*message.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 7.0g. Last change: 2004 Feb 24 +*mlang.txt* For Vim version 7.0. Last change: 2004 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*motion.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.0g. Last change: 2006 Mar 09 +*netbeans.txt* For Vim version 7.0. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Gordon Prieur
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0g. Last change: 2006 May 04 +*options.txt* For Vim version 7.0. Last change: 2006 May 04 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_390.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Ralf Schandl
--- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_amiga.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_beos.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -1,4 +1,4 @@ -*os_dos.txt* For Vim version 7.0g. Last change: 2006 Mar 30 +*os_dos.txt* For Vim version 7.0. Last change: 2006 Mar 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*os_mac.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar et al.
--- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Jens M. Felderhoff
--- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_msdos.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_os2.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Paul Slootman
--- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Julian Kinraid
--- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_risc.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Thomas Leonard
--- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.0g. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.0. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*os_vms.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL
--- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -1,4 +1,4 @@ -*os_win32.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*os_win32.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by George Reilly
--- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*pattern.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 7.0g. Last change: 2002 Oct 29 +*pi_gzip.txt* For Vim version 7.0. Last change: 2002 Oct 29 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.0g. Last change: 2006 May 02 +*pi_netrw.txt* For Vim version 7.0. Last change: 2006 May 02 NETRW REFERENCE MANUAL by Charles E. Campbell, Jr.
--- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*pi_paren.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -1,4 +1,4 @@ -*pi_spec.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*pi_spec.txt* For Vim version 7.0. Last change: 2006 Apr 24 by Gustavo Niemeyer ~
--- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*pi_tar.txt* For Vim version 7.0g. Last change: 2006 May 02 +*pi_tar.txt* For Vim version 7.0. Last change: 2006 May 02 +====================+ | Tar File Interface |
--- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -1,4 +1,4 @@ -*pi_vimball.txt* For Vim version 7.0g. Last change: 2006 May 01 +*pi_vimball.txt* For Vim version 7.0. Last change: 2006 May 01 ---------------- Vimball Archiver
--- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*pi_zip.txt* For Vim version 7.0g. Last change: 2006 May 01 +*pi_zip.txt* For Vim version 7.0. Last change: 2006 May 01 +====================+ | Zip File Interface |
--- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*print.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*quickfix.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*quickref.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*quotes.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*recover.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -1,4 +1,4 @@ -*remote.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*remote.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*repeat.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*rileft.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Avner Lottem
--- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*russian.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Vassily Ragosin
--- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*scroll.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*sign.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Gordon Prieur
--- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*spell.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*sponsor.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/sql.txt +++ b/runtime/doc/sql.txt @@ -1,4 +1,4 @@ -*sql.txt* For Vim version 7.0g. Last change: Wed Apr 26 2006 3:05:33 PM +*sql.txt* For Vim version 7.0. Last change: Wed Apr 26 2006 3:05:33 PM by David Fishburn
--- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0g. Last change: 2006 Apr 25 +*starting.txt* For Vim version 7.0. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*syntax.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.0g. Last change: 2006 May 02 +*tabpage.txt* For Vim version 7.0. Last change: 2006 May 02 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5641,7 +5641,6 @@ hebrew hebrew.txt /*hebrew* hebrew.txt hebrew.txt /*hebrew.txt* help various.txt /*help* help-context help.txt /*help-context* -help-tags tags 1 help-translated various.txt /*help-translated* help-xterm-window various.txt /*help-xterm-window* help.txt help.txt /*help.txt*
--- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*tagsrch.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*term.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*tips.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0g. Last change: 2006 May 06 +*todo.txt* For Vim version 7.0. Last change: 2006 May 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,8 +30,8 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -Test 61 fails sometimes. This is a timing problem with "sleep 2" not always -taking 2 seconds. +Test 61 fails sometimes. This is a timing problem: "sleep 2" sometimes takes +longer than 2 seconds. Awaiting updated patches: @@ -213,6 +213,9 @@ Win32 GUI known bugs: the screen. 8 On Windows 98 the unicows library is needed to support functions with UCS2 file names. Can we load unicows.dll dynamically? +8 When the primary monitor is below or right of the secondary monitor and + Vim is on the secondary monitor it will often move to the primary monitor. + Window position coordinates can be negative. (James Harvey) 8 The -P argument doesn't work very well with many MDI applications. The last argument of CreateWindowEx() should be used, see MSDN docs. Tutorial: http://win32assembly.online.fr/tut32.html
deleted file mode 100644 --- a/runtime/doc/uganda.nsis.txt +++ /dev/null @@ -1,292 +0,0 @@ - For Vim version 7.0g. Last change: 2006 Apr 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 <Bram@vim.org>. 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 - <maintainer@vim.org> - -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: <Bram@vim.org>. - -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 find more info: - https://www.paypal.com/affil/pal=Bram%40iccf-holland.org - The e-mail address for sending the money to is: - Bram@iccf-holland.org - For amounts above 400 Euro ($500) sending a check is - preferred. - -Others: Transfer to one of these accounts if possible: - Postbank, account 4548774 - Swift code: INGB NL 2A - IBAN: NL47 PSTB 0004 5487 74 - under the name "stichting ICCF Holland", Venlo - If that doesn't work: - Rabobank Venlo, account 3765.05.117 - Swift code: RABO NL 2U - under the name "Bram Moolenaar", Venlo - Otherwise, send a check in euro or US dollars to the address - below. Minimal amount: $70 (my bank does not accept smaller - amounts for foreign check, sorry) - -Address to send checks to: - stichting ICCF Holland - Bram Moolenaar - Molenstraat 2 - 2161 HP Lisse - The Netherlands - -This address is expected to be valid for a long time. The address in Venlo -will not be valid after June 2006. - - ts=8:ft=help:norl:
--- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*uganda.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*undo.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_01.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_02.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -1,4 +1,4 @@ -*usr_03.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_03.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -1,4 +1,4 @@ -*usr_04.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_04.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_05.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -1,4 +1,4 @@ -*usr_06.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_06.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -1,4 +1,4 @@ -*usr_07.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_07.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -1,4 +1,4 @@ -*usr_08.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*usr_08.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -1,4 +1,4 @@ -*usr_09.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_09.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -1,4 +1,4 @@ -*usr_10.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_10.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_11.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -1,4 +1,4 @@ -*usr_12.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_12.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -1,4 +1,4 @@ -*usr_20.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_20.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.0g. Last change: 2006 Apr 25 +*usr_21.txt* For Vim version 7.0. Last change: 2006 Apr 25 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_22.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_23.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_24.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_25.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -1,4 +1,4 @@ -*usr_26.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_26.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_27.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_28.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_29.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -1,4 +1,4 @@ -*usr_30.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_30.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -1,4 +1,4 @@ -*usr_31.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_31.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -1,4 +1,4 @@ -*usr_32.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*usr_32.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_40.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*usr_41.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -1,4 +1,4 @@ -*usr_42.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_42.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_43.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -1,4 +1,4 @@ -*usr_44.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_44.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_45.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_90.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*usr_toc.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar
--- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0g. Last change: 2006 Apr 25 +*various.txt* For Vim version 7.0. Last change: 2006 Apr 25 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*version4.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*version5.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 7.0g. Last change: 2006 Apr 30 +*version6.txt* For Vim version 7.0. Last change: 2006 Apr 30 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0g. Last change: 2006 May 06 +*version7.txt* For Vim version 7.0. Last change: 2006 May 07 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2965,5 +2965,8 @@ width of the Vim window could make it ju When scrolling back at the more prompt and the quitting a line of text would be left behind when 'cmdheight' is 2 or more. +Fixed a few things for Insert mode completion, especially when typing BS, +CTRL-N or a printable character while still searching for matches. + vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*vi_diff.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*visual.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*windows.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Bram Moolenaar
--- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -1,4 +1,4 @@ -*workshop.txt* For Vim version 7.0g. Last change: 2006 Apr 24 +*workshop.txt* For Vim version 7.0. Last change: 2006 Apr 24 VIM REFERENCE MANUAL by Gordon Prieur
--- a/runtime/macros/less.vim +++ b/runtime/macros/less.vim @@ -1,6 +1,6 @@ " Vim script to work like "less" " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2004 Feb 19 +" Last Change: 2006 May 07 " Avoid loading this file twice, allow the user to define his own script. if exists("loaded_less") @@ -191,7 +191,7 @@ noremap q :q<CR> map v :silent call <SID>End()<CR> fun! s:End() set ma - if exists(s:lz) + if exists('s:lz') let &lz = s:lz endif unmap h
--- a/runtime/syntax/python.vim +++ b/runtime/syntax/python.vim @@ -2,6 +2,7 @@ " Language: Python " Maintainer: Neil Schemenauer <nas@python.ca> " Updated: 2002-10-18 +" Added Python 2.4 features 2006 May 4 (Dmitry Vasiliev) " " Options to control Python syntax highlighting: "
--- a/src/GvimExt/GvimExt.reg +++ b/src/GvimExt/GvimExt.reg @@ -15,6 +15,6 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\Software\Vim\Gvim] "path"="gvim.exe" -[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0g] - "DisplayName"="Vim 7.0g: Edit with Vim popup menu entry" +[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0] + "DisplayName"="Vim 7.0: Edit with Vim popup menu entry" "UninstallString"="uninstal.exe"
--- a/src/Makefile +++ b/src/Makefile @@ -880,7 +880,7 @@ MAN1DIR = /man1 ### Vim version (adjusted by a script) VIMMAJOR = 7 -VIMMINOR = 0g +VIMMINOR = 0 ### Location of Vim files (should not need to be changed, and {{{1 ### some things might not work when they are changed!)
--- a/src/edit.c +++ b/src/edit.c @@ -105,6 +105,11 @@ static int compl_used_match; /* Select FALSE the match was edited or using the longest common string. */ +static int compl_was_interrupted = FALSE; /* didn't finish finding + completions. */ + +static int compl_restarting = FALSE; /* don't insert match */ + /* When the first completion is done "compl_started" is set. When it's * FALSE the word to be completed must be located. */ static int compl_started = FALSE; @@ -139,7 +144,9 @@ static char_u *find_line_end __ARGS((cha static void ins_compl_free __ARGS((void)); static void ins_compl_clear __ARGS((void)); static int ins_compl_bs __ARGS((void)); +static void ins_compl_new_leader __ARGS((void)); static void ins_compl_addleader __ARGS((int c)); +static void ins_compl_restart __ARGS((void)); static void ins_compl_set_original_text __ARGS((char_u *str)); static void ins_compl_addfrommatch __ARGS((void)); static int ins_compl_prep __ARGS((int c)); @@ -3008,43 +3015,69 @@ ins_compl_bs() if ((int)(p - line) - (int)compl_col <= 0) return K_BS; - if (curwin->w_cursor.col <= compl_col + compl_length) - { - /* Deleted more than what was used to find matches, need to look for - * matches all over again. */ - ins_compl_free(); - compl_started = FALSE; - compl_matches = 0; - compl_cont_status = 0; - compl_cont_mode = 0; - } + /* For redo we need to repeat this backspace. */ + AppendCharToRedobuff(K_BS); + + /* Deleted more than what was used to find matches or didn't finish + * finding all matches: need to look for matches all over again. */ + if (curwin->w_cursor.col <= compl_col + compl_length + || compl_was_interrupted) + ins_compl_restart(); vim_free(compl_leader); compl_leader = vim_strnsave(line + compl_col, (int)(p - line) - compl_col); if (compl_leader != NULL) { - ins_compl_del_pum(); - ins_compl_delete(); - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); - - if (compl_started) - ins_compl_set_original_text(compl_leader); - else - { + ins_compl_new_leader(); + return NUL; + } + return K_BS; +} + +/* + * Called after changing "compl_leader". + * Show the popup menu with a different set of matches. + * May also search for matches again if the previous search was interrupted. + */ + static void +ins_compl_new_leader() +{ + ins_compl_del_pum(); + ins_compl_delete(); + ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); + compl_used_match = FALSE; + compl_enter_selects = FALSE; + + if (compl_started) + ins_compl_set_original_text(compl_leader); + else + { #ifdef FEAT_SPELL - spell_bad_len = 0; /* need to redetect bad word */ -#endif - /* Matches were cleared, need to search for them now. */ - if (ins_complete(Ctrl_N) == FAIL) - compl_cont_status = 0; - else - { - /* Remove the completed word again. */ - ins_compl_delete(); - ins_bytes(compl_leader + curwin->w_cursor.col - compl_col); - } - } - + spell_bad_len = 0; /* need to redetect bad word */ +#endif + /* + * Matches were cleared, need to search for them now. First display + * the changed text before the cursor. Set "compl_restarting" to + * avoid that the first match is inserted. + */ + update_screen(0); +#ifdef FEAT_GUI + if (gui.in_use) + { + /* Show the cursor after the match, not after the redrawn text. */ + setcursor(); + out_flush(); + gui_update_cursor(FALSE, FALSE); + } +#endif + compl_restarting = TRUE; + if (ins_complete(Ctrl_N) == FAIL) + compl_cont_status = 0; + compl_restarting = FALSE; + } + + if (!compl_used_match) + { /* Go to the original text, since none of the matches is inserted. */ if (compl_first_match->cp_prev != NULL && (compl_first_match->cp_prev->cp_flags & ORIGINAL_TEXT)) @@ -3053,15 +3086,10 @@ ins_compl_bs() compl_shown_match = compl_first_match; compl_curr_match = compl_shown_match; compl_shows_dir = compl_direction; - - /* Show the popup menu with a different set of matches. */ - ins_compl_show_pum(); - compl_used_match = FALSE; - compl_enter_selects = FALSE; - - return NUL; - } - return K_BS; + } + + /* Show the popup menu with a different set of matches. */ + ins_compl_show_pum(); } /* @@ -3087,18 +3115,33 @@ ins_compl_addleader(c) #endif ins_char(c); + /* For redo we need to count this character so that the number of + * backspaces is correct. */ + AppendCharToRedobuff(c); + + /* If we didn't complete finding matches we must search again. */ + if (compl_was_interrupted) + ins_compl_restart(); + vim_free(compl_leader); compl_leader = vim_strnsave(ml_get_curline() + compl_col, curwin->w_cursor.col - compl_col); if (compl_leader != NULL) - { - /* Show the popup menu with a different set of matches. */ - ins_compl_del_pum(); - ins_compl_show_pum(); - compl_used_match = FALSE; - compl_enter_selects = FALSE; - ins_compl_set_original_text(compl_leader); - } + ins_compl_new_leader(); +} + +/* + * Setup for finding completions again without leaving CTRL-X mode. Used when + * BS or a key was typed while still searching for matches. + */ + static void +ins_compl_restart() +{ + ins_compl_free(); + compl_started = FALSE; + compl_matches = 0; + compl_cont_status = 0; + compl_cont_mode = 0; } /* @@ -4060,7 +4103,7 @@ ins_compl_next(allow_get_expansion, coun } if (allow_get_expansion && insert_match - && (!compl_get_longest || compl_used_match)) + && (!(compl_get_longest || compl_restarting) || compl_used_match)) /* Delete old text to be replaced */ ins_compl_delete(); @@ -4068,6 +4111,13 @@ ins_compl_next(allow_get_expansion, coun * don't let CTRL-N or CTRL-P move to the first match. */ advance = count != 1 || !allow_get_expansion || !compl_get_longest; + /* When restarting the search don't insert the first match either. */ + if (compl_restarting) + { + advance = FALSE; + compl_restarting = FALSE; + } + /* Repeat this for when <PageUp> or <PageDown> is typed. But don't wrap * around. */ while (--todo >= 0) @@ -4102,6 +4152,7 @@ ins_compl_next(allow_get_expansion, coun if (!allow_get_expansion) return -1; + /* Find matches. */ num_matches = ins_compl_get_exp(&compl_startpos); if (compl_pending != 0 && compl_direction == compl_shows_dir && advance) @@ -4850,6 +4901,7 @@ ins_complete(c) setcursor(); RedrawingDisabled = n; } + compl_was_interrupted = compl_interrupted; compl_interrupted = FALSE; return OK;
--- a/src/version.h +++ b/src/version.h @@ -19,13 +19,13 @@ #define VIM_VERSION_MINOR_STR "0" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 261 -#define VIM_VERSION_BUILD_BCD 0x105 -#define VIM_VERSION_BUILD_STR "261" +#define VIM_VERSION_BUILD 262 +#define VIM_VERSION_BUILD_BCD 0x106 +#define VIM_VERSION_BUILD_STR "262" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ -#define VIM_VERSION_RELEASE beta +#define VIM_VERSION_RELEASE final /* * VIM_VERSION_NODOT is used for the runtime directory name. @@ -33,8 +33,8 @@ * VIM_VERSION_MEDIUM is used for the startup-screen. * VIM_VERSION_LONG is used for the ":version" command and "Vim -h". */ -#define VIM_VERSION_NODOT "vim70g" -#define VIM_VERSION_SHORT "7.0g" -#define VIM_VERSION_MEDIUM "7.0g05 BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0g05 BETA (2006 May 6)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0g05 BETA (2006 May 6, compiled " +#define VIM_VERSION_NODOT "vim70" +#define VIM_VERSION_SHORT "7.0" +#define VIM_VERSION_MEDIUM "7.0" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0 (2006 May 7)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0 (2006 May 7, compiled "