diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-27 17:01:56 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-27 17:01:56 +0000 |
| commit | 3991dab8e0a3815bd5349c1ffa88476819971c48 (patch) | |
| tree | cf81e7c822725142320f0ca0721357f34553cfb9 | |
| parent | 899dddf88804af20d560b5277f1ca1bc4dd8e2b3 (diff) | |
| download | vim-git-3991dab8e0a3815bd5349c1ffa88476819971c48.tar.gz | |
updated for version 7.0cv7.0c
181 files changed, 489 insertions, 265 deletions
@@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful messages, shows current file name in window title, on-line help, rectangular cut/paste, etc., etc., etc... - Version 7.0b. Also runs under UNIX, MSDOS and other systems. - vim70brt.tgz contains the documentation and syntax files. - vim70bbin.tgz contains the binaries. - vim70bsrc.tgz contains the sources. + Version 7.0c. Also runs under UNIX, MSDOS and other systems. + vim70crt.tgz contains the documentation and syntax files. + vim70cbin.tgz contains the binaries. + vim70csrc.tgz contains the sources. Author: Bram Moolenaar et al. @@ -69,7 +69,7 @@ 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 = 0b +MINOR = 0c # Uncomment this line if the Win32s version is to be included. DOSBIN_S = dosbin_s @@ -168,6 +168,7 @@ DOSBIN_S = dosbin_s # uninstalw32.exe and xxdw32.exe have been build as mentioned above. # - put gvimext.dll in src/GvimExt and VisVim.dll in src/VisVim (get them # from a binary archive or build them) +# Note: VisVim needs to be build with MSVC 5, newer versions don't work. # - make sure there is a diff.exe two levels up # - go to ../nsis and do "makensis gvim.nsi". # - Copy gvim##.exe to the dist directory. diff --git a/README.txt b/README.txt index 8d26a3bce..32a5c6c86 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -README.txt for version 7.0b of Vim: Vi IMproved. +README.txt for version 7.0c of Vim: Vi IMproved. WHAT IS VIM diff --git a/README_ami.txt b/README_ami.txt index c1e58dba4..02bef6f9f 100644 --- a/README_ami.txt +++ b/README_ami.txt @@ -1,4 +1,4 @@ -README_ami.txt for version 7.0b of Vim: Vi IMproved. +README_ami.txt for version 7.0c 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 f39eb5e59..86d163547 100644 --- a/README_amibin.txt +++ b/README_amibin.txt @@ -1,4 +1,4 @@ -README_amibin.txt for version 7.0b of Vim: Vi IMproved. +README_amibin.txt for version 7.0c 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_amisrc.txt b/README_amisrc.txt index f0275ed5c..3fc5adb47 100644 --- a/README_amisrc.txt +++ b/README_amisrc.txt @@ -1,4 +1,4 @@ -README_amisrc.txt for version 7.0b of Vim: Vi IMproved. +README_amisrc.txt for version 7.0c 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_bindos.txt b/README_bindos.txt index 4a6a1fc44..afcfa8aa1 100644 --- a/README_bindos.txt +++ b/README_bindos.txt @@ -1,4 +1,4 @@ -README_bindos.txt for version 7.0b of Vim: Vi IMproved. +README_bindos.txt for version 7.0c 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. diff --git a/README_dos.txt b/README_dos.txt index 9ecfec60a..51713c1b1 100644 --- a/README_dos.txt +++ b/README_dos.txt @@ -1,4 +1,4 @@ -README_dos.txt for version 7.0b of Vim: Vi IMproved. +README_dos.txt for version 7.0c 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 5d49a4f25..0f6d002c1 100644 --- a/README_extra.txt +++ b/README_extra.txt @@ -1,4 +1,4 @@ -README_extra.txt for version 7.0b of Vim: Vi IMproved. +README_extra.txt for version 7.0c 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_lang.txt b/README_lang.txt index c5d682976..86667d8c3 100644 --- a/README_lang.txt +++ b/README_lang.txt @@ -1,4 +1,4 @@ -README_lang.txt for version 7.0b of Vim: Vi IMproved. +README_lang.txt for version 7.0c of Vim: Vi IMproved. This file contains files for non-English languages: - Translated messages. diff --git a/README_mac.txt b/README_mac.txt index 26d809a4e..0445c10ae 100644 --- a/README_mac.txt +++ b/README_mac.txt @@ -1,4 +1,4 @@ -README_mac.txt for version 7.0b of Vim: Vi IMproved. +README_mac.txt for version 7.0c 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 bfbe4ec13..8d6503e1a 100644 --- a/README_ole.txt +++ b/README_ole.txt @@ -1,4 +1,4 @@ -README_ole.txt for version 7.0b of Vim: Vi IMproved. +README_ole.txt for version 7.0c 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_os2.txt b/README_os2.txt index a118ae1b6..a4f1d6821 100644 --- a/README_os2.txt +++ b/README_os2.txt @@ -1,4 +1,4 @@ -README_os2.txt for version 7.0b of Vim: Vi IMproved. +README_os2.txt for version 7.0c of Vim: Vi IMproved. This file explains the installation of Vim on OS/2 systems. See "README.txt" for general information about Vim. diff --git a/README_os390.txt b/README_os390.txt index 3761c0f82..254ca0da4 100644 --- a/README_os390.txt +++ b/README_os390.txt @@ -1,4 +1,4 @@ -README_os_390.txt for version 7.0b of Vim: Vi IMproved. +README_os_390.txt for version 7.0c of Vim: Vi IMproved. Welcome to the OS/390 Unix port of VIM. diff --git a/README_src.txt b/README_src.txt index 1ad38c560..c3c7af5b1 100644 --- a/README_src.txt +++ b/README_src.txt @@ -1,4 +1,4 @@ -README_src.txt for version 7.0b of Vim: Vi IMproved. +README_src.txt for version 7.0c of Vim: Vi IMproved. The source archive contains the files needed to compile Vim on Unix systems. It is packed for Unix systems (NL line separator). It is also used for other diff --git a/README_srcdos.txt b/README_srcdos.txt index 3d8a5ea3e..9f289d187 100644 --- a/README_srcdos.txt +++ b/README_srcdos.txt @@ -1,4 +1,4 @@ -README_srcdos.txt for version 7.0b of Vim: Vi IMproved. +README_srcdos.txt for version 7.0c 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. diff --git a/README_unix.txt b/README_unix.txt index 65634b64d..7ba253f50 100644 --- a/README_unix.txt +++ b/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 7.0b of Vim: Vi IMproved. +README_unix.txt for version 7.0c of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim. diff --git a/README_vms.txt b/README_vms.txt index 02ccb3cfc..6b4167286 100644 --- a/README_vms.txt +++ b/README_vms.txt @@ -1,4 +1,4 @@ -README_vms.txt for version 7.0b of Vim: Vi IMproved. +README_vms.txt for version 7.0c 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. diff --git a/README_w32s.txt b/README_w32s.txt index 027e3120a..112c6a2a5 100644 --- a/README_w32s.txt +++ b/README_w32s.txt @@ -1,4 +1,4 @@ -README_w32s.txt for version 7.0b of Vim: Vi IMproved. +README_w32s.txt for version 7.0c 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 0b38cb378..d075dfca7 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -22,7 +22,7 @@ !define HAVE_NLS !define VER_MAJOR 7 -!define VER_MINOR 0b +!define VER_MINOR 0c # ----------- No configurable settings below this line ----------- diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim index 759d1267c..a16d15577 100644 --- a/runtime/autoload/htmlcomplete.vim +++ b/runtime/autoload/htmlcomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: XHTML 1.0 Strict " Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) -" Last Change: 2006 Mar 19 +" Last Change: 2006 Mar 25 function! htmlcomplete#CompleteTags(findstart, base) if a:findstart @@ -640,7 +640,7 @@ let g:xmldata_xhtml10s = { \ 'charoff' : ['Length', ''], \ 'charset' : ['LangCode', ''], \ 'checked' : ['Bool', ''], -\ 'class' : ['CDATA', 'Name of class, used for connecting element with style'], +\ 'class' : ['CDATA', ''], \ 'codetype' : ['ContentType', ''], \ 'cols' : ['*Number', ''], \ 'colspan' : ['Number', ''], diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile index 532cc2df6..625c74e1d 100644 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -410,6 +410,7 @@ os_win32.txt: touch os_win32.txt # Note that $< works with GNU make while $> works for BSD make. +# Is there a solution that works for both?? vim-fr.UTF-8.1: vim-fr.1 iconv -f latin1 -t utf-8 $< >$@ diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 59282704e..ad361b0c5 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index cce7745ff..6932e818d 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0b. Last change: 2006 Mar 15 +*autocmd.txt* For Vim version 7.0c. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 00269e749..abb528ee1 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0b. Last change: 2006 Mar 16 +*change.txt* For Vim version 7.0c. Last change: 2006 Mar 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 082415b3f..a084f3a46 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0b. Last change: 2006 Mar 16 +*cmdline.txt* For Vim version 7.0c. Last change: 2006 Mar 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 0000a3ed9..81bceb918 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -1,4 +1,4 @@ -*debug.txt* For Vim version 7.0b. Last change: 2005 Dec 17 +*debug.txt* For Vim version 7.0c. Last change: 2005 Dec 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 4f4d98c65..e88289dcd 100644 --- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -1,4 +1,4 @@ -*debugger.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*debugger.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 85f5027dc..dac2dc41b 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -1,4 +1,4 @@ -*develop.txt* For Vim version 7.0b. Last change: 2006 Mar 09 +*develop.txt* For Vim version 7.0c. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index dfd9ac123..3df513eee 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.0b. Last change: 2006 Mar 15 +*diff.txt* For Vim version 7.0c. Last change: 2006 Mar 15 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 995e0d4e5..54cab085f 100644 --- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1,4 +1,4 @@ -*digraph.txt* For Vim version 7.0b. Last change: 2005 Sep 11 +*digraph.txt* For Vim version 7.0c. Last change: 2005 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 9c8063eeb..7a67a6978 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.0b. Last change: 2006 Mar 06 +*editing.txt* For Vim version 7.0c. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 6395b5c3b..fc89485ae 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*eval.txt* For Vim version 7.0c. Last change: 2006 Mar 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index c9df1f6b4..8fa240a52 100644 --- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -1,4 +1,4 @@ -*farsi.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*farsi.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index f0121d07d..a0a9479c6 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*filetype.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index fa8568e9a..9f491d382 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -1,4 +1,4 @@ -*fold.txt* For Vim version 7.0b. Last change: 2005 Sep 10 +*fold.txt* For Vim version 7.0c. Last change: 2005 Sep 10 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/getscript.txt b/runtime/doc/getscript.txt index b9d2543c6..544ff9f85 100644 --- a/runtime/doc/getscript.txt +++ b/runtime/doc/getscript.txt @@ -1,4 +1,4 @@ -*getscript.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*getscript.txt* For Vim version 7.0c. Last change: 2006 Mar 24 Get the Latest VimScripts diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index c1446da52..d838680f8 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0b. Last change: 2006 Mar 20 +*gui.txt* For Vim version 7.0c. 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 b20bf44de..68619398c 100644 --- a/runtime/doc/gui_w16.txt +++ b/runtime/doc/gui_w16.txt @@ -1,4 +1,4 @@ -*gui_w16.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*gui_w16.txt* For Vim version 7.0c. 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 472bf4f2b..c44d65f32 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -1,4 +1,4 @@ -*gui_w32.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*gui_w32.txt* For Vim version 7.0c. 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 97b914cfe..cdbbf9402 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0b. Last change: 2005 Dec 06 +*gui_x11.txt* For Vim version 7.0c. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 2f2fb757c..7e0ec1e6c 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,4 +1,4 @@ -*hangulin.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*hangulin.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index cb32526f9..64f7fbb40 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -1,4 +1,4 @@ -*hebrew.txt* For Vim version 7.0b. Last change: 2003 May 11 +*hebrew.txt* For Vim version 7.0c. Last change: 2003 May 11 VIM REFERENCE MANUAL by Ron Aaron (and Avner Lottem) diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 8bc4b3194..d99f21f2c 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*help.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM - main help file k diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt index e9cd6cfbe..f8f754386 100644 --- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -1,4 +1,4 @@ -*howto.txt* For Vim version 7.0b. Last change: 2001 Sep 03 +*howto.txt* For Vim version 7.0c. Last change: 2001 Sep 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index f0937d757..ee41a98a8 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -1,4 +1,4 @@ -*if_cscop.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*if_cscop.txt* For Vim version 7.0c. 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 c8a24147e..d577e3310 100644 --- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -1,4 +1,4 @@ -*if_mzsch.txt* For Vim version 7.0b. Last change: 2006 Mar 06 +*if_mzsch.txt* For Vim version 7.0c. 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 2842242fc..abe7eb6b0 100644 --- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -1,4 +1,4 @@ -*if_ole.txt* For Vim version 7.0b. Last change: 2006 Mar 06 +*if_ole.txt* For Vim version 7.0c. 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 6917bd8ef..b76e06d0b 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -1,4 +1,4 @@ -*if_perl.txt* For Vim version 7.0b. Last change: 2006 Mar 06 +*if_perl.txt* For Vim version 7.0c. 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 9dd208739..91a02d819 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.0b. Last change: 2006 Jan 20 +*if_pyth.txt* For Vim version 7.0c. 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 eace7e925..1aa72ebf0 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -1,4 +1,4 @@ -*if_ruby.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*if_ruby.txt* For Vim version 7.0c. Last change: 2006 Mar 26 VIM REFERENCE MANUAL by Shugo Maeda diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index 6f18d1207..2e0ca4552 100644 --- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -1,4 +1,4 @@ -*if_sniff.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*if_sniff.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index e7280c7d4..270d3623e 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -1,4 +1,4 @@ -*if_tcl.txt* For Vim version 7.0b. Last change: 2006 Mar 06 +*if_tcl.txt* For Vim version 7.0c. Last change: 2006 Mar 06 VIM REFERENCE MANUAL by Ingo Wilken diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 5805d3b52..e666590f4 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1,4 +1,4 @@ -*indent.txt* For Vim version 7.0b. Last change: 2005 Aug 30 +*indent.txt* For Vim version 7.0c. Last change: 2005 Aug 30 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 305d9a3c2..f1647599b 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*index.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 2bcfe6b9b..a38af97f1 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0b. Last change: 2006 Mar 21 +*insert.txt* For Vim version 7.0c. Last change: 2006 Mar 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 917c6d094..e9fe36937 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.0b. Last change: 2005 Sep 01 +*intro.txt* For Vim version 7.0c. Last change: 2005 Sep 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index f6011fc40..0b3afbe73 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0b. Last change: 2006 Mar 20 +*map.txt* For Vim version 7.0c. Last change: 2006 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index c194d6b4a..9c7972885 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.0b. Last change: 2006 Mar 05 +*mbyte.txt* For Vim version 7.0c. 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 70c43d74a..8499bc78c 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.0b. Last change: 2006 Mar 01 +*message.txt* For Vim version 7.0c. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index 88edfc42c..121d77b60 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -1,4 +1,4 @@ -*mlang.txt* For Vim version 7.0b. Last change: 2004 Feb 24 +*mlang.txt* For Vim version 7.0c. Last change: 2004 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 134c492df..d6614004d 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0b. Last change: 2006 Jan 02 +*motion.txt* For Vim version 7.0c. Last change: 2006 Jan 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index 143659b24..ca4094266 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1,4 +1,4 @@ -*netbeans.txt* For Vim version 7.0b. Last change: 2006 Mar 09 +*netbeans.txt* For Vim version 7.0c. Last change: 2006 Mar 09 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ec9ddb6f8..877ac1a76 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*options.txt* For Vim version 7.0c. Last change: 2006 Mar 26 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index cda7b3b28..c1a0a8f2a 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_390.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Ralf Schandl diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index 1fe1997d1..95dc666d4 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -1,4 +1,4 @@ -*os_amiga.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_amiga.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index d799ed798..b28ddc477 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_beos.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index 213ddbe37..02cb03221 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -1,4 +1,4 @@ -*os_dos.txt* For Vim version 7.0b. Last change: 2006 Feb 14 +*os_dos.txt* For Vim version 7.0c. Last change: 2006 Feb 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 9d06ba823..5db60857a 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -1,4 +1,4 @@ -*os_mac.txt* For Vim version 7.0b. Last change: 2006 Mar 09 +*os_mac.txt* For Vim version 7.0c. Last change: 2006 Mar 26 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -74,6 +74,8 @@ files. ============================================================================== 3. Mac FAQ *mac-faq* +On the internet: http://macvim.org/OSX/index.php#FAQ + Q: I can't enter non-ASCII character in Apple Terminal. A: Under Window Settings, Emulation, make sure that "Escape non-ASCII characters" is not checked. diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index 46c876c0d..f82914213 100644 --- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -1,4 +1,4 @@ -*os_mint.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_mint.txt* For Vim version 7.0c. 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 5d00ae45a..5d10d34fb 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -1,4 +1,4 @@ -*os_msdos.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_msdos.txt* For Vim version 7.0c. 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 acbd42791..18066e5bf 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -1,4 +1,4 @@ -*os_os2.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_os2.txt* For Vim version 7.0c. 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 46efd461c..ad71fb773 100644 --- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -1,4 +1,4 @@ -*os_qnx.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_qnx.txt* For Vim version 7.0c. 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 362329574..03acb69ed 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -1,4 +1,4 @@ -*os_risc.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_risc.txt* For Vim version 7.0c. 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 37b8e7d6e..4c94130e5 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -1,4 +1,4 @@ -*os_unix.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_unix.txt* For Vim version 7.0c. 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 fbf52ad8f..858365225 100644 --- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -1,4 +1,4 @@ -*os_vms.txt* For Vim version 7.0b. Last change: 2006 Mar 02 +*os_vms.txt* For Vim version 7.0c. Last change: 2006 Mar 02 VIM REFERENCE MANUAL diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index 24b35595c..c894f0a8e 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -1,4 +1,4 @@ -*os_win32.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*os_win32.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by George Reilly diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index d61e5542c..f4155747a 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.0b. Last change: 2006 Mar 25 +*pattern.txt* For Vim version 7.0c. Last change: 2006 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index 89f284e7d..b521ee4ad 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -1,4 +1,4 @@ -*pi_gzip.txt* For Vim version 7.0b. Last change: 2002 Oct 29 +*pi_gzip.txt* For Vim version 7.0c. 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 86dd652ad..bc9af21f9 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -1,4 +1,4 @@ -*pi_netrw.txt* For Vim version 7.0b. Last change: Mar 22, 2006 +*pi_netrw.txt* For Vim version 7.0c. Last change: Mar 22, 2006 VIM REFERENCE MANUAL by Charles E. Campbell, Jr. diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index 32107f01e..29fcbd68c 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -1,4 +1,4 @@ -*pi_paren.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*pi_paren.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt index c0d4591fe..1dafd2f56 100644 --- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -1,4 +1,4 @@ -*pi_spec.txt* For Vim version 7.0b. Last change: 2005 Oct 03 +*pi_spec.txt* For Vim version 7.0c. Last change: 2005 Oct 03 by Gustavo Niemeyer ~ diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index c246037c6..a986ee9cc 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*tar.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*tar.txt* For Vim version 7.0c. Last change: 2006 Mar 24 Tar File Interface diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index ebd3b8239..8e70bbf3c 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*zip.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*zip.txt* For Vim version 7.0c. Last change: 2006 Mar 24 Zip File Interface diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 9741324fc..093675405 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -1,4 +1,4 @@ -*print.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*print.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 1b24604e8..504d584d0 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*quickfix.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 5fac446da..4008e3acf 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.0b. Last change: 2006 Mar 23 +*quickref.txt* For Vim version 7.0c. Last change: 2006 Mar 23 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index d10fac810..b2322ef1d 100644 --- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 7.0b. Last change: 2005 Apr 04 +*quotes.txt* For Vim version 7.0c. Last change: 2005 Apr 04 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 485369797..4849077d6 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -1,4 +1,4 @@ -*recover.txt* For Vim version 7.0b. Last change: 2005 Dec 12 +*recover.txt* For Vim version 7.0c. Last change: 2005 Dec 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index 4d577709f..a65ef930b 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -1,4 +1,4 @@ -*remote.txt* For Vim version 7.0b. Last change: 2006 Mar 11 +*remote.txt* For Vim version 7.0c. Last change: 2006 Mar 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index b97a4710b..48afafbfa 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.0b. Last change: 2006 Mar 21 +*repeat.txt* For Vim version 7.0c. Last change: 2006 Mar 21 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index db2c58436..e9401e8ab 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -1,4 +1,4 @@ -*rileft.txt* For Vim version 7.0b. Last change: 2005 Apr 04 +*rileft.txt* For Vim version 7.0c. Last change: 2005 Apr 04 VIM REFERENCE MANUAL by Avner Lottem diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index c78e04313..2423a7cf4 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -1,4 +1,4 @@ -*russian.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*russian.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM REFERENCE MANUAL by Vassily Ragosin diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 6c8395840..7e4a3a888 100644 --- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -1,4 +1,4 @@ -*scroll.txt* For Vim version 7.0b. Last change: 2005 Dec 16 +*scroll.txt* For Vim version 7.0c. Last change: 2005 Dec 16 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 1e68f78ce..594020cb8 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.0b. Last change: 2005 Apr 04 +*sign.txt* For Vim version 7.0c. Last change: 2005 Apr 04 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 5c7b5bbb5..db0210fc7 100644 --- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1,4 +1,4 @@ -*spell.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*spell.txt* For Vim version 7.0c. Last change: 2006 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1005,11 +1005,8 @@ The basic format for the following lines is: character but a, b and c. {extra} Optional extra text: - rare word + affix is rare - nocomp no compounding for word + affix # comment Comment is ignored - Hunspell uses this, ignored - "rare" and "nocomp" are deprecated. For PFX the fields are the same, but the {strip}, {add} and {condition} apply to the start of the word. @@ -1063,7 +1060,7 @@ Specifically, the affix flags can be used for: |spell-COMPOUNDFORBIDFLAG| flag. -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -OLD STUFF +OLD STUFF: This needs to be rewritten to use affix flags. *spell-affix-rare* An extra item for Vim is the "rare" flag. It must come after the other fields, before a comment. When used then all words that use the affix will be @@ -1298,7 +1295,6 @@ The COMPOUNDROOT flag is used for words in the dictionary that are already a compound. This means it counts for two words when checking the compounding rules. Can also be used for an affix to count the affix as a compounding word. -NOT IMPLEMENTED YET. *spell-SYLLABLE* The SYLLABLE item defines characters or character sequences that are used to diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 8e4011dec..a3495b47f 100644 --- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -1,4 +1,4 @@ -*sponsor.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*sponsor.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/sql.txt b/runtime/doc/sql.txt index 230ed128b..7a6c5b826 100644 --- a/runtime/doc/sql.txt +++ b/runtime/doc/sql.txt @@ -1,4 +1,4 @@ -*sql.txt* For Vim version 7.0b. Last change: Fri Jan 06 2006 8:09:25 AM +*sql.txt* For Vim version 7.0c. Last change: Fri Jan 06 2006 8:09:25 AM by David Fishburn @@ -295,4 +295,4 @@ pickup the new SQL files and load them when you issue the SQLSetType command. -vim:tw=78:ts=8:ft=help:norl:ff=unix: +vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index eda5e7a3e..c0f2a0330 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0b. Last change: 2006 Mar 25 +*starting.txt* For Vim version 7.0c. Last change: 2006 Mar 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -757,6 +757,7 @@ accordingly. Vim proceeds in this order: Note that this file is ALWAYS read in 'compatible' mode, since the automatic resetting of 'compatible' is only done later. Add a ":set nocp" command if you like. + For the Macintosh the $VIMRUNTIME/macmap.vim is read. *VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc* c. Four places are searched for initializations. The first that exists diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 51d841936..0d5263b3d 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.0b. Last change: 2006 Mar 12 +*syntax.txt* For Vim version 7.0c. Last change: 2006 Mar 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index d6b32994e..87b42c0bb 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.0b. Last change: 2006 Mar 03 +*tabpage.txt* For Vim version 7.0c. Last change: 2006 Mar 03 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 50a25120f..56a603cf3 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.0b. Last change: 2006 Feb 24 +*tagsrch.txt* For Vim version 7.0c. Last change: 2006 Feb 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index da6077665..22de084b5 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -1,4 +1,4 @@ -*term.txt* For Vim version 7.0b. Last change: 2006 Feb 14 +*term.txt* For Vim version 7.0c. Last change: 2006 Feb 14 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index 6563e261f..3aa33c352 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -1,4 +1,4 @@ -*tips.txt* For Vim version 7.0b. Last change: 2006 Mar 01 +*tips.txt* For Vim version 7.0c. Last change: 2006 Mar 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 2bd5091fb..82eed6145 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*todo.txt* For Vim version 7.0c. Last change: 2006 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -33,15 +33,21 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. In completion using Enter to accept the current match causes trouble. Leave it out? Typing a space already works +The 16 bit DOS version compiles now, but it's still too low on memory, writing +a file fails when 'writebackup' is set. + New Hungarian dictionary. (Laci Nemeth) test COMPOUNDFORBIDFLAG implement use of COMPOUNDPERMITFLAG implement use of CHECKCOMPOUND* flags, <compoptions> implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[]. + explain the use of affix flags, replace |spell-affix-rare| Mac: When started from finder path isn't set and curdir is /. Benji Fisher suggests using system() (2006 Mar 26) +Mac: reported default for $VIM is /Applications/share/vim + Add more tests for all new functionality in Vim 7. Especially new functions. Win32: Describe how to do debugging. (George Reilly) @@ -1094,6 +1100,7 @@ User Friendlier: Tab pages: +9 Win32 GUI: menu for tab pages line. 9 GUI implementation for the tab pages line for other systems. 8 Make GUI menu in tab pages line configurable. Like the popup menu. 8 tab pages in the session file, if "tabpages" in 'sessionoptions' diff --git a/runtime/doc/uganda.nsis.txt b/runtime/doc/uganda.nsis.txt index 21b0a48e5..d839ae2d2 100644 --- a/runtime/doc/uganda.nsis.txt +++ b/runtime/doc/uganda.nsis.txt @@ -1,4 +1,4 @@ - For Vim version 7.0b. Last change: 2006 Mar 24 + For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt index 5eb9c40d1..a38950a89 100644 --- a/runtime/doc/uganda.txt +++ b/runtime/doc/uganda.txt @@ -1,4 +1,4 @@ -*uganda.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*uganda.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index 2a2d4783c..8f6132e2e 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -1,4 +1,4 @@ -*undo.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*undo.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt index 13b4419d8..dd364af2f 100644 --- a/runtime/doc/usr_01.txt +++ b/runtime/doc/usr_01.txt @@ -1,4 +1,4 @@ -*usr_01.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_01.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt index 0fafd4ab6..03a04a8f5 100644 --- a/runtime/doc/usr_02.txt +++ b/runtime/doc/usr_02.txt @@ -1,4 +1,4 @@ -*usr_02.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_02.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt index 2a5d57a79..035465686 100644 --- a/runtime/doc/usr_03.txt +++ b/runtime/doc/usr_03.txt @@ -1,4 +1,4 @@ -*usr_03.txt* For Vim version 7.0b. Last change: 2005 Apr 22 +*usr_03.txt* For Vim version 7.0c. Last change: 2005 Apr 22 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt index bdebfb682..174047755 100644 --- a/runtime/doc/usr_04.txt +++ b/runtime/doc/usr_04.txt @@ -1,4 +1,4 @@ -*usr_04.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_04.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 7a2215e9d..e2c6207a4 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_05.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt index 7ae52e7d0..b9567c920 100644 --- a/runtime/doc/usr_06.txt +++ b/runtime/doc/usr_06.txt @@ -1,4 +1,4 @@ -*usr_06.txt* For Vim version 7.0b. Last change: 2006 Feb 16 +*usr_06.txt* For Vim version 7.0c. Last change: 2006 Feb 16 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt index ffc488c15..a53db0966 100644 --- a/runtime/doc/usr_07.txt +++ b/runtime/doc/usr_07.txt @@ -1,4 +1,4 @@ -*usr_07.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_07.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt index 913ba1d0d..125d70f79 100644 --- a/runtime/doc/usr_08.txt +++ b/runtime/doc/usr_08.txt @@ -1,4 +1,4 @@ -*usr_08.txt* For Vim version 7.0b. Last change: 2006 Feb 25 +*usr_08.txt* For Vim version 7.0c. Last change: 2006 Feb 25 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index 09dc22fad..00295efbe 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -1,4 +1,4 @@ -*usr_09.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_09.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt index d3d9306b9..3d9fc277d 100644 --- a/runtime/doc/usr_10.txt +++ b/runtime/doc/usr_10.txt @@ -1,4 +1,4 @@ -*usr_10.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_10.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt index b51e80942..e5a4d0d22 100644 --- a/runtime/doc/usr_11.txt +++ b/runtime/doc/usr_11.txt @@ -1,4 +1,4 @@ -*usr_11.txt* For Vim version 7.0b. Last change: 2005 Jun 09 +*usr_11.txt* For Vim version 7.0c. Last change: 2005 Jun 09 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt index 112d42edc..94d2a37de 100644 --- a/runtime/doc/usr_12.txt +++ b/runtime/doc/usr_12.txt @@ -1,4 +1,4 @@ -*usr_12.txt* For Vim version 7.0b. Last change: 2006 Feb 26 +*usr_12.txt* For Vim version 7.0c. Last change: 2006 Feb 26 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt index 901a1293e..f8cfdbfe8 100644 --- a/runtime/doc/usr_20.txt +++ b/runtime/doc/usr_20.txt @@ -1,4 +1,4 @@ -*usr_20.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_20.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt index e87423452..0f418c774 100644 --- a/runtime/doc/usr_21.txt +++ b/runtime/doc/usr_21.txt @@ -1,4 +1,4 @@ -*usr_21.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_21.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt index 91eb48dbb..b6fdf721a 100644 --- a/runtime/doc/usr_22.txt +++ b/runtime/doc/usr_22.txt @@ -1,4 +1,4 @@ -*usr_22.txt* For Vim version 7.0b. Last change: 2005 Apr 10 +*usr_22.txt* For Vim version 7.0c. Last change: 2005 Apr 10 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt index 42cec3f96..1a5b8aab3 100644 --- a/runtime/doc/usr_23.txt +++ b/runtime/doc/usr_23.txt @@ -1,4 +1,4 @@ -*usr_23.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_23.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt index 834d3ce18..385bc7e46 100644 --- a/runtime/doc/usr_24.txt +++ b/runtime/doc/usr_24.txt @@ -1,4 +1,4 @@ -*usr_24.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_24.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 4f464a308..eef28be43 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_25.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt index 203753a45..7a88e0b91 100644 --- a/runtime/doc/usr_26.txt +++ b/runtime/doc/usr_26.txt @@ -1,4 +1,4 @@ -*usr_26.txt* For Vim version 7.0b. Last change: 2002 Oct 29 +*usr_26.txt* For Vim version 7.0c. Last change: 2002 Oct 29 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt index d67f73959..a8cb9c092 100644 --- a/runtime/doc/usr_27.txt +++ b/runtime/doc/usr_27.txt @@ -1,4 +1,4 @@ -*usr_27.txt* For Vim version 7.0b. Last change: 2005 Feb 08 +*usr_27.txt* For Vim version 7.0c. Last change: 2005 Feb 08 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt index 172603a56..73dd7b3bb 100644 --- a/runtime/doc/usr_28.txt +++ b/runtime/doc/usr_28.txt @@ -1,4 +1,4 @@ -*usr_28.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_28.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index 2fc86ebc6..e3852894e 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.0b. Last change: 2004 Feb 12 +*usr_29.txt* For Vim version 7.0c. Last change: 2004 Feb 12 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt index e0dc69ff5..925a32f2d 100644 --- a/runtime/doc/usr_30.txt +++ b/runtime/doc/usr_30.txt @@ -1,4 +1,4 @@ -*usr_30.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_30.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt index af6644c82..a5fc02ecc 100644 --- a/runtime/doc/usr_31.txt +++ b/runtime/doc/usr_31.txt @@ -1,4 +1,4 @@ -*usr_31.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_31.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt index 4893eb477..cbfb5c98d 100644 --- a/runtime/doc/usr_32.txt +++ b/runtime/doc/usr_32.txt @@ -1,4 +1,4 @@ -*usr_32.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_32.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt index 79c57e390..ce7483996 100644 --- a/runtime/doc/usr_40.txt +++ b/runtime/doc/usr_40.txt @@ -1,4 +1,4 @@ -*usr_40.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_40.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 86479825d..3ff134087 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_41.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 1940c4447..3afc6db75 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -1,4 +1,4 @@ -*usr_42.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_42.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt index 5203d751f..3ff816c1b 100644 --- a/runtime/doc/usr_43.txt +++ b/runtime/doc/usr_43.txt @@ -1,4 +1,4 @@ -*usr_43.txt* For Vim version 7.0b. Last change: 2002 Jul 14 +*usr_43.txt* For Vim version 7.0c. Last change: 2002 Jul 14 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt index 32f4d15a9..a11fd4275 100644 --- a/runtime/doc/usr_44.txt +++ b/runtime/doc/usr_44.txt @@ -1,4 +1,4 @@ -*usr_44.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*usr_44.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt index 02692be94..f6f235578 100644 --- a/runtime/doc/usr_45.txt +++ b/runtime/doc/usr_45.txt @@ -1,4 +1,4 @@ -*usr_45.txt* For Vim version 7.0b. Last change: 2004 Jun 08 +*usr_45.txt* For Vim version 7.0c. Last change: 2004 Jun 08 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index f91e0efe0..ff3c24da0 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -1,4 +1,4 @@ -*usr_90.txt* For Vim version 7.0b. Last change: 2004 Mar 21 +*usr_90.txt* For Vim version 7.0c. Last change: 2004 Mar 21 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt index 22c05137d..b21b7c30f 100644 --- a/runtime/doc/usr_toc.txt +++ b/runtime/doc/usr_toc.txt @@ -1,4 +1,4 @@ -*usr_toc.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*usr_toc.txt* For Vim version 7.0c. Last change: 2006 Mar 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index faef69b50..ec672bea0 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.0b. Last change: 2006 Mar 25 +*various.txt* For Vim version 7.0c. Last change: 2006 Mar 25 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt index 8c13af7f0..2d2adb65a 100644 --- a/runtime/doc/version4.txt +++ b/runtime/doc/version4.txt @@ -1,4 +1,4 @@ -*version4.txt* For Vim version 7.0b. Last change: 2004 Mar 12 +*version4.txt* For Vim version 7.0c. Last change: 2004 Mar 12 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index 0f2fa923a..aa7257386 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 7.0b. Last change: 2005 Apr 01 +*version5.txt* For Vim version 7.0c. Last change: 2005 Apr 01 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt index 083077ebe..105caa395 100644 --- a/runtime/doc/version6.txt +++ b/runtime/doc/version6.txt @@ -1,4 +1,4 @@ -*version6.txt* For Vim version 7.0b. Last change: 2005 Oct 17 +*version6.txt* For Vim version 7.0c. Last change: 2005 Oct 17 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 43e4890c0..81dcddc60 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0b. Last change: 2006 Mar 26 +*version7.txt* For Vim version 7.0c. Last change: 2006 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -275,6 +275,7 @@ The |--remote-tab| argument can be used to edit a file in a new tab page in an already running Vim server. More info here: |tabpage| +The Win32 GUI tabs were implemented by Yegappan Lakshmanan. Undo branches *new-undo-branches* @@ -2203,5 +2204,9 @@ Mac: Default to building for the current platform only, that is much faster than building a universal binary. Also, using Perl/Python/etc. only works for the current platform. +The time on undo messages disappeared for someone. Using %T for strftime() +apparently doesn't work everywhere. Use %H:%M:%S instead. + +Typing BS at the "z=" prompt removed the prompt. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt index 5969cb32f..55f27a5ab 100644 --- a/runtime/doc/vi_diff.txt +++ b/runtime/doc/vi_diff.txt @@ -1,4 +1,4 @@ -*vi_diff.txt* For Vim version 7.0b. Last change: 2006 Jan 02 +*vi_diff.txt* For Vim version 7.0c. Last change: 2006 Jan 02 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 index 64e3658d5..d9b7cf438 100644 --- a/runtime/doc/vim-fr.UTF-8.1 +++ b/runtime/doc/vim-fr.UTF-8.1 @@ -516,9 +516,17 @@ Initialisation de .B Vim pour l'ensemble du système. .TP +~/.vimrc +Initialisation de +.B Vim +de votre compte utilisateur. +.TP /usr/local/lib/vim/gvimrc Initialisation de gvim pour l'ensemble du système. .TP +~/.gvimrc +Initialisation de gvim pour votre compte utilisateur. +.TP /usr/local/lib/vim/optwin.vim Script utilisé pour la commande ":options", une manière pratique de consulter et de modifier les options. diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index 69c6d308b..cdf71ac3b 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -84,7 +84,7 @@ Mostly this is used for C programs, in which case {tag} could be a function name. The effect is that the file containing that function becomes the current file and the cursor is positioned on the start of the function. -See ":help tag-commands". +See ":help tag\-commands". .TP \-q [errorfile] Start in quickFix mode. @@ -137,7 +137,7 @@ If "num" is missing, the cursor will be positioned on the last line. +/{pat} For the first file the cursor will be positioned on the first occurrence of {pat}. -See ":help search-pattern" for the available search patterns. +See ":help search\-pattern" for the available search patterns. .TP +{command} .TP @@ -371,7 +371,7 @@ See ":help initialization" within vim for more details. Use the commands in the file {gvimrc} for GUI initializations. All the other GUI initializations are skipped. It can also be used to skip all GUI initializations by giving the name "NONE". -See ":help gui-init" within vim for more details. +See ":help gui\-init" within vim for more details. .TP \-V[N] Verbose. Give messages about which files are sourced and for reading and @@ -469,7 +469,7 @@ Type ":help" in to get started. Type ":help subject" to get help on a specific subject. For example: ":help ZZ" to get help for the "ZZ" command. -Use <Tab> and CTRL\-D to complete subjects (":help cmdline\-completion"). +Use <Tab> and CTRL-D to complete subjects (":help cmdline\-completion"). Tags are present to jump from one place to another (sort of hypertext links, see ":help"). All documentation files can be viewed in this way, for example diff --git a/runtime/doc/vimball.txt b/runtime/doc/vimball.txt index 4a5fbb5db..305af969d 100644 --- a/runtime/doc/vimball.txt +++ b/runtime/doc/vimball.txt @@ -1,4 +1,4 @@ -*vimball.txt* For Vim version 7.0b. Last change: 2006 Mar 24 +*vimball.txt* For Vim version 7.0c. Last change: 2006 Mar 24 Vimball Archiver diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt index fcb304c75..c1a7ec4d8 100644 --- a/runtime/doc/visual.txt +++ b/runtime/doc/visual.txt @@ -1,4 +1,4 @@ -*visual.txt* For Vim version 7.0b. Last change: 2006 Mar 20 +*visual.txt* For Vim version 7.0c. Last change: 2006 Mar 20 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 7fd0cd012..954373ebc 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.0b. Last change: 2006 Mar 11 +*windows.txt* For Vim version 7.0c. Last change: 2006 Mar 11 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index 7c0fc6a00..9374f1058 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -1,4 +1,4 @@ -*workshop.txt* For Vim version 7.0b. Last change: 2005 Mar 29 +*workshop.txt* For Vim version 7.0c. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Gordon Prieur diff --git a/runtime/doc/xxd-fr.UTF-8.1 b/runtime/doc/xxd-fr.UTF-8.1 index d57545850..bab572c81 100644 --- a/runtime/doc/xxd-fr.UTF-8.1 +++ b/runtime/doc/xxd-fr.UTF-8.1 @@ -24,9 +24,9 @@ binaire ou de l'entrée standard. Il peut également convertir un fichier de codes hexadécimaux en un fichier binaire. Comme -.BR uuencode(1) +.BR uuencode (1) et -.BR uudecode(1) +.BR uudecode (1) il permet la transmission de données binaires dans une représentation ASCII compatible avec le courrier électronique, mais a l'avantage de décoder la sortie standard. @@ -126,19 +126,19 @@ supplémentaires sont autorisés à n'importe quel endroit. .TP .I \-seek décalage Utilisé après l'option -.I \-r -\: inverse la conversion en ajoutant +.IR \-r : +inverse la conversion en ajoutant .RI < décalage > aux positions dans le fichier données dans le code hexadécimal. .TP -.I \-s [\+][\-]décalage +.I \-s [+][\-]décalage Débute au .RI < décalage > absolu ou relatif dans fichier_entree. -\fI\+ \fRindique que le décalage est relatif à la position courante dans +\fI+ fRindique que le décalage est relatif à la position courante dans l'entrée standard (sans effet si la lecture n'a pas lieu sur l'entrée standard). \fI\- \fRindique un décalage en caractères depuis la fin de -l'entrée (utilisé avec \fI \+ \fR, désigne la position avant la position +l'entrée (utilisé avec \fI+\fR, désigne la position avant la position actuelle de l'entrée standard). Sans l'option \-s, xxd démarre à la position courante du fichier. .TP @@ -177,12 +177,12 @@ Remarquez la différence entre .br et .br -\fI% xxd \-i \< fichier\fR +\fI% xxd \-i < fichier\fR .PP .I xxd \-s \+seek peut différer de -.I xxd \-s seek -\, car lseek(2) est utilisé pour « revenir en arrière ». Le '+' fait une +.IR "xxd \-s seek" , +car lseek(2) est utilisé pour « revenir en arrière ». Le '+' fait une différence quand la source des données est l'entrée standard et si la position dans le fichier de l'entrée standard n'est pas au début du fichier lorsque xxd est démarré et qu'il reçoit ses données. @@ -201,7 +201,7 @@ ajouté aux 1024 octets comptabilisés pour dd. \fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +128 > donnees_hexa' < fichier\fR .PP -Convertir de fichier depuis la position 0x100 (= 1024 - 768) du fichier. +Convertir de fichier depuis la position 0x100 (= 1024 \- 768) du fichier. .br \fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +\-768 > donnees_hexa' < fichier\fR diff --git a/runtime/doc/xxd.1 b/runtime/doc/xxd.1 index 304627596..d6e782a4e 100644 --- a/runtime/doc/xxd.1 +++ b/runtime/doc/xxd.1 @@ -161,7 +161,7 @@ and .br \fI% xxd \-i < file\fR .PP -.I xxd \-s \+seek +.I xxd \-s +seek may be different from .IR "xxd \-s seek" , as lseek(2) is used to "rewind" input. A '+' @@ -172,17 +172,17 @@ The following examples may help to clarify (or further confuse!)... Rewind stdin before reading; needed because the `cat' has already read to the end of stdin. .br -\fI% sh \-c 'cat > plain_copy; xxd \-s 0 > hex_copy' < file +\fI% sh \-c "cat > plain_copy; xxd \-s 0 > hex_copy" < file .PP Hexdump from file position 0x480 (=1024+128) onwards. The `+' sign means "relative to the current position", thus the `128' adds to the 1k where dd left off. .br -\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +128 > hex_snippet' < file +\fI% sh \-c "dd of=plain_snippet bs=1k count=1; xxd \-s +128 > hex_snippet" < file .PP Hexdump from file position 0x100 ( = 1024\-768) on. .br -\fI% sh \-c 'dd of=plain_snippet bs=1k count=1; xxd \-s +-768 > hex_snippet' < file +\fI% sh \-c "dd of=plain_snippet bs=1k count=1; xxd \-s +\-768 > hex_snippet" < file .PP However, this is a rare situation and the use of `+' is rarely needed. The author prefers to monitor the effect of xxd with strace(1) or truss(1), whenever \-s is used. @@ -190,15 +190,13 @@ The author prefers to monitor the effect of xxd with strace(1) or truss(1), when .PP .br Print everything but the first three lines (hex 0x30 bytes) of -.B file -\. +.BR file . .br \fI% xxd \-s 0x30 file .PP .br Print 3 lines (hex 0x30 bytes) from the end of -.B file -\. +.BR file . .br \fI% xxd \-s \-0x30 file .PP @@ -259,13 +257,13 @@ to .B output_file and prepend 100 bytes of value 0x00. .br -\fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR +\fI% xxd input_file | xxd \-r \-s 100 > output_file\fR .br .br Patch the date in the file xxd.1 .br -\fI% echo '0000037: 3574 68' | xxd \-r \- xxd.1\fR +\fI% echo "0000037: 3574 68" | xxd \-r \- xxd.1\fR .br \fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR .br @@ -275,7 +273,7 @@ Patch the date in the file xxd.1 Create a 65537 byte file with all bytes 0x00, except for the last one which is 'A' (hex 0x41). .br -\fI% echo '010000: 41' | xxd \-r \> file\fR +\fI% echo "010000: 41" | xxd \-r > file\fR .PP .br Hexdump this file with autoskip. @@ -292,7 +290,7 @@ Create a 1 byte file containing a single 'A' character. The number after '\-r \-s' adds to the linenumbers found in the file; in effect, the leading bytes are suppressed. .br -\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR +\fI% echo "010000: 41" | xxd \-r \-s \-0x10000 > file\fR .PP Use xxd as a filter within an editor such as .B vim(1) @@ -355,7 +353,7 @@ This manual page documents xxd version 1.7 .br (c) 1990-1997 by Juergen Weigert .br -<jnweiger@informatik.uni-erlangen.de> +<jnweiger@informatik.uni\-erlangen.de> .LP Distribute freely and credit me, .br diff --git a/runtime/doc/xxd.man b/runtime/doc/xxd.man index 894dfea35..935751c80 100644 --- a/runtime/doc/xxd.man +++ b/runtime/doc/xxd.man @@ -130,16 +130,16 @@ CAVEATS Rewind stdin before reading; needed because the `cat' has already read to the end of stdin. - % sh -c 'cat > plain_copy; xxd -s 0 > hex_copy' < file + % sh -c "cat > plain_copy; xxd -s 0 > hex_copy" < file Hexdump from file position 0x480 (=1024+128) onwards. The `+' sign means "relative to the current position", thus the `128' adds to the 1k where dd left off. - % sh -c 'dd of=plain_snippet bs=1k count=1; xxd -s +128 > hex_snippet' + % sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +128 > hex_snippet" < file Hexdump from file position 0x100 ( = 1024-768) on. - % sh -c 'dd of=plain_snippet bs=1k count=1; xxd -s +-768 > hex_snippet' + % sh -c "dd of=plain_snippet bs=1k count=1; xxd -s +-768 > hex_snippet" < file However, this is a rare situation and the use of `+' is rarely needed. @@ -147,10 +147,10 @@ CAVEATS truss(1), whenever -s is used. EXAMPLES - Print everything but the first three lines (hex 0x30 bytes) of file + Print everything but the first three lines (hex 0x30 bytes) of file. % xxd -s 0x30 file - Print 3 lines (hex 0x30 bytes) from the end of file + Print 3 lines (hex 0x30 bytes) from the end of file. % xxd -s -0x30 file Print 120 bytes as continuous hexdump with 40 octets per line. @@ -183,13 +183,13 @@ EXAMPLES % xxd input_file | xxd -r -s 100 > output_file Patch the date in the file xxd.1 - % echo '0000037: 3574 68' | xxd -r - xxd.1 + % echo "0000037: 3574 68" | xxd -r - xxd.1 % xxd -s 0x36 -l 13 -c 13 xxd.1 0000036: 3235 7468 204d 6179 2031 3939 36 25th May 1996 Create a 65537 byte file with all bytes 0x00, except for the last one which is 'A' (hex 0x41). - % echo '010000: 41' | xxd -r > file + % echo "010000: 41" | xxd -r > file Hexdump this file with autoskip. % xxd -a -c 12 file @@ -200,7 +200,7 @@ EXAMPLES Create a 1 byte file containing a single 'A' character. The number after '-r -s' adds to the linenumbers found in the file; in effect, the leading bytes are suppressed. - % echo '010000: 41' | xxd -r -s -0x10000 > file + % echo "010000: 41" | xxd -r -s -0x10000 > file Use xxd as a filter within an editor such as vim(1) to hexdump a region marked between `a' and `z'. diff --git a/runtime/spell/en.ascii.spl b/runtime/spell/en.ascii.spl Binary files differindex c7d5fefef..fd4ba8974 100644 --- a/runtime/spell/en.ascii.spl +++ b/runtime/spell/en.ascii.spl diff --git a/runtime/spell/en.ascii.sug b/runtime/spell/en.ascii.sug Binary files differindex 60055c680..d68c5a5de 100644 --- a/runtime/spell/en.ascii.sug +++ b/runtime/spell/en.ascii.sug diff --git a/runtime/spell/en.latin1.spl b/runtime/spell/en.latin1.spl Binary files differindex ee14a82e1..33be1a06b 100644 --- a/runtime/spell/en.latin1.spl +++ b/runtime/spell/en.latin1.spl diff --git a/runtime/spell/en.latin1.sug b/runtime/spell/en.latin1.sug Binary files differindex 736466970..913ebee26 100644 --- a/runtime/spell/en.latin1.sug +++ b/runtime/spell/en.latin1.sug diff --git a/runtime/spell/en.utf-8.spl b/runtime/spell/en.utf-8.spl Binary files differindex d4fea2a8c..af8afc514 100644 --- a/runtime/spell/en.utf-8.spl +++ b/runtime/spell/en.utf-8.spl diff --git a/runtime/spell/en.utf-8.sug b/runtime/spell/en.utf-8.sug Binary files differindex c1943a304..8ae442ac4 100644 --- a/runtime/spell/en.utf-8.sug +++ b/runtime/spell/en.utf-8.sug diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim index 26f5deeb6..7ce8cde04 100644 --- a/runtime/syntax/help.vim +++ b/runtime/syntax/help.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Vim help file " Maintainer: Bram Moolenaar (Bram@vim.org) -" Last Change: 2005 Sep 01 +" Last Change: 2006 Mar 26 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -106,7 +106,7 @@ syn match helpUnderlined "\t[* ]Underlined\t\+[a-z].*" syn match helpError "\t[* ]Error\t\+[a-z].*" syn match helpTodo "\t[* ]Todo\t\+[a-z].*" -syn match helpURL `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' <>"]+)[a-z0-9/]` +syn match helpURL `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' <>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' <>"]+)[a-zA-Z0-9/]` " Additionally load a language-specific syntax file "help_ab.vim". let s:i = match(expand("%"), '\.\a\ax$') diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim index f4a90c62c..0b56011be 100644 --- a/runtime/syntax/rcs.vim +++ b/runtime/syntax/rcs.vim @@ -1,13 +1,13 @@ " Vim syntax file -" Language: RCS file -" Maintainer: Dmitry Vasiliev <dima@hlabs.spb.ru> -" URL: http://www.hlabs.spb.ru/vim/rcs.vim -" Last Change: $Date$ -" Filenames: *,v -" $Revision$ -" +" Language: RCS file +" Maintainer: Dmitry Vasiliev <dima at hlabs dot spb dot ru> +" URL: http://www.hlabs.spb.ru/vim/rcs.vim +" Revision: $Id$ +" Filenames: *,v +" Version: 1.11 + " Options: -" rcs_folding = 1 For folding strings +" rcs_folding = 1 For folding strings " For version 5.x: Clear all syntax items. " For version 6.x: Quit when a syntax file was already loaded. @@ -18,28 +18,28 @@ elseif exists("b:current_syntax") endif " RCS file must end with a newline. -syn match rcsEOFError ".\%$" containedin=ALL +syn match rcsEOFError ".\%$" containedin=ALL " Keywords. -syn keyword rcsKeyword head branch access symbols locks strict -syn keyword rcsKeyword comment expand date author state branches -syn keyword rcsKeyword next desc log -syn keyword rcsKeyword text nextgroup=rcsTextStr skipwhite skipempty +syn keyword rcsKeyword head branch access symbols locks strict +syn keyword rcsKeyword comment expand date author state branches +syn keyword rcsKeyword next desc log +syn keyword rcsKeyword text nextgroup=rcsTextStr skipwhite skipempty " Revision numbers and dates. -syn match rcsNumber "\<[0-9.]\+\>" display +syn match rcsNumber "\<[0-9.]\+\>" display " Strings. if exists("rcs_folding") && has("folding") " Folded strings. - syn region rcsString matchgroup=rcsString start="@" end="@" skip="@@" fold contains=rcsSpecial - syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" fold contained contains=rcsSpecial,rcsDiffLines + syn region rcsString matchgroup=rcsString start="@" end="@" skip="@@" fold contains=rcsSpecial + syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" fold contained contains=rcsSpecial,rcsDiffLines else - syn region rcsString matchgroup=rcsString start="@" end="@" skip="@@" contains=rcsSpecial - syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" contained contains=rcsSpecial,rcsDiffLines + syn region rcsString matchgroup=rcsString start="@" end="@" skip="@@" contains=rcsSpecial + syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" contained contains=rcsSpecial,rcsDiffLines endif -syn match rcsSpecial "@@" contained -syn match rcsDiffLines "[da]\d\+ \d\+$" contained +syn match rcsSpecial "@@" contained +syn match rcsDiffLines "[da]\d\+ \d\+$" contained " Synchronization. syn sync clear @@ -47,8 +47,8 @@ if exists("rcs_folding") && has("folding") syn sync fromstart else " We have incorrect folding if following sync patterns is turned on. - syn sync match rcsSync grouphere rcsString "[0-9.]\+\(\s\|\n\)\+log\(\s\|\n\)\+@"me=e-1 - syn sync match rcsSync grouphere rcsTextStr "@\(\s\|\n\)\+text\(\s\|\n\)\+@"me=e-1 + syn sync match rcsSync grouphere rcsString "[0-9.]\+\(\s\|\n\)\+log\(\s\|\n\)\+@"me=e-1 + syn sync match rcsSync grouphere rcsTextStr "@\(\s\|\n\)\+text\(\s\|\n\)\+@"me=e-1 endif " Define the default highlighting. @@ -62,13 +62,13 @@ if version >= 508 || !exists("did_rcs_syn_inits") command -nargs=+ HiLink hi def link <args> endif - HiLink rcsKeyword Keyword - HiLink rcsNumber Identifier - HiLink rcsString String - HiLink rcsTextStr String - HiLink rcsSpecial Special - HiLink rcsDiffLines Special - HiLink rcsEOFError Error + HiLink rcsKeyword Keyword + HiLink rcsNumber Identifier + HiLink rcsString String + HiLink rcsTextStr String + HiLink rcsSpecial Special + HiLink rcsDiffLines Special + HiLink rcsEOFError Error delcommand HiLink endif diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim index 5ec3236c5..d691ba15c 100644 --- a/runtime/syntax/svn.vim +++ b/runtime/syntax/svn.vim @@ -1,9 +1,13 @@ " Vim syntax file -" Language: Subversion (svn) commit file -" Maintainer: Dmitry Vasiliev <dima@hlabs.spb.ru> -" URL: http://www.hlabs.spb.ru/vim/svn.vim -" Last Change: $Date$ -" $Revision$ +" Language: Subversion (svn) commit file +" Maintainer: Dmitry Vasiliev <dima at hlabs dot spb dot ru> +" URL: http://www.hlabs.spb.ru/vim/svn.vim +" Revision: $Id$ +" Filenames: svn-commit*.tmp +" Version: 1.5 + +" Contributors: +" Stefano Zacchiroli " For version 5.x: Clear all syntax items. " For version 6.x: Quit when a syntax file was already loaded. @@ -13,15 +17,15 @@ elseif exists("b:current_syntax") finish endif -syn region svnRegion start="--This line, and those below, will be ignored--" end="\%$" contains=ALL -syn match svnRemoved "^D .*$" contained -syn match svnAdded "^A[ M] .*$" contained -syn match svnModified "^M[ M] .*$" contained -syn match svnProperty "^_M .*$" contained +syn region svnRegion start="^--.*--$" end="\%$" contains=ALL +syn match svnRemoved "^D .*$" contained +syn match svnAdded "^A[ M] .*$" contained +syn match svnModified "^M[ M] .*$" contained +syn match svnProperty "^_M .*$" contained " Synchronization. syn sync clear -syn sync match svnSync grouphere svnRegion "--This line, and those below, will be ignored--"me=s-1 +syn sync match svnSync grouphere svnRegion "^--.*--$"me=s-1 " Define the default highlighting. " For version 5.7 and earlier: only when not done already. @@ -34,11 +38,11 @@ if version >= 508 || !exists("did_svn_syn_inits") command -nargs=+ HiLink hi def link <args> endif - HiLink svnRegion Comment - HiLink svnRemoved Constant - HiLink svnAdded Identifier - HiLink svnModified Special - HiLink svnProperty Special + HiLink svnRegion Comment + HiLink svnRemoved Constant + HiLink svnAdded Identifier + HiLink svnModified Special + HiLink svnProperty Special delcommand HiLink endif diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg index 604e91160..b59234564 100644 --- 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.0b] - "DisplayName"="Vim 7.0b: Edit with Vim popup menu entry" +[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0c] + "DisplayName"="Vim 7.0c: Edit with Vim popup menu entry" "UninstallString"="uninstal.exe" diff --git a/src/Makefile b/src/Makefile index 5ac4cee3c..15d954d54 100644 --- a/src/Makefile +++ b/src/Makefile @@ -880,7 +880,7 @@ MAN1DIR = /man1 ### Vim version (adjusted by a script) VIMMAJOR = 7 -VIMMINOR = 0b +VIMMINOR = 0c ### Location of Vim files (should not need to be changed, and {{{1 ### some things might not work when they are changed!) diff --git a/src/feature.h b/src/feature.h index a92fedd96..5d395d737 100644 --- a/src/feature.h +++ b/src/feature.h @@ -753,7 +753,8 @@ /* * GUI tabline */ -#if defined(FEAT_GUI_GTK) && defined(FEAT_WINDOWS) +#if defined(FEAT_WINDOWS) && (defined(FEAT_GUI_GTK) \ + || (defined(FEAT_GUI_MSWIN) && WINVER > 0x0400)) # define FEAT_GUI_TABLINE #endif @@ -1142,6 +1142,11 @@ gui_position_components(total_width) text_area_y = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; #endif +#if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) + if (gui_has_tabline()) + text_area_y += TABLINE_HEIGHT; +#endif + #if defined(FEAT_TOOLBAR) && (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) if (vim_strchr(p_go, GO_TOOLBAR) != NULL) { @@ -1223,6 +1228,10 @@ gui_get_base_height() base_height += gui.toolbar_height; # endif # endif +# if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) + if (gui_has_tabline()) + base_height += TABLINE_HEIGHT; +# endif # ifdef FEAT_FOOTER if (vim_strchr(p_go, GO_FOOTER) != NULL) base_height += gui.footer_height; @@ -3924,6 +3933,11 @@ gui_update_scrollbars(force) # endif #endif +#if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) + if (gui_has_tabline()) + y += TABLINE_HEIGHT; +#endif + #ifdef FEAT_WINDOWS if (wp->w_winrow == 0) #endif @@ -158,6 +158,10 @@ #endif #define TOOLBAR_BORDER_HEIGHT 12 /* room above+below buttons for MSWindows */ +#ifdef FEAT_GUI_MSWIN +# define TABLINE_HEIGHT 24 +#endif + #if defined(NO_CONSOLE) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) # define NO_CONSOLE_INPUT /* use no_console_input() to check if there is no console input possible */ diff --git a/src/gui_mac.icns b/src/gui_mac.icns Binary files differindex b65fa11d8..8405dc127 100644 --- a/src/gui_mac.icns +++ b/src/gui_mac.icns diff --git a/src/gui_w32.c b/src/gui_w32.c index 12d607146..b25f50db9 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -297,6 +297,10 @@ static void initialise_toolbar(void); static int get_toolbar_bitmap(vimmenu_T *menu); #endif +#ifdef FEAT_GUI_TABLINE +static void initialise_tabline(void); +#endif + #ifdef FEAT_MBYTE_IME static LRESULT _OnImeComposition(HWND hwnd, WPARAM dbcs, LPARAM param); static char_u *GetResultStr(HWND hwnd, int GCS, int *lenp); @@ -760,10 +764,11 @@ _WndProc( case WM_SETTINGCHANGE: return _OnSettingChange((UINT)wParam); -#ifdef FEAT_TOOLBAR +#if defined(FEAT_TOOLBAR) || defined(FEAT_GUI_TABLINE) case WM_NOTIFY: switch (((LPNMHDR) lParam)->code) { +# ifdef FEAT_TOOLBAR case TTN_NEEDTEXT: { LPTOOLTIPTEXT lpttt; @@ -785,7 +790,20 @@ _WndProc( } } break; +# endif +# ifdef FEAT_GUI_TABLINE + case TCN_SELCHANGE: + if (gui_mch_showing_tabline() + && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd) + send_tabline_event(TabCtrl_GetCurSel(s_tabhwnd) + 1); + break; +# endif default: +# ifdef FEAT_GUI_TABLINE + if (gui_mch_showing_tabline() + && ((LPNMHDR)lParam)->hwndFrom == s_tabhwnd) + return MyWindowProc(hwnd, uMsg, wParam, lParam); +# endif break; } break; @@ -831,6 +849,19 @@ _WndProc( result = MyWindowProc(hwnd, uMsg, wParam, lParam); if (result == HTCLIENT) { +#ifdef FEAT_GUI_TABLINE + if (gui_mch_showing_tabline()) + { + int yPos = GET_Y_LPARAM(lParam); + RECT rct; + + /* If the cursor is on the GUI tabline, don't process this + * event */ + GetWindowRect(s_textArea, &rct); + if (yPos < rct.top) + return result; + } +#endif gui_mch_get_winpos(&x, &y); xPos -= x; @@ -1280,6 +1311,12 @@ gui_mch_init(void) */ initialise_toolbar(); #endif +#ifdef FEAT_GUI_TABLINE + /* + * Create the tabline + */ + initialise_tabline(); +#endif #ifdef MSWIN_FIND_REPLACE /* * Initialise the dialog box stuff @@ -3884,6 +3921,18 @@ get_toolbar_bitmap(vimmenu_T *menu) } #endif +#if defined(FEAT_GUI_TABLINE) || defined(PROTO) + static void +initialise_tabline(void) +{ + InitCommonControls(); + + s_tabhwnd = CreateWindow(WC_TABCONTROL, "", WS_CHILD|TCS_FOCUSNEVER, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, s_hwnd, NULL, s_hinst, NULL); +} +#endif + #if defined(FEAT_OLE) || defined(FEAT_EVAL) || defined(PROTO) /* * Make the GUI window come to the foreground. diff --git a/src/gui_w48.c b/src/gui_w48.c index 35c215ac9..b586af84f 100644 --- a/src/gui_w48.c +++ b/src/gui_w48.c @@ -28,7 +28,7 @@ #ifndef __MINGW32__ # include <shellapi.h> #endif -#if defined(FEAT_TOOLBAR) || defined(FEAT_BEVAL) +#if defined(FEAT_TOOLBAR) || defined(FEAT_BEVAL) || defined(FEAT_GUI_TABLINE) # include <commctrl.h> #endif #ifdef WIN16 @@ -170,6 +170,11 @@ static HBRUSH s_brush = NULL; static HWND s_toolbarhwnd = NULL; #endif +#ifdef FEAT_GUI_TABLINE +static HWND s_tabhwnd = NULL; +static int showing_tabline = 0; +#endif + static WPARAM s_wParam = 0; static LPARAM s_lParam = 0; @@ -1105,6 +1110,20 @@ gui_mch_set_text_area_pos(int x, int y, int w, int h) SendMessage(s_toolbarhwnd, WM_SIZE, (WPARAM)0, (LPARAM)(w + ((long)(TOOLBAR_BUTTON_HEIGHT+8)<<16))); #endif +#if defined(FEAT_GUI_TABLINE) + if (showing_tabline) + { + int top = 0; + +#ifdef FEAT_TOOLBAR + if (vim_strchr(p_go, GO_TOOLBAR) != NULL) + top = TOOLBAR_BUTTON_HEIGHT + TOOLBAR_BORDER_HEIGHT; +#endif + + MoveWindow(s_tabhwnd, 0, top, w, TABLINE_HEIGHT, TRUE); + } +#endif + /* When side scroll bar is unshown, the size of window will change. * then, the text area move left or right. thus client rect should be * forcely redraw. (Yasuhiro Matsumoto) */ @@ -2156,6 +2175,95 @@ gui_mch_show_toolbar(int showit) #endif +#if defined(FEAT_GUI_TABLINE) || defined(PROTO) +/* + * Show or hide the tabline. + */ + void +gui_mch_show_tabline(int showit) +{ + if (s_tabhwnd == NULL) + return; + + if (!showit != !showing_tabline) + { + if (showit) + ShowWindow(s_tabhwnd, SW_SHOW); + else + ShowWindow(s_tabhwnd, SW_HIDE); + showing_tabline = showit; + } +} + +/* + * Return TRUE when tabline is displayed. + */ + int +gui_mch_showing_tabline(void) +{ + return s_tabhwnd != NULL && showing_tabline; +} + +/* + * Update the labels of the tabline. + */ + void +gui_mch_update_tabline(void) +{ + tabpage_T *tp; + TCITEM tie; + int nr = 0; + int curtabidx = 0; + RECT rc; + + if (s_tabhwnd == NULL) + return; + + tie.mask = TCIF_TEXT; + tie.iImage = -1; + + /* Add a label for each tab page. They all contain the same text area. */ + for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr) + { + if (tp == curtab) + curtabidx = nr; + + if (!TabCtrl_GetItemRect(s_tabhwnd, nr, &rc)) + { + /* Add the tab */ + tie.pszText = "-Empty-"; + TabCtrl_InsertItem(s_tabhwnd, nr, &tie); + } + + get_tabline_label(tp); + tie.pszText = NameBuff; + TabCtrl_SetItem(s_tabhwnd, nr, &tie); + } + + /* Remove any old labels. */ + while (TabCtrl_GetItemRect(s_tabhwnd, nr, &rc)) + TabCtrl_DeleteItem(s_tabhwnd, nr); + + if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx) + TabCtrl_SetCurSel(s_tabhwnd, curtabidx); +} + +/* + * Set the current tab to "nr". First tab is 1. + */ + void +gui_mch_set_curtab(nr) + int nr; +{ + if (s_tabhwnd == NULL) + return; + + if (TabCtrl_GetCurSel(s_tabhwnd) != nr) + TabCtrl_SetCurSel(s_tabhwnd, nr); +} + +#endif + /* * ":simalt" command. */ diff --git a/src/message.c b/src/message.c index d25d48501..481236b96 100644 --- a/src/message.c +++ b/src/message.c @@ -4167,8 +4167,13 @@ vim_snprintf(str, str_m, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) { /* memchr on HP does not like n > 2^31 !!! */ char *q = memchr(str_arg, '\0', +#if SIZEOF_INT <= 2 + precision +#else precision <= (size_t)0x7fffffffL ? precision - : (size_t)0x7fffffffL); + : (size_t)0x7fffffffL +#endif + ); str_arg_l = (q == NULL) ? precision : q - str_arg; } break; diff --git a/src/misc1.c b/src/misc1.c index 00921dc9b..162864282 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3112,6 +3112,7 @@ get_number(colon, mouse_used) { int n = 0; int c; + int typed = 0; if (mouse_used != NULL) *mouse_used = FALSE; @@ -3134,11 +3135,16 @@ get_number(colon, mouse_used) { n = n * 10 + c - '0'; msg_putchar(c); + ++typed; } else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) { + if (typed > 0) + { + MSG_PUTS("\b \b"); + --typed; + } n /= 10; - MSG_PUTS("\b \b"); } #ifdef FEAT_MOUSE else if (mouse_used != NULL && c == K_LEFTMOUSE) diff --git a/src/option.c b/src/option.c index 4b669be72..e4195cf77 100644 --- a/src/option.c +++ b/src/option.c @@ -438,6 +438,16 @@ struct vimoption # define ISP_LATIN1 (char_u *)"@,161-255" #endif +/* The 16 bit MS-DOS version is low on space, make the string as short as + * possible when compiling with few features. */ +#if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \ + || defined(FEAT_VERTSPLIT) || defined(FEAT_CLIPBOARD) \ + || defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) +# define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine" +#else +# define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,t:Title,v:Visual,w:WarningMsg,W:WildMenu,>:SignColumn,*:TabLine,#:TabLineSel,_:TabLineFill" +#endif + /* * options[] is initialized here. * The order of the options MUST be alphabetic for ":set all" and findoption(). @@ -1284,8 +1294,7 @@ static struct vimoption {(char_u *)FALSE, (char_u *)0L}}, {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, (char_u *)&p_hl, PV_NONE, - {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine", - (char_u *)0L}}, + {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}}, {"history", "hi", P_NUM|P_VIM, (char_u *)&p_hi, PV_NONE, {(char_u *)0L, (char_u *)20L}}, diff --git a/src/proto/gui_w16.pro b/src/proto/gui_w16.pro index 4ca3ded53..6a22c3e9a 100644 --- a/src/proto/gui_w16.pro +++ b/src/proto/gui_w16.pro @@ -34,6 +34,10 @@ extern void gui_mch_draw_menubar __ARGS((void)); extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); extern void gui_mch_activate_window __ARGS((void)); extern void gui_mch_show_toolbar __ARGS((int showit)); +extern void gui_mch_show_tabline __ARGS((int showit)); +extern int gui_mch_showing_tabline __ARGS((void)); +extern void gui_mch_update_tabline __ARGS((void)); +extern void gui_mch_set_curtab __ARGS((int nr)); extern void ex_simalt __ARGS((exarg_T *eap)); extern void gui_mch_find_dialog __ARGS((exarg_T *eap)); extern void gui_mch_replace_dialog __ARGS((exarg_T *eap)); diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro index 9e411565e..731636d1e 100644 --- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -34,6 +34,10 @@ extern void gui_mch_draw_menubar __ARGS((void)); extern long_u gui_mch_get_rgb __ARGS((guicolor_T pixel)); extern void gui_mch_activate_window __ARGS((void)); extern void gui_mch_show_toolbar __ARGS((int showit)); +extern void gui_mch_show_tabline __ARGS((int showit)); +extern int gui_mch_showing_tabline __ARGS((void)); +extern void gui_mch_update_tabline __ARGS((void)); +extern void gui_mch_set_curtab __ARGS((int nr)); extern void ex_simalt __ARGS((exarg_T *eap)); extern void gui_mch_find_dialog __ARGS((exarg_T *eap)); extern void gui_mch_replace_dialog __ARGS((exarg_T *eap)); diff --git a/src/spell.c b/src/spell.c index c2bf58d01..32ce2b49d 100644 --- a/src/spell.c +++ b/src/spell.c @@ -4667,7 +4667,6 @@ struct affentry_S char_u *ae_flags; /* flags on the affix (can be NULL) */ char_u *ae_cond; /* condition (NULL for ".") */ regprog_T *ae_prog; /* regexp program for ae_cond or NULL */ - char_u ae_nocomp; /* word with affix not compoundable */ }; #ifdef FEAT_MBYTE @@ -5474,7 +5473,6 @@ spell_read_aff(spin, fname) && itemcnt >= 5) { affentry_T *aff_entry; - int nocomp = FALSE; int upper = FALSE; int lasti = 5; @@ -5492,7 +5490,6 @@ spell_read_aff(spin, fname) sizeof(affentry_T), TRUE); if (aff_entry == NULL) break; - aff_entry->ae_nocomp = nocomp; if (STRCMP(items[2], "0") != 0) aff_entry->ae_chop = getroom_save(spin, items[2]); diff --git a/src/undo.c b/src/undo.c index 8d23e7702..efbd4ccf4 100644 --- a/src/undo.c +++ b/src/undo.c @@ -1387,7 +1387,7 @@ u_add_time(buf, buflen, tt) if (time(NULL) - tt >= 100) { curtime = localtime(&tt); - (void)strftime((char *)buf, buflen, "%T", curtime); + (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime); } else #endif diff --git a/src/version.h b/src/version.h index 965ee8362..ce5ff07de 100644 --- a/src/version.h +++ b/src/version.h @@ -19,9 +19,9 @@ #define VIM_VERSION_MINOR_STR "0" #define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR) -#define VIM_VERSION_BUILD 257 -#define VIM_VERSION_BUILD_BCD 0x101 -#define VIM_VERSION_BUILD_STR "257" +#define VIM_VERSION_BUILD 258 +#define VIM_VERSION_BUILD_BCD 0x102 +#define VIM_VERSION_BUILD_STR "258" #define VIM_VERSION_PATCHLEVEL 0 #define VIM_VERSION_PATCHLEVEL_STR "0" /* Used by MacOS port should be one of: development, alpha, beta, final */ @@ -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 "vim70b" -#define VIM_VERSION_SHORT "7.0b" -#define VIM_VERSION_MEDIUM "7.0b BETA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0b BETA (2006 Mar 26)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0b BETA (2006 Mar 26, compiled " +#define VIM_VERSION_NODOT "vim70c" +#define VIM_VERSION_SHORT "7.0c" +#define VIM_VERSION_MEDIUM "7.0c BETA" +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0c BETA (2006 Mar 27)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0c BETA (2006 Mar 27, compiled " |