diff --git a/Contents b/Contents
index 9c1d4912f6cfd0904abca9f22d9dfdc9e74ed991..7c8eb1e1f9ac86b4823d26fae7199eb479f83fb0 100644
--- a/Contents
+++ b/Contents
@@ -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.0d. Also runs under UNIX, MSDOS and other systems.
- vim70drt.tgz contains the documentation and syntax files.
- vim70dbin.tgz contains the binaries.
- vim70dsrc.tgz contains the sources.
+ Version 7.0e. Also runs under UNIX, MSDOS and other systems.
+ vim70ert.tgz contains the documentation and syntax files.
+ vim70ebin.tgz contains the binaries.
+ vim70esrc.tgz contains the sources.
Author: Bram Moolenaar et al.
diff --git a/Makefile b/Makefile
index 57acddee548fdc042c635692605f02021151201a..c8789295ff30480e0ccd06f76fb644e2cf750f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -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 = 0d
+MINOR = 0e
# Uncomment this line if the Win32s version is to be included.
DOSBIN_S = dosbin_s
@@ -159,7 +159,7 @@ DOSBIN_S = dosbin_s
# - The produced uninstalw32.exe and vimrun.exe are used.
# Create the archives:
# - Copy all the "*.exe" files to where this Makefile is.
-# - Copy all the "*.pdb" files to the dist directory.
+# - Copy all the "*.pdb" files to where this Makefile is.
# - "make dosbin".
# - Run make on Unix to update the ".mo" files.
# - "make doslang".
diff --git a/README.txt b/README.txt
index fda27ec63c3be142e6ec186dacaee7b80f535eab..1aef76e46d61729628275f1341e3b009309a3a90 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README.txt for version 7.0d of Vim: Vi IMproved.
+README.txt for version 7.0e of Vim: Vi IMproved.
WHAT IS VIM
diff --git a/README_ami.txt b/README_ami.txt
index 235c58034b5527c8593edba910725872c01032c9..12be43a59c9522e9bccb92402e72f9fa83b672f9 100644
--- a/README_ami.txt
+++ b/README_ami.txt
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.0d of Vim: Vi IMproved.
+README_ami.txt for version 7.0e 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 0472b337823a5d1feb771652c5e01dd06cfffb3d..e862bed0b4ef3b326cc238337929afd0695f4fae 100644
--- a/README_amibin.txt
+++ b/README_amibin.txt
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.0d of Vim: Vi IMproved.
+README_amibin.txt for version 7.0e 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 9f04889fabe104ea2071bd6cbd677b7efa06a107..3ff6e5061bddbffa2439165a2069245a82e27212 100644
--- a/README_amisrc.txt
+++ b/README_amisrc.txt
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.0d of Vim: Vi IMproved.
+README_amisrc.txt for version 7.0e 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 7cef002a15efd839e639c2594b0d77bac3534f15..6ac0224d879cfe212d91091a1f7a05c920ecbc78 100644
--- a/README_bindos.txt
+++ b/README_bindos.txt
@@ -1,4 +1,4 @@
-README_bindos.txt for version 7.0d of Vim: Vi IMproved.
+README_bindos.txt for version 7.0e 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 976fad4461a75175dedf0ebe99148d468c0c90a7..13da4f9bae33ac8809ea366672a39086d15a4f37 100644
--- a/README_dos.txt
+++ b/README_dos.txt
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.0d of Vim: Vi IMproved.
+README_dos.txt for version 7.0e 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 8edf54942bdc3df3b7b5e68565542ee272e81a0a..eb8a2099e4a91ef39311aefc05b33723758bb17d 100644
--- a/README_extra.txt
+++ b/README_extra.txt
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.0d of Vim: Vi IMproved.
+README_extra.txt for version 7.0e 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 7761db9ff8cbfa7f35279a30d99b1098579bba34..33219df6203e831739dfc75becf813d8da8b3f5b 100644
--- a/README_lang.txt
+++ b/README_lang.txt
@@ -1,4 +1,4 @@
-README_lang.txt for version 7.0d of Vim: Vi IMproved.
+README_lang.txt for version 7.0e 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 6d8c2b74288fa10846b85a21874a0bf958322f91..3a9857b8f1d4421c2cb7d752df905f8060323325 100644
--- a/README_mac.txt
+++ b/README_mac.txt
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.0d of Vim: Vi IMproved.
+README_mac.txt for version 7.0e 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 7c33ce75efff4824190048d29a04d21d98a26ddf..76026b6b67079bd829c88f4e62b3309d9921e600 100644
--- a/README_ole.txt
+++ b/README_ole.txt
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.0d of Vim: Vi IMproved.
+README_ole.txt for version 7.0e 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 8939a306ccc36e7aac1de842b12618873474c50c..44fc981dcb0e628bf40090273400f0fda01a4a0a 100644
--- a/README_os2.txt
+++ b/README_os2.txt
@@ -1,4 +1,4 @@
-README_os2.txt for version 7.0d of Vim: Vi IMproved.
+README_os2.txt for version 7.0e 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 d689e2ae7719bb957dd5674cf71f83fdd6291e0a..6f15190d0427c7ed6ca9431f4e9af3c0a5d328d5 100644
--- a/README_os390.txt
+++ b/README_os390.txt
@@ -1,4 +1,4 @@
-README_os_390.txt for version 7.0d of Vim: Vi IMproved.
+README_os_390.txt for version 7.0e of Vim: Vi IMproved.
Welcome to the OS/390 Unix port of VIM.
diff --git a/README_src.txt b/README_src.txt
index cb59273e8a8e06ab1141113a6ce814fcc1ff9fd4..12f499be0860b7d655251fa029c937a0effdc83a 100644
--- a/README_src.txt
+++ b/README_src.txt
@@ -1,4 +1,4 @@
-README_src.txt for version 7.0d of Vim: Vi IMproved.
+README_src.txt for version 7.0e 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 b59c8d34d78236b873f54e50804e10ef736d1fb6..755112796912682962ef2d0cf1c3bed3025a3389 100644
--- a/README_srcdos.txt
+++ b/README_srcdos.txt
@@ -1,4 +1,4 @@
-README_srcdos.txt for version 7.0d of Vim: Vi IMproved.
+README_srcdos.txt for version 7.0e 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 726ce6a5985c25e41f78edfa19488d42d13e6bec..8be1ec0c9d1139a84220d82c5c73305163f20f30 100644
--- a/README_unix.txt
+++ b/README_unix.txt
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.0d of Vim: Vi IMproved.
+README_unix.txt for version 7.0e 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 b97e88ebeb16e3d486f683288c3f26b7c60a511c..af7cc575e2219dc34b068099e7829d30c94f4da5 100644
--- a/README_vms.txt
+++ b/README_vms.txt
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.0d of Vim: Vi IMproved.
+README_vms.txt for version 7.0e 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 8aa007eaca8d1e4538a7926a8fd52da80d5d2e73..b80b5b42cb2067ed36881ba9f0f6372cc3c3a0ef 100644
--- a/README_w32s.txt
+++ b/README_w32s.txt
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.0d of Vim: Vi IMproved.
+README_w32s.txt for version 7.0e 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 e885e63a2a6bf8440929d885193bebde9de60288..d59d6c77aea2ac394a1d69467c4d04a6882b55b2 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -22,7 +22,7 @@
!define HAVE_NLS
!define VER_MAJOR 7
-!define VER_MINOR 0d
+!define VER_MINOR 0e
# ----------- No configurable settings below this line -----------
diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim
index 8cb4db0366f41ee5f1a3ed695a90b9d139521f07..1953aa2f86004aab579fc4052a803f80e62af6eb 100644
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
@@ -1,15 +1,14 @@
" Vim completion script
" Language: PHP
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2006 Apr 05
+" Last Change: 2006 Apr 15
"
" TODO:
" - Class aware completion:
-" a) additional analize of tags file(s)
-" b) "live" parsing of data, maybe with caching
+" a) caching?
" - Switching to HTML (XML?) completion (SQL) inside of phpStrings
-" - allow also for XML completion
-" - better 'info', 'menu'
+" - allow also for XML completion <- better do html_flavor for HTML
+" completion
" - outside of <?php?> getting parent tag may cause problems. Heh, even in
" perfect conditions GetLastOpenTag doesn't cooperate... Inside of
" phpStrings this can be even a bonus but outside of <?php?> it is not the
@@ -563,12 +562,13 @@ function! phpcomplete#GetClassName(scontext) " {{{
exe 'silent! vimgrep /^'.object.'.*\$'.object.'.*=\s*new\s\+.*\tv\(\t\|$\)/j '.fnames
let qflist = getqflist()
if len(qflist) == 0
- return []
+ return ''
+ else
+ " In all properly managed projects it should be one item list, even if it
+ " *is* longer we cannot solve conflicts, assume it is first element
+ let classname = matchstr(qflist[0]['text'], '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
+ return classname
endif
- " In all properly managed projects it should be one item list, even if it
- " *is* longer we cannot solve conflicts, assume it is first element
- let classname = matchstr(qflist[0]['text'], '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
- return classname
endfunction
" }}}
@@ -577,7 +577,7 @@ function! phpcomplete#GetClassLocation(classname) " {{{
for fname in tagfiles()
let fhead = fnamemodify(fname, ":h")
if fhead != ''
- let psep = '/'
+ let psep = '/' " Note: slash is potential problem!
let fhead .= psep
endif
let fname = escape(fname, " \\")
@@ -587,9 +587,10 @@ function! phpcomplete#GetClassLocation(classname) " {{{
let classlocation = matchstr(qflist[0]['text'], '\t\zs\f\+\ze\t')
" And only one class location
if classlocation != ''
- let pset = '/' " Note: slash is potential problem!
let classlocation = fhead.classlocation
return classlocation
+ else
+ return ''
endif
endfor
diff --git a/runtime/colors/slate.vim b/runtime/colors/slate.vim
index b948b602cdcd5c94b33b2a90aa673cac2781ead5..1224221367046c4e56547da949086ea9300b1c74 100644
--- a/runtime/colors/slate.vim
+++ b/runtime/colors/slate.vim
@@ -28,7 +28,7 @@ endif
:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
:hi WarningMsg guifg=salmon ctermfg=1
:hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=#80a0ff
+:hi Comment term=bold ctermfg=11 guifg=grey40
:hi Constant guifg=#ffa0a0 ctermfg=brown
:hi Special guifg=green ctermfg=brown
:hi Identifier guifg=salmon ctermfg=red
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
index 2fab11b3980efb989e941fe3d54097ccdfcffaca..9df10ba51b2749037a9eccc5955278ad6c9610ba 100644
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*arabic.txt* For Vim version 7.0e. Last change: 2005 Mar 29
VIM REFERENCE MANUAL by Nadim Shaikli
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index c44f6d2ec04f3eaae12776f4395db29d21137e3d..63fd6f4971fd61f529e2f2362c4c4198bc91bb13 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.0d. Last change: 2006 Apr 07
+*autocmd.txt* For Vim version 7.0e. Last change: 2006 Apr 07
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 4aebe30c8b647f32f042fae068497c581e50384c..cdfc6ab0bd3a559a452aaffcc4fc63c8f38057fb 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt* For Vim version 7.0d. Last change: 2006 Apr 11
+*change.txt* For Vim version 7.0e. Last change: 2006 Apr 11
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 060c8a14908b73b53a3158338384c4308bc15f7d..19b3c2fa9ca337a06c784d185f47bae4473e8575 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt* For Vim version 7.0d. Last change: 2006 Mar 16
+*cmdline.txt* For Vim version 7.0e. Last change: 2006 Mar 16
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index 822b723e0e43ab76ce5a162956657fb63e623a5c..f464aa9a5adc061487b18c97fe39bd301103d542 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt* For Vim version 7.0d. Last change: 2005 Dec 17
+*debug.txt* For Vim version 7.0e. Last change: 2005 Dec 17
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index aa2a48bc9bf2723d91284cca480bda07e2fee9e3..a3ec0a7bb71e52cd7c39c60964c1b562c1babdff 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*debugger.txt* For Vim version 7.0e. Last change: 2005 Mar 29
VIM REFERENCE MANUAL by Gordon Prieur
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index e8b24f9e4ca04a83d732a0191087c28f93088ee1..6792dedd618739523d3715a5c85067ad188aab2b 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt* For Vim version 7.0d. Last change: 2006 Mar 09
+*develop.txt* For Vim version 7.0e. Last change: 2006 Mar 09
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 49cdf1c557d7fd85bec3ab5ab2db71b8c94d24a4..83c872ef02c2951e1486e96b914ccb3a9d3f29bb 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.0d. Last change: 2006 Apr 14
+*diff.txt* For Vim version 7.0e. Last change: 2006 Apr 14
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index 8d390059d3a910c9036a6207d105aa2a35f7d294..27021652a30151801c9d0fd35940cda825467551 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt* For Vim version 7.0d. Last change: 2005 Sep 11
+*digraph.txt* For Vim version 7.0e. Last change: 2005 Sep 11
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index aee6888ad2f663fbae7b0b90488d6efae08bff29..e45041222db0c3068d636572a37f15144a280441 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.0d. Last change: 2006 Apr 06
+*editing.txt* For Vim version 7.0e. Last change: 2006 Apr 06
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f06866b61074458b23fe107c68b83ff3376d5964..80a0c1d5431cb611795b7688c9d396f2f068343c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0d. Last change: 2006 Apr 15
+*eval.txt* For Vim version 7.0e. Last change: 2006 Apr 15
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index 3b9d906a1163db0f7491c06b95417c482b610d0c..acb3d9389183d410cb3ac831d23ee891f5999c50 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*farsi.txt* For Vim version 7.0e. 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 04fda2f499228b14927fc683bcb47000c3d44ce1..b0b18fd6550ef5bedf36a6d435f5f78f19ebb082 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*filetype.txt* For Vim version 7.0e. Last change: 2006 Mar 24
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index fe47750e0a5a7e3b9d28cd9274506e8c2ffbb28c..4bd3bb20bb5ca51124aeb11e7d411e2b87babc17 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt* For Vim version 7.0d. Last change: 2006 Mar 29
+*fold.txt* For Vim version 7.0e. Last change: 2006 Mar 29
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/getscript.txt b/runtime/doc/getscript.txt
index 98596f391e598e4e064919a479964c6c6b2c5522..be7302aea1d9a0cedec315616937879a757b2223 100644
--- a/runtime/doc/getscript.txt
+++ b/runtime/doc/getscript.txt
@@ -1,4 +1,4 @@
-*getscript.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*getscript.txt* For Vim version 7.0e. Last change: 2006 Mar 24
Get the Latest VimScripts
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 5f16e28fab5c79d229b69bd442ae125a860f96ff..87ab42ea08b36c4ca14d26594fc5a6e1e9104543 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*gui.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt
index 638e50e5dff89b7d455da7523d971d55648404a6..d611d9d7607745999632070f3f0908ec39e2c08f 100644
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -1,4 +1,4 @@
-*gui_w16.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*gui_w16.txt* For Vim version 7.0e. 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 7fbbe64c4ff24e65dec20cc4f7752af94ba10095..45f7709c02f236c9f0960082f1cebf740e526c35 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*gui_w32.txt* For Vim version 7.0e. 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 d1b5debca7f86b86b5156367656f102c83ebbb32..798c26669fd6b3a80df9ad4b02e3d15a61704599 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt* For Vim version 7.0d. Last change: 2005 Dec 06
+*gui_x11.txt* For Vim version 7.0e. Last change: 2005 Dec 06
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
index dc0a1c963a0c160f4b500115dc9c6b4466fbcb18..046ab47b7cc62585a269317c3e4bd93464d814ab 100644
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*hangulin.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam
diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 4f9051e56f12f2043100c94d2432a80fe45094cb..4384a74856ba0ea84e1b4137d1151424dbcf5f08 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -1,4 +1,4 @@
-*hebrew.txt* For Vim version 7.0d. Last change: 2003 May 11
+*hebrew.txt* For Vim version 7.0e. 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 b60ef2522ced6270ace71c598dde38c199c5919d..5bf756bca72cceed0971e4b832b0de4d2837b01b 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*help.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM - main help file
k
diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt
index 58d2dbacdb3752deb21b266f74112279c50fdb21..79af0814cb9c54557445e04a54064f25effa011b 100644
--- a/runtime/doc/howto.txt
+++ b/runtime/doc/howto.txt
@@ -1,4 +1,4 @@
-*howto.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*howto.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 1f9ac0f86a1537e7b83b1e7ea2090f4010240ec7..1063a443950110b567d95c14267bde91a1702fb9 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*if_cscop.txt* For Vim version 7.0e. 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 9dd2b9782ee0be94f6f4cdd52a256a2da2b9a4e7..d2e85a6b1495a1d192f995df9bc5cc994d78900d 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt* For Vim version 7.0d. Last change: 2006 Mar 06
+*if_mzsch.txt* For Vim version 7.0e. 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 4521a9f2b6d1a014ceaf7540ad63511999e76949..636647ce6402520ba63e08dd645be8605807cd75 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt* For Vim version 7.0d. Last change: 2006 Mar 06
+*if_ole.txt* For Vim version 7.0e. 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 9937112d27cb222ab50b588acdfa64074b87b6fb..c082c11a705baec0e78b73056f972a8694bc9bbb 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt* For Vim version 7.0d. Last change: 2006 Mar 06
+*if_perl.txt* For Vim version 7.0e. 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 e3e0191ae54cf8658d8255cdcacdfdf325f66269..fcaf09567a8486c854115855ff4adf1d3342edf3 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.0d. Last change: 2006 Jan 20
+*if_pyth.txt* For Vim version 7.0e. 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 5097fdf6f7605ad0b813f9904e4b0092d36a3abf..30efb809d3fd4ee9cab753564639b93b73d271da 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt* For Vim version 7.0d. Last change: 2006 Mar 26
+*if_ruby.txt* For Vim version 7.0e. 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 65b714377cc065620907a3a46ca0e30a4a22f5c4..d0664d908af581e298c01522b42a3824067dfa2f 100644
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*if_sniff.txt* For Vim version 7.0e. Last change: 2005 Mar 29
VIM REFERENCE MANUAL
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index daa5d4329793fcc29b282b1c12de81bb31698d00..eba356b4f22b5a4452cc7a6d0c97f5f091a970a3 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt* For Vim version 7.0d. Last change: 2006 Mar 06
+*if_tcl.txt* For Vim version 7.0e. Last change: 2006 Mar 06
VIM REFERENCE MANUAL by Ingo Wilken
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 7d83b7b91129349506eb4ffa67e1c6a502463ab3..9f6d85a22722c6f34d59da358b727696a8eaa242 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt* For Vim version 7.0d. Last change: 2006 Apr 14
+*indent.txt* For Vim version 7.0e. Last change: 2006 Apr 16
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -414,7 +414,6 @@ assume a 'shiftwidth' of 4.
if (cond1 && if (cond1 &&
cond2 cond2
) )
- foo; foo;
<
*java-cinoptions* *java-indenting*
jN Indent java anonymous classes correctly. The value 'N' is
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 848ce0ba796dedbcb8c2190f4f9165bcb2fc2902..8fc3cef9c6da18010843da2b1e9c21e5897d82e5 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.0d. Last change: 2006 Apr 10
+*index.txt* For Vim version 7.0e. Last change: 2006 Apr 10
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index d8be3381ab9ee95259274589ebb885972eb6da0c..550bb3007d9b607c6eaaa02c76b4ee42212f6c73 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0d. Last change: 2006 Apr 14
+*insert.txt* For Vim version 7.0e. Last change: 2006 Apr 14
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 897033bd0cefd475de167dcc421e77bc46d4a16b..09dd5dac3347c744133a49b4abc0578d1725fb4f 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt* For Vim version 7.0d. Last change: 2006 Apr 09
+*intro.txt* For Vim version 7.0e. Last change: 2006 Apr 09
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 49e1faa806a937d925731c38d1af1c1da6b6a9db..3ed090ab28599ff90f63baaa7a86262099e372b4 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.0d. Last change: 2006 Apr 11
+*map.txt* For Vim version 7.0e. Last change: 2006 Apr 11
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 9988ae7bb3599f201428253020e2219b8a02c7f3..b660d2c77900d436393ec034bfaa22d39234ba0e 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*mbyte.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar et al.
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 790cccf8ffe3adaee2f9a5d03930f2cb54e53d30..cca84cdddbc3838cf1bccf27b38aa37f049fb710 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt* For Vim version 7.0d. Last change: 2006 Apr 11
+*message.txt* For Vim version 7.0e. Last change: 2006 Apr 11
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index 4854c602741e76953c7803f99cd6db71e66e072b..37621966dd694ddbb12bf8435e2574bfafd09357 100644
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt* For Vim version 7.0d. Last change: 2004 Feb 24
+*mlang.txt* For Vim version 7.0e. Last change: 2004 Feb 24
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index c9d400d215db05aec3ca937579891dfdc4201c26..af12147ba49cab59d5eea4e3abc015b0e9894883 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt* For Vim version 7.0d. Last change: 2006 Jan 02
+*motion.txt* For Vim version 7.0e. Last change: 2006 Jan 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index ecbfdf46deaaa96b98af7442b9537435b01ee91b..3b490253e4fc6adc8fdcc483a9d839fa361f5674 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt* For Vim version 7.0d. Last change: 2006 Mar 09
+*netbeans.txt* For Vim version 7.0e. Last change: 2006 Mar 09
VIM REFERENCE MANUAL by Gordon Prieur
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d7c54406163641281126d1883c9237f838b45d3b..2cfd730124e7fe871384fa39854795f21c63e03c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0d. Last change: 2006 Apr 12
+*options.txt* For Vim version 7.0e. Last change: 2006 Apr 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
index 7f76f818e68d3c967bfa74100f89e22b930b6ac7..97d1b2d213101e684cf3b518f86a926e66366d67 100644
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_390.txt* For Vim version 7.0e. 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 cd96f0b63434d4d7acd096cab1b11f2ca81eb9ca..1202da7c1a06dc91d1fc9783152bf1a65199a68e 100644
--- a/runtime/doc/os_amiga.txt
+++ b/runtime/doc/os_amiga.txt
@@ -1,4 +1,4 @@
-*os_amiga.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_amiga.txt* For Vim version 7.0e. 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 3368b3e03fa7b1335ad66c2f0f5c6d763b5a1b4b..79c458d3c37e4aabc4a6e74c7be9074a6c7b639f 100644
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_beos.txt* For Vim version 7.0e. 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 5b4dfa9b3f60d8681e7d1643d644072847826979..7f16805ed1382b1ea8655fef9c2e49a0d0094734 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt* For Vim version 7.0d. Last change: 2006 Mar 30
+*os_dos.txt* For Vim version 7.0e. Last change: 2006 Mar 30
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
index 02cb0bbbabd17a8aa872ce5d9ca63c32d13ec9b4..1f6723647d1a4713c1b745e7db4faacf0788bd5b 100644
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt* For Vim version 7.0d. Last change: 2006 Mar 29
+*os_mac.txt* For Vim version 7.0e. Last change: 2006 Mar 29
VIM REFERENCE MANUAL by Bram Moolenaar et al.
diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt
index 88195f6657e350a50eafb51dcfb49a3b238963a5..62ae6c84c511dbd58842f1ea0e771c462aeaa219 100644
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_mint.txt* For Vim version 7.0e. 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 a67b69c052d1fd1ad457094fd7f2d2b790320332..e2f59d81fd348cfd0e9e2a8ef2ca4dd2722ec37f 100644
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_msdos.txt* For Vim version 7.0e. 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 3408a112fb5abdbb5b9500a8aff4b8b8ba0e718e..8f53c2ea247d6a66735bc0c97d78f2985cf26b4f 100644
--- a/runtime/doc/os_os2.txt
+++ b/runtime/doc/os_os2.txt
@@ -1,4 +1,4 @@
-*os_os2.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_os2.txt* For Vim version 7.0e. 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 a577877cc6db176ba46b211e5314941003cd8ac4..6d558e4c0ce14aae3e6abf4fe75594b6f6779734 100644
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_qnx.txt* For Vim version 7.0e. 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 012e80470ccb4af0deee1eb670a5ad163a2c3ac3..f29442ae584a3c0e8d56d08178f96345355a7f0d 100644
--- a/runtime/doc/os_risc.txt
+++ b/runtime/doc/os_risc.txt
@@ -1,4 +1,4 @@
-*os_risc.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_risc.txt* For Vim version 7.0e. 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 54cdf23418e56e51e5f68716ecb772f9a80f82c3..c7001df5cc4b8bf24c9d17626af1010b1ee90812 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*os_unix.txt* For Vim version 7.0e. 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 bfa26df99f840ea8ac679694b30a3dc75a0d2068..892f9be01b400058769c7e2eb71eb8a96000243f 100644
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt* For Vim version 7.0d. Last change: 2006 Mar 02
+*os_vms.txt* For Vim version 7.0e. Last change: 2006 Mar 02
VIM REFERENCE MANUAL
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index 92b347fb3a86f851e97086d967102f169396dfa6..11c2166dfc504ab982e5ed120e995c12301dc84e 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*os_win32.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by George Reilly
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index c73d969b63254bfbd17d8ec93e0117212c042638..5a37a8ddaf34dac4489270deddb5614e9d862bd8 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*pattern.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index 40473c2ee7c7664db59441f19bea541bfe85d1ed..aa7835bf440f009296e85ce491bfd3aed6343c58 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt* For Vim version 7.0d. Last change: 2002 Oct 29
+*pi_gzip.txt* For Vim version 7.0e. 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 a02724de9aacd635db47422722d19e930ac96e47..8cb8010fd0d9acb1e324e0c5e31a0df72835bdee 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt* For Vim version 7.0d. Last change: Apr 12, 2006
+*pi_netrw.txt* For Vim version 7.0e. Last change: Apr 12, 2006
VIM REFERENCE MANUAL by Charles E. Campbell, Jr.
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
index 8ef703cd15261d5c29d0197d999b9d73227df097..23ea75fba04efc042a7bd9d20e7f972ec8aca67f 100644
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt* For Vim version 7.0d. Last change: 2006 Apr 03
+*pi_paren.txt* For Vim version 7.0e. Last change: 2006 Apr 03
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
index b77d39640affdf8832a1343abc67212085fd32d9..a4ad11840efb8fb08cde330f89843f4001c2096f 100644
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt* For Vim version 7.0d. Last change: 2005 Oct 03
+*pi_spec.txt* For Vim version 7.0e. Last change: 2005 Oct 03
by Gustavo Niemeyer ~
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index d21429bfd78326d244a7cfac93b8e5212b409cf0..aa7e3f7f59f4c34e45dd209c999ceb49d937c8f8 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,4 +1,4 @@
-*tar.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*tar.txt* For Vim version 7.0e. Last change: 2006 Mar 24
+====================+
| Tar File Interface |
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index fa4f3b071f313350daf6f7935de74c645f35934a..253639b8b3619cf9473f34838b2e0f556e4f938a 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*zip.txt* For Vim version 7.0d. Last change: 2006 Apr 10
+*zip.txt* For Vim version 7.0e. Last change: 2006 Apr 10
+====================+
| Zip File Interface |
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 3e562165e7e96e87b0f9e9f2f4bfee8ca2fae6b8..54412daf1b45f3e5a3f795b1a5dc96d8ab6a8da9 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -1,4 +1,4 @@
-*print.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*print.txt* For Vim version 7.0e. Last change: 2005 Apr 01
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index d6206f8729b1684e09d45c1fe1008ab2b640c6c8..052613e0351388430c8bb64abaafd4e0dd8c48a2 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*quickfix.txt* For Vim version 7.0e. Last change: 2006 Mar 24
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index ce2c113cd49f0b8f7451b2c46313fbb996020926..8cefeafcbe5f9d7edeb710132e00faba33c3418f 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.0d. Last change: 2006 Mar 23
+*quickref.txt* For Vim version 7.0e. Last change: 2006 Mar 23
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
index b7d7d43fccff4d0a589efdc9633169533a69ae01..8cece723d23ae3914035886b381786666a65d5df 100644
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -1,4 +1,4 @@
-*quotes.txt* For Vim version 7.0d. Last change: 2005 Apr 04
+*quotes.txt* For Vim version 7.0e. Last change: 2005 Apr 04
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index 0908a55f2f9f444b5a9b736379813f03a270f0e2..7b28c12fb690cb10c6b9b28198f196345d8a3814 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt* For Vim version 7.0d. Last change: 2005 Dec 12
+*recover.txt* For Vim version 7.0e. Last change: 2005 Dec 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index 4dfdcc49a6e8e09bc4d98a952d6b0d7294eb7532..12811df335a7cd03ee0eef827ca6781bde3cb7f1 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt* For Vim version 7.0d. Last change: 2006 Mar 11
+*remote.txt* For Vim version 7.0e. Last change: 2006 Mar 11
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 19c8cac6b1d09f346d8088fc676e2e8944253b73..e11a7d727010771f196dfcb15cc6e3a72e7c7dda 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt* For Vim version 7.0d. Last change: 2006 Mar 21
+*repeat.txt* For Vim version 7.0e. Last change: 2006 Mar 21
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt
index fa704faa9c96e5693a3d2fe326f3c00c0bafd105..eb10863248a8b5bee68e352e6619a84377cd5d2c 100644
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -1,4 +1,4 @@
-*rileft.txt* For Vim version 7.0d. Last change: 2005 Apr 04
+*rileft.txt* For Vim version 7.0e. Last change: 2005 Apr 04
VIM REFERENCE MANUAL by Avner Lottem
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
index b511825d483fe947bcd855c37f252bd3b3a1d476..f1b02af52358041316c4ad2f2f6e2aa6909c9843 100644
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -1,4 +1,4 @@
-*russian.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*russian.txt* For Vim version 7.0e. Last change: 2005 Apr 01
VIM REFERENCE MANUAL by Vassily Ragosin
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 19a8f2708dcf32248b8fc92956a0bb7ecbf500b4..c180acdc75ebdb0ab8a04773b5d35eca8862680a 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -1,4 +1,4 @@
-*scroll.txt* For Vim version 7.0d. Last change: 2005 Dec 16
+*scroll.txt* For Vim version 7.0e. Last change: 2005 Dec 16
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index aec354a2e235a2b094b7ceefdcfeb1a9cd72fc75..3c2451aafc769883f92b3b0241308c2dac3b5b22 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt* For Vim version 7.0d. Last change: 2005 Apr 04
+*sign.txt* For Vim version 7.0e. Last change: 2005 Apr 04
VIM REFERENCE MANUAL by Gordon Prieur
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 56cdf05f64e145e164abf0c069661bd11be42384..70c95da8c7fa18867656cff20205069e248b9f9e 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt* For Vim version 7.0d. Last change: 2006 Apr 12
+*spell.txt* For Vim version 7.0e. Last change: 2006 Apr 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt
index de9b421f3c4ba1e9ce37d762d675083908df5225..fe7ab27f4fdc756e8e2364b77f5bb53c6b03d761 100644
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt* For Vim version 7.0d. Last change: 2006 Mar 29
+*sponsor.txt* For Vim version 7.0e. Last change: 2006 Mar 29
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/sql.txt b/runtime/doc/sql.txt
index ce7079db34cd2de3a733783a36a25dbaaac550b5..cf956164ecb1711332273cab153087ecc0806c1c 100644
--- a/runtime/doc/sql.txt
+++ b/runtime/doc/sql.txt
@@ -1,4 +1,4 @@
-*sql.txt* For Vim version 7.0d. Last change: Mon Apr 03 2006 10:34:00 PM
+*sql.txt* For Vim version 7.0e. Last change: Mon Apr 03 2006 10:34:00 PM
by David Fishburn
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 64c2c0ea9931e3f36f13385898dd1f171bb3e359..59c8bef0927dfc50324d646f2592213a615fd2b1 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*starting.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 76ef1868d81071beaf69f5ce3c316b99b430b22c..6285f7e7c352b753ff20c214d6a2d777d61b9dff 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.0d. Last change: 2006 Apr 15
+*syntax.txt* For Vim version 7.0e. Last change: 2006 Apr 15
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index b775bacf9946e5ae36c3fd18fe8678b40551fdbb..566c802ad2189c8148e26dbb09ea8a9e4ce4aaa6 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt* For Vim version 7.0d. Last change: 2006 Apr 13
+*tabpage.txt* For Vim version 7.0e. Last change: 2006 Apr 13
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 3ee117eb87d5688fd946ae0148b9a11ee27e7dc0..6b2b27eb607c3f3844c6b33e04bb3e4133e976ea 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5615,7 +5615,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*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 6e3e49b00f030b3372c8090a419bcca5d35196b4..f54d5074400fe2180d2a80630cecd0dd5acba4bb 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt* For Vim version 7.0d. Last change: 2006 Feb 24
+*tagsrch.txt* For Vim version 7.0e. Last change: 2006 Feb 24
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 133518ad33b25b15f3ea08fcc1f4f1d453ab52cd..4582875211efde664b08f0901c7c43aca72b8c6d 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt* For Vim version 7.0d. Last change: 2006 Feb 14
+*term.txt* For Vim version 7.0e. Last change: 2006 Feb 14
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index 575cbf6d2fb64cd90a818aef47b11c92d1c9cf17..7e80dcc418c26c3f4b7d3cb412f4e40ec3fdf694 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt* For Vim version 7.0d. Last change: 2006 Mar 01
+*tips.txt* For Vim version 7.0e. Last change: 2006 Mar 01
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 600750c868c910362e498e4a07e58c77ed81bb3f..0463dd61a99e27c09ef2039c2cba887278ddfd50 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0d. Last change: 2006 Apr 15
+*todo.txt* For Vim version 7.0e. Last change: 2006 Apr 15
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index fc412c885836a3117aca235118310e35f8d5b3ff..d2b951ae88ee3ce07f822347ea871fbd67e8250f 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*uganda.txt* For Vim version 7.0e. Last change: 2006 Mar 24
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 0985c96af34a8eed06cede1d7dd4681a5c0d4a7a..432c8558701793be8fce47d4f1c6a5fa9ffd984e 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt* For Vim version 7.0d. Last change: 2006 Apr 12
+*undo.txt* For Vim version 7.0e. Last change: 2006 Apr 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index c162318ce2170553d1f35eafb54b5bcff21d0de0..4f8aed1c4e25492599d0d335800a741ace11e73a 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_01.txt* For Vim version 7.0e. 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 522947e8a4fb968e62dada2183abe60e80d6b392..f3697ea500aad9ffe97c1fe3130fe555824ec352 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*usr_02.txt* For Vim version 7.0e. 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 759f0e8a447f611b891f8ae2bc7c0fbb1a79a7c5..7cb764dfb970708a91ac25b61de8231b73c18bbd 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt* For Vim version 7.0d. Last change: 2005 Apr 22
+*usr_03.txt* For Vim version 7.0e. 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 035592b845b9a169e0fab5c528f4d3840c6df673..891fd4935c1e0b7dbd83d16f94613a8e03277980 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_04.txt* For Vim version 7.0e. 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 c2f60bd7cc1aca63ae3c143fcbd79b283b23658b..567ff9ae6d28ded97332f6b2f940e95bfd0b860d 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*usr_05.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
index 50920c45f3d9b96d3136e91ca7a78a68d01c608d..cd0d8cf7aa0bfcf08ebfeae58d95eb29b848edf5 100644
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -1,4 +1,4 @@
-*usr_06.txt* For Vim version 7.0d. Last change: 2006 Feb 16
+*usr_06.txt* For Vim version 7.0e. 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 630e7217cc25dc51055a7b20054ef09320c4ccb1..12319a30f84d3672a32813499f80d614bdd51ba0 100644
--- a/runtime/doc/usr_07.txt
+++ b/runtime/doc/usr_07.txt
@@ -1,4 +1,4 @@
-*usr_07.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_07.txt* For Vim version 7.0e. 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 fb212c65f56cbae071bb3659c70a8faa67f285a4..7cc7771d37c56e48ca365988011ffaa770d70fea 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt* For Vim version 7.0d. Last change: 2006 Feb 25
+*usr_08.txt* For Vim version 7.0e. 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 f999da541774e5e675077ed7d3920e61cd7d8116..41129e5c89f99bd029d59b761e38b4c8eafc8072 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -1,4 +1,4 @@
-*usr_09.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_09.txt* For Vim version 7.0e. 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 425ee755ef6703eccc54991a0ddad82f44b7c453..ec4a98d004451845a72a781dd3d6d48f8e794f7f 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_10.txt* For Vim version 7.0e. 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 128198f09c6991cf8b05502be0f95c59b27609c6..b6d344d8ca9aaa441a9e453256fd064da3909b26 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -1,4 +1,4 @@
-*usr_11.txt* For Vim version 7.0d. Last change: 2005 Jun 09
+*usr_11.txt* For Vim version 7.0e. 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 7ebb481caff909b632fb57110ee1255f8e292102..003ae94177d42f3782baafe5896d955c33ac92dd 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -1,4 +1,4 @@
-*usr_12.txt* For Vim version 7.0d. Last change: 2006 Feb 26
+*usr_12.txt* For Vim version 7.0e. 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 08429e0a140ba7d112df9b2e0b4384f1a19fb0e9..86cb8226078d04ee626cf75dcccb3319fa14f7fd 100644
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -1,4 +1,4 @@
-*usr_20.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_20.txt* For Vim version 7.0e. 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 85d813ff764dd37d34ac1b241b5a5547d13df82b..e977343ea4de079593c54b38c998b2af216da14d 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_21.txt* For Vim version 7.0e. 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 4365be1969fe271208539761a330866fae557c10..51a72d7856d4818a5d893f2c969c15dde67812e9 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -1,4 +1,4 @@
-*usr_22.txt* For Vim version 7.0d. Last change: 2005 Apr 10
+*usr_22.txt* For Vim version 7.0e. 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 3f4a25a264fe8bcf3eb27ef306acb894b813eb66..a6f2e3e2b27adde55ce98010db9d35c3ff0fdf1b 100644
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -1,4 +1,4 @@
-*usr_23.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_23.txt* For Vim version 7.0e. 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 50a370707c950a5fa414622a628f3da37a4d2274..7f7d67c107371bc84885e4fe7a124038a239973d 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*usr_24.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index 1264c1ed6f42312120496cb0ab8b1684765675d7..5d43da09f392bb3d3eebbe76fd05ea88cca0894f 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_25.txt* For Vim version 7.0e. 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 862a4535599b5c2561909e2355ddfc268f904159..65ee88df2b5322e459d3ae047449452ca9bbf9a5 100644
--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt* For Vim version 7.0d. Last change: 2002 Oct 29
+*usr_26.txt* For Vim version 7.0e. 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 e4b76a4538559abe7b3d4a4f647090bc6a010773..271c3639c2418547b469b4c98cf0240a12c81ea0 100644
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -1,4 +1,4 @@
-*usr_27.txt* For Vim version 7.0d. Last change: 2005 Feb 08
+*usr_27.txt* For Vim version 7.0e. 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 f0b409f46e776a2780d735b1311bc0c1e4e0a751..9ed1de20b2f049803620bb813ce5bb96e09470b3 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -1,4 +1,4 @@
-*usr_28.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_28.txt* For Vim version 7.0e. 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 324616457dcb051b807c59baed52b354dd0dca4c..81178298ceefb7516c5796aafcf1e47119dc375a 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt* For Vim version 7.0d. Last change: 2004 Feb 12
+*usr_29.txt* For Vim version 7.0e. 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 aa445f76ab68ce4cb5c7256880de4541fdd2ed69..fe6614e40725c5408706c4464d622c70c3ba8edc 100644
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -1,4 +1,4 @@
-*usr_30.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_30.txt* For Vim version 7.0e. 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 eadd6455120ac10439209c2a532c4f66a60e0d29..a8db01c46de963c36237b8bc1ab08c0dd31a2be8 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*usr_31.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt
index b2c4c8e151963c5fda61aa3ef593a26543cc6b41..99dd5a858169082408ffc4985e90cfb037a4e580 100644
--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -1,4 +1,4 @@
-*usr_32.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*usr_32.txt* For Vim version 7.0e. 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 c9ecea1466a23c4cd8be3b7c041e368a8f164633..3cf5a8fb7810c2bdffcd2e05062c393e4ad52bdb 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -1,4 +1,4 @@
-*usr_40.txt* For Vim version 7.0d. Last change: 2006 Mar 24
+*usr_40.txt* For Vim version 7.0e. 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 966337329752d9ac839e6aae711dbe923da0ee0f..a8ef839ebf9714c2d5678e5332af1279d7ae70d0 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt* For Vim version 7.0d. Last change: 2006 Apr 15
+*usr_41.txt* For Vim version 7.0e. Last change: 2006 Apr 15
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
index 10abb3c3a16d47fd7f0307273450116b4b75f969..ef77760f374626db99e8a4ecae0e9a3dce3275a6 100644
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*usr_42.txt* For Vim version 7.0e. 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 a4b51c0d04dde98f959be36e93c6fa3fe3c95e97..0c26308b2720b1fc0d83f19f23a4850ff2078b51 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -1,4 +1,4 @@
-*usr_43.txt* For Vim version 7.0d. Last change: 2002 Jul 14
+*usr_43.txt* For Vim version 7.0e. 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 43437824568c2ea78d9842e4e0bce9c9220b4228..308337a0a22d82e4d3fa5bf9a68741eaee79222e 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt* For Vim version 7.0d. Last change: 2006 Mar 27
+*usr_44.txt* For Vim version 7.0e. Last change: 2006 Mar 27
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index d50b76ed9dd58e27b9b4d7ddc32c78ee8003ee5a..f78e41edc5ee153ecfb162e17770072729e7c6af 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt* For Vim version 7.0d. Last change: 2004 Jun 08
+*usr_45.txt* For Vim version 7.0e. 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 9ee374281c87e813d9d972163651998a45ae2312..9d321991ddb570f1399dc850fdbac30c92b9fe49 100644
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -1,4 +1,4 @@
-*usr_90.txt* For Vim version 7.0d. Last change: 2004 Mar 21
+*usr_90.txt* For Vim version 7.0e. 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 8bd3f29e02c2e7c34266ecbc12611fc8f21307ba..17152a41358efbe5d74d7f6977122ddef2bfa94a 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt* For Vim version 7.0d. Last change: 2006 Apr 02
+*usr_toc.txt* For Vim version 7.0e. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 6456a645f744ffba50828b58eb4cb59b5c00877e..d9a9c1e02d8cd0bd80b187c3e42076e9f1c1fe3b 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.0d. Last change: 2006 Mar 25
+*various.txt* For Vim version 7.0e. Last change: 2006 Mar 25
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt
index dec6492351b3dc0077bd4bc1f1bbb8e1178176b8..dd294890a8e068e81b7b1512d2447e42bea361db 100644
--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt* For Vim version 7.0d. Last change: 2004 Mar 12
+*version4.txt* For Vim version 7.0e. Last change: 2004 Mar 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt
index 55892bfbbe5a4d31770aafe24821d571139c1c94..c77fba35b14d7a710da20f9cf7fa68805557a349 100644
--- a/runtime/doc/version5.txt
+++ b/runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt* For Vim version 7.0d. Last change: 2005 Apr 01
+*version5.txt* For Vim version 7.0e. Last change: 2005 Apr 01
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index d33e6f1303e139b28c3ed17495eccc6b808d4870..1139cebfc7f23112810aaf34c642921ea0fb898f 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt* For Vim version 7.0d. Last change: 2005 Oct 17
+*version6.txt* For Vim version 7.0e. Last change: 2005 Oct 17
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index f1b7f76ede286246695aa023e173466a11e78e0e..4cdd41f26fc0124d36051ce2dfdb252f660ccce5 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0d. Last change: 2006 Apr 15
+*version7.txt* For Vim version 7.0e. Last change: 2006 Apr 16
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2480,12 +2480,12 @@ typing a special key.
When 'foldignore' is set the folds were not updated right away.
When a list is indexed with [a : b] and b was greater than the length an error
-message was given. Now silently restrict to the length of the list.
+message was given. Now silently truncate the result.
When using BS during Insert mode completion go back to the original text, so
that CTRL-N selects the first matching entry.
-Added the 'm' flag to 'cinoptions'.
+Added the 'M' flag to 'cinoptions'.
Win32: Make the "gvim --help" window appear in the middle of the screen
instead of at an arbitrary position. (Randall W. Morris)
@@ -2496,4 +2496,22 @@ Command line completion: pressing <Tab> after ":e /usr/*" expands the whole
tree, because it becomes ":e /usr/**". Don't add a star if there already is
one.
+Added grey10 to grey90 to all GUIs, so that they can all be used for
+initializing highlighting. Use grey40 for CursorColumn and CursorLine when
+'background' is "dark".
+
+When reading a file and using iconv for conversion, an incomplete byte
+sequence at the end caused problems. (Yukihiro Nakadaira)
+
+
+--- fixes and changes since Vim 7.0e ---
+
+Default color for MatchParen when 'background' is "dark" is now DarkCyan.
+
+":syn off" had to be used twice in a file that sets 'syntax' in a modeline.
+(Michael Geddes)
+
+When using ":vsp" or ":sp" the available space wasn't used equally between
+windows. (Servatius Brandt)
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 00497e159c9978783ff10a6582ca94207c287df8..e85bc25ca392c8013a9cbbf606e3a667a3205bc8 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt* For Vim version 7.0d. Last change: 2006 Apr 12
+*vi_diff.txt* For Vim version 7.0e. Last change: 2006 Apr 12
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/vimball.txt b/runtime/doc/vimball.txt
index 4a679893ee82e4aa9ca5cafa2f570a0fb7b9fcc4..b7a133f970eff7f5e3f961b0c0d93cea20774d35 100644
--- a/runtime/doc/vimball.txt
+++ b/runtime/doc/vimball.txt
@@ -1,4 +1,4 @@
-*vimball.txt* For Vim version 7.0d. Last change: 2006 Apr 01
+*vimball.txt* For Vim version 7.0e. Last change: 2006 Apr 01
Vimball Archiver
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 44a96fd4eb48dbb909cd70f23e40017c92cce94e..4a0a2848d09b1a24231e380fe5c0fcff202aee77 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt* For Vim version 7.0d. Last change: 2006 Mar 20
+*visual.txt* For Vim version 7.0e. Last change: 2006 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 499b6caf4447766b415cec1843e27e9943527411..f3e1c4545d0e05af4c7f77347fb16d1209876a66 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt* For Vim version 7.0d. Last change: 2006 Apr 10
+*windows.txt* For Vim version 7.0e. Last change: 2006 Apr 10
VIM REFERENCE MANUAL by Bram Moolenaar
diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt
index 1f4b35acfd5008a67349ce1ee3a4ca739e1a65df..fe51b928c534d829783fb3134e66175aea946225 100644
--- a/runtime/doc/workshop.txt
+++ b/runtime/doc/workshop.txt
@@ -1,4 +1,4 @@
-*workshop.txt* For Vim version 7.0d. Last change: 2005 Mar 29
+*workshop.txt* For Vim version 7.0e. Last change: 2005 Mar 29
VIM REFERENCE MANUAL by Gordon Prieur
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 388c66879d80844374ffda6493c5ac24134030a7..097e96af8bd235e748697d635364d10949d176cb 100644
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
" Script to define the syntax menu in synmenu.vim
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 15
+" Last Change: 2006 Apr 16
" This is used by "make menu" in the src directory.
edit <sfile>:p:h/synmenu.vim
@@ -149,6 +149,10 @@ SynMenu DE.DocBook.auto-detect:docbk
SynMenu DE.DocBook.SGML:docbksgml
SynMenu DE.DocBook.XML:docbkxml
SynMenu DE.Dot:dot
+SynMenu DE.Doxygen.C\ with\ doxygen:c.doxygen
+SynMenu DE.Doxygen.C++\ with\ doxygen:cpp.doxygen
+SynMenu DE.Doxygen.IDL\ with\ doxygen:idl.doxygen
+SynMenu DE.Doxygen.Java\ with\ doxygen:java.doxygen
SynMenu DE.Dracula:dracula
SynMenu DE.DSSSL:dsl
SynMenu DE.DTD:dtd
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 31e2fb3592150a5c4e294dee5e5b19ef01f41b6f..bf95d61a930cfa6e1fe95d8870944e6882150011 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 02
+" Last Change: 2006 Apr 16
" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index d9da7cc410e19ace922056bdabb84102f24aa34e..1dd2f00f1690538ebd0a7f05f2209a9441fb60d8 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -129,28 +129,32 @@ an 50.30.220 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
an 50.30.230 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
an 50.30.240 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
an 50.30.250 &Syntax.DE.Dot :cal SetSyn("dot")<CR>
-an 50.30.260 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
-an 50.30.270 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
-an 50.30.280 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
-an 50.30.290 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
-an 50.30.300 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
-an 50.30.310 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
-an 50.30.320 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
-an 50.30.340 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
-an 50.30.350 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
-an 50.30.360 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
-an 50.30.370 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
-an 50.30.380 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
-an 50.30.390 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
-an 50.30.400 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
-an 50.30.410 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
-an 50.30.420 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
-an 50.30.430 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
-an 50.30.440 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
-an 50.30.450 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
-an 50.30.460 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
-an 50.30.470 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
-an 50.30.480 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
+an 50.30.260 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR>
+an 50.30.270 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR>
+an 50.30.280 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR>
+an 50.30.290 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR>
+an 50.30.300 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
+an 50.30.310 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
+an 50.30.320 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
+an 50.30.330 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
+an 50.30.340 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
+an 50.30.350 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
+an 50.30.360 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
+an 50.30.380 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
+an 50.30.390 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
+an 50.30.400 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
+an 50.30.410 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
+an 50.30.420 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
+an 50.30.430 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
+an 50.30.440 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
+an 50.30.450 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
+an 50.30.460 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
+an 50.30.470 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
+an 50.30.480 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
+an 50.30.490 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
+an 50.30.500 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
+an 50.30.510 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
+an 50.30.520 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
an 50.40.100 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR>
an 50.40.110 &Syntax.FG.Focus\ Executable :cal SetSyn("focexec")<CR>
an 50.40.120 &Syntax.FG.Focus\ Master :cal SetSyn("master")<CR>
diff --git a/runtime/syntax/doxygen.vim b/runtime/syntax/doxygen.vim
index c77b89eb9eb08f08bc27ebfe3612ddc8374812d2..bc04ae933b193dc6a22cb5f2cd82e7a5850fd721 100644
--- a/runtime/syntax/doxygen.vim
+++ b/runtime/syntax/doxygen.vim
@@ -320,13 +320,15 @@ syn cluster rcGroup add=doxygen.*
" Trick to force special doxygen hilighting if the background changes (need to
" syn clear first)
-if exists("did_doxygen_syntax_inits")
- if did_doxygen_syntax_inits != &background && synIDattr(highlightID('doxygen_Dummy'), 'fg', 'gui')==''
- command -nargs=+ SynColor hi <args>
- unlet did_doxygen_syntax_inits
+if !exists(':SynColor')
+ if exists("did_doxygen_syntax_inits")
+ if did_doxygen_syntax_inits != &background && synIDattr(highlightID('doxygen_Dummy'), 'fg', 'gui')==''
+ command -nargs=+ SynColor hi <args>
+ unlet did_doxygen_syntax_inits
+ endif
+ else
+ command -nargs=+ SynColor hi def <args>
endif
-else
- command -nargs=+ SynColor hi def <args>
endif
if !exists("did_doxygen_syntax_inits")
@@ -436,10 +438,18 @@ if !exists("did_doxygen_syntax_inits")
SynLink doxygenPrev SpecialComment
endif
endfun
+ fun! s:Doxygen_ResetSyntax()
+ if exists("did_doxygen_syntax_inits")
+ unlet did_doxygen_syntax_inits
+ endif
+ endfun
+
call s:Doxygen_Hilights()
" This is still a proposal, but won't do any harm.
au Syntax UserColor_reset nested call s:Doxygen_Hilights_Base()
au Syntax UserColor_{on,reset,enable} nested call s:Doxygen_Hilights()
+ "au User Syntax_UserColor_off nested call s:Doxygen_ResetSyntax()
+
SynLink doxygenBody Comment
SynLink doxygenTODO Todo
@@ -549,7 +559,7 @@ syn sync match doxygenSyncEndComment groupthere NONE "\*/"
if !exists('b:current_syntax')
let b:current_syntax = "doxygen"
else
- let b:current_syntax = b:current_syntax.'+doxygen'
+ let b:current_syntax = b:current_syntax.'.doxygen'
endif
let &cpo = s:cpo_save
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index defb85ea9175b0da318f0aae0ef6e3852ed8f8f0..8d4da93a42ff4784ef99d55198fac6d20c8affab 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -1,10 +1,14 @@
" Vim syntax file
-" Language: fstab file
-" Maintaner: Radu Dineiu <littledragon@altern.org>
-" URL: http://ld.yi.org/vim/fstab.vim
-" ChangeLog: http://ld.yi.org/vim/fstab.ChangeLog
-" Last Change: 2005 Jul 07
-" Version: 0.61
+" Language: fstab file
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Original Maintainer: Radu Dineiu <littledragon@altern.org>
+" License: This file can be redistribued and/or modified under the same terms
+" as Vim itself.
+" URL: http://trific.ath.cx/Ftp/vim/syntax/fstab.vim
+" Last Change: 2006-04-16
+
+" Options: let fstab_unknown_fs_errors = 1 to highlight unknown filesystems
+" as errors
if version < 600
syntax clear
@@ -19,8 +23,8 @@ syn match fsOperator /[,=]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
-syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@]\|^\w\{-}\ze\W\)/ contained
-syn keyword fsDeviceKeyword contained none proc linproc tmpfs
+syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:]\|^\w\{-}\ze\W\)/ contained
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts sysfs usbfs
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
@@ -30,30 +34,30 @@ syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@]\|\s\+\zs\w\{-}\ze\s\)/ cont
syn keyword fsMountPointKeyword contained none swap
" Type
-syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
-syn match fsTypeError /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs
+syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
" Options
" -------
" Options: General
-syn cluster fsOptionsCluster contains=fsOperator,fsOptionsGeneral,fsOptionsKeywords,fsTypeError
+syn cluster fsOptionsCluster contains=fsOperator,fsOptionsGeneral,fsOptionsKeywords,fsTypeUnknown
syn match fsOptionsNumber /\d\+/
syn match fsOptionsNumberOctal /[0-8]\+/
syn match fsOptionsString /[a-zA-Z0-9_-]\+/
syn keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
syn match fsOptionsGeneral /_netdev/
" Options: adfs
-syn match fsOptionsKeywords contained /\%([ug]id\|o\%(wn\|th\)mask\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%([ug]id\|o\%(wn\|th\)mask\)=/ nextgroup=fsOptionsNumber
" Options: affs
-syn match fsOptionsKeywords contained /\%(set[ug]id\|mode\|reserved\)=/ nextgroup=fsOptionsNumber
-syn match fsOptionsKeywords contained /\%(prefix\|volume\|root\)=/ nextgroup=fsOptionsString
-syn match fsOptionsKeywords contained /bs=/ nextgroup=fsOptionsSize
+syn match fsOptionsKeywords contained /\<\%(set[ug]id\|mode\|reserved\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%(prefix\|volume\|root\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<bs=/ nextgroup=fsOptionsSize
syn keyword fsOptionsKeywords contained protect usemp verbose
" Options: cd9660
@@ -63,74 +67,97 @@ syn keyword fsOptionsKeywords contained extatt gens norrip nostrictjoilet
" -- everything already defined
" Options: ext2
-syn match fsOptionsKeywords contained /check=*/ nextgroup=@fsOptionsCheckCluster
-syn match fsOptionsKeywords contained /errors=/ nextgroup=fsOptionsExt2Errors
-syn match fsOptionsKeywords contained /\%(res[gu]id\|sb\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<check=*/ nextgroup=@fsOptionsCheckCluster
+syn match fsOptionsKeywords contained /\<errors=/ nextgroup=fsOptionsExt2Errors
+syn match fsOptionsKeywords contained /\<\%(res[gu]id\|sb\)=/ nextgroup=fsOptionsNumber
syn keyword fsOptionsExt2Check contained none normal strict
syn keyword fsOptionsExt2Errors contained continue panic
-syn match fsOptionsExt2Errors contained /remount-ro/
-syn keyword fsOptionsKeywords contained bsddf minixdf debug grpid bsdgroups nocheck nogrpid sysvgroups nouid32
+syn match fsOptionsExt2Errors contained /\<remount-ro\>/
+syn keyword fsOptionsKeywords contained acl bsddf minixdf debug grpid bsdgroups minixdf noacl nocheck nogrpid oldalloc orlov sysvgroups nouid32 nobh user_xattr nouser_xattr
" Options: ext3
-syn match fsOptionsKeywords contained /journal=/ nextgroup=fsOptionsExt3Journal
-syn match fsOptionsKeywords contained /data=/ nextgroup=fsOptionsExt3Data
+syn match fsOptionsKeywords contained /\<journal=/ nextgroup=fsOptionsExt3Journal
+syn match fsOptionsKeywords contained /\<data=/ nextgroup=fsOptionsExt3Data
+syn match fsOptionsKeywords contained /\<commit=/ nextgroup=fsOptionsNumber
syn keyword fsOptionsExt3Journal contained update inum
syn keyword fsOptionsExt3Data contained journal ordered writeback
syn keyword fsOptionsKeywords contained noload
" Options: fat
-syn match fsOptionsKeywords contained /blocksize=/ nextgroup=fsOptionsSize
-syn match fsOptionsKeywords contained /\%([dfu]mask\|codepage\)=/ nextgroup=fsOptionsNumberOctal
+syn match fsOptionsKeywords contained /\<blocksize=/ nextgroup=fsOptionsSize
+syn match fsOptionsKeywords contained /\<\%([dfu]mask\|codepage\)=/ nextgroup=fsOptionsNumberOctal
syn match fsOptionsKeywords contained /\%(cvf_\%(format\|option\)\|iocharset\)=/ nextgroup=fsOptionsString
-syn match fsOptionsKeywords contained /check=/ nextgroup=@fsOptionsCheckCluster
-syn match fsOptionsKeywords contained /conv=*/ nextgroup=fsOptionsConv
-syn match fsOptionsKeywords contained /fat=/ nextgroup=fsOptionsFatType
-syn match fsOptionsKeywords contained /dotsOK=/ nextgroup=fsOptionsYesNo
+syn match fsOptionsKeywords contained /\<check=/ nextgroup=@fsOptionsCheckCluster
+syn match fsOptionsKeywords contained /\<conv=*/ nextgroup=fsOptionsConv
+syn match fsOptionsKeywords contained /\<fat=/ nextgroup=fsOptionsFatType
+syn match fsOptionsKeywords contained /\<dotsOK=/ nextgroup=fsOptionsYesNo
syn keyword fsOptionsFatCheck contained r n s relaxed normal strict
syn keyword fsOptionsConv contained b t a binary text auto
syn keyword fsOptionsFatType contained 12 16 32
syn keyword fsOptionsKeywords contained quiet sys_immutable showexec dots nodots
+" Options: hfs
+syn match fsOptionsKeywords contained /\<\%(creator|type\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(dir\|file\|\)_umask=/ nextgroup=fsOptionsNumberOctal
+syn match fsOptionsKeywords contained /\<\%(session\|part\)=/ nextgroup=fsOptionsNumber
+
" Options: hpfs
-syn match fsOptionsKeywords contained /case=/ nextgroup=fsOptionsHpfsCase
+syn match fsOptionsKeywords contained /\<case=/ nextgroup=fsOptionsHpfsCase
syn keyword fsOptionsHpfsCase contained lower asis
" Options: iso9660
-syn match fsOptionsKeywords contained /map=/ nextgroup=fsOptionsIsoMap
-syn match fsOptionsKeywords contained /block=/ nextgroup=fsOptionsSize
-syn match fsOptionsKeywords contained /\%(session\|sbsector\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<map=/ nextgroup=fsOptionsIsoMap
+syn match fsOptionsKeywords contained /\<block=/ nextgroup=fsOptionsSize
+syn match fsOptionsKeywords contained /\<\%(session\|sbsector\)=/ nextgroup=fsOptionsNumber
syn keyword fsOptionsIsoMap contained n o a normal off acorn
syn keyword fsOptionsKeywords contained norock nojoilet unhide cruft
syn keyword fsOptionsConv contained m mtext
+" Options: jfs
+syn keyword fsOptionsKeywords nointegrity integrity
+
" Options: nfs
-syn match fsOptionsKeywords contained /\%(rsize\|wsize\|timeo\|retrans\|acregmin\|acregmax\|acdirmin\|acdirmax\|actimeo\|retry\|port\|mountport\|mounthost\|mountprog\|mountvers\|nfsprog\|nfsvers\|namelen\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(rsize\|wsize\|timeo\|retrans\|acregmin\|acregmax\|acdirmin\|acdirmax\|actimeo\|retry\|port\|mountport\|mounthost\|mountprog\|mountvers\|nfsprog\|nfsvers\|namelen\)=/ nextgroup=fsOptionsString
syn keyword fsOptionsKeywords contained bg fg soft hard intr cto ac tcp udp lock nobg nofg nosoft nohard nointr noposix nocto noac notcp noudp nolock
" Options: ntfs
-syn match fsOptionsKeywords contained /\%(posix=*\|uni_xlate=\)/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%(posix=*\|uni_xlate=\)/ nextgroup=fsOptionsNumber
syn keyword fsOptionsKeywords contained utf8
" Options: proc
" -- everything already defined
" Options: reiserfs
-syn match fsOptionsKeywords contained /hash=/ nextgroup=fsOptionsReiserHash
-syn match fsOptionsKeywords contained /resize=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<hash=/ nextgroup=fsOptionsReiserHash
+syn match fsOptionsKeywords contained /\<resize=/ nextgroup=fsOptionsNumber
syn keyword fsOptionsReiserHash contained rupasov tea r5 detect
syn keyword fsOptionsKeywords contained hashed_relocation noborder nolog notail no_unhashed_relocation replayonly
+" Options: subfs
+syn match fsOptionsKeywords contained /\<fs=/ nextgroup=fsOptionsString
+syn keyword fsOptionsKeywords contained procuid
+
+" Options: swap
+syn match fsOptionsKeywords contained /\<pri=/ nextgroup=fsOptionsNumber
+
+" Options: tmpfs
+syn match fsOptionsKeywords contained /\<nr_\%(blocks\|inodes\)=/ nextgroup=fsOptionsNumber
+
" Options: udf
-syn match fsOptionsKeywords contained /\%(anchor\|partition\|lastblock\|fileset\|rootdir\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(anchor\|partition\|lastblock\|fileset\|rootdir\)=/ nextgroup=fsOptionsString
syn keyword fsOptionsKeywords contained unhide undelete strict novrs
" Options: ufs
-syn match fsOptionsKeywords contained /ufstype=/ nextgroup=fsOptionsUfsType
-syn match fsOptionsKeywords contained /onerror=/ nextgroup=fsOptionsUfsError
-syn keyword fsOptionsUfsType contained old 44bsd sun sunx86 nextstep openstep
-syn match fsOptionsUfsType contained /nextstep-cd/
+syn match fsOptionsKeywords contained /\<ufstype=/ nextgroup=fsOptionsUfsType
+syn match fsOptionsKeywords contained /\<onerror=/ nextgroup=fsOptionsUfsError
+syn keyword fsOptionsUfsType contained old hp 44bsd sun sunx86 nextstep openstep
+syn match fsOptionsUfsType contained /\<nextstep-cd\>/
syn keyword fsOptionsUfsError contained panic lock umount repair
+" Options: usbfs
+syn match fsOptionsKeywords contained /\<\%(dev\|bus\|list\)\%(id\|gid\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%(dev\|bus\|list\)mode=/ nextgroup=fsOptionsNumberOctal
+
" Options: vfat
syn keyword fsOptionsKeywords contained nonumtail posix utf8
syn match fsOptionsKeywords contained /shortname=/ nextgroup=fsOptionsVfatShortname
@@ -138,7 +165,7 @@ syn keyword fsOptionsVfatShortname contained lower win95 winnt mixed
" Options: xfs
syn match fsOptionsKeywords contained /\%(biosize\|logbufs\|logbsize\|logdev\|rtdev\|sunit\|swidth\)=/ nextgroup=fsOptionsString
-syn keyword fsOptionsKeywords contained dmapi xdsm noalign noatime norecovery osyncisdsync quota usrquota uquoenforce grpquota gquoenforce
+syn keyword fsOptionsKeywords contained dmapi xdsm noalign noatime noquota norecovery osyncisdsync quota usrquota uqnoenforce grpquota gqnoenforce
" Frequency / Pass No.
syn cluster fsFreqPassCluster contains=fsFreqPassNumber,fsFreqPassError
@@ -172,7 +199,9 @@ if version >= 508 || !exists("did_config_syntax_inits")
HiLink fsDeviceLabel String
HiLink fsFreqPassNumber Number
- HiLink fsTypeError Error
+ if exists('fstab_unknown_fs_errors')
+ HiLink fsTypeUnknown Error
+ endif
HiLink fsDeviceError Error
HiLink fsMountPointError Error
HiLink fsMountPointKeyword Keyword
diff --git a/runtime/syntax/nosyntax.vim b/runtime/syntax/nosyntax.vim
index b0b0c17dfae599b754dffd438734f8bc8e533513..0ab34123730f938c0c641af67eb13e7214ddd9e2 100644
--- a/runtime/syntax/nosyntax.vim
+++ b/runtime/syntax/nosyntax.vim
@@ -1,6 +1,6 @@
" Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2000 Jul 15
+" Last Change: 2006 Apr 16
" This file is used for ":syntax off".
" It removes the autocommands and stops highlighting for all buffers.
@@ -9,6 +9,10 @@ if !has("syntax")
finish
endif
+" Remove all autocommands for the Syntax event. This also avoids that
+" "syntax=foo" in a modeline triggers the SynSet() function of synload.vim.
+au! Syntax
+
" remove all syntax autocommands and remove the syntax for each buffer
augroup syntaxset
au!
@@ -18,9 +22,6 @@ augroup syntaxset
au!
augroup END
-" Just in case: remove all autocommands for the Syntax event
-au! Syntax
-
if exists("syntax_on")
unlet syntax_on
endif
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index 0c36d7f33fab34067ec45e4611fefe9c614f9bfe..233c8d9c599e976301d3e7b03b651a76f3199e85 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -1,10 +1,10 @@
" Vim syntax file
" Language: Postfix main.cf configuration
" Maintainer: KELEMEN Peter <Peter dot Kelemen at cern dot ch>
-" Last Change: 2004 Jun 01
-" Version: 0.12
+" Last Change: 2006 Apr 15
+" Version: 0.20
" URL: http://cern.ch/fuji/vim/syntax/pfmain.vim
-" Comment: Based on Postfix 2.1.1 defaults. (+TLS)
+" Comment: Based on Postfix 2.3.x defaults.
if version < 600
syntax clear
@@ -36,6 +36,7 @@ syntax keyword pfmainConf address_verify_positive_refresh_time
syntax keyword pfmainConf address_verify_relay_transport
syntax keyword pfmainConf address_verify_relayhost
syntax keyword pfmainConf address_verify_sender
+syntax keyword pfmainConf address_verify_sender_dependent_relayhost_maps
syntax keyword pfmainConf address_verify_service_name
syntax keyword pfmainConf address_verify_transport_maps
syntax keyword pfmainConf address_verify_virtual_transport
@@ -48,9 +49,14 @@ syntax keyword pfmainConf allow_percent_hack
syntax keyword pfmainConf allow_untrusted_routing
syntax keyword pfmainConf alternate_config_directories
syntax keyword pfmainConf always_bcc
+syntax keyword pfmainConf anvil_rate_time_unit
+syntax keyword pfmainConf anvil_status_update_time
syntax keyword pfmainConf append_at_myorigin
syntax keyword pfmainConf append_dot_mydomain
syntax keyword pfmainConf application_event_drain_time
+syntax keyword pfmainConf authorized_flush_users
+syntax keyword pfmainConf authorized_mailq_users
+syntax keyword pfmainConf authorized_submit_users
syntax keyword pfmainConf backwards_bounce_logfile_compatibility
syntax keyword pfmainConf berkeley_db_create_buffer_size
syntax keyword pfmainConf berkeley_db_read_buffer_size
@@ -62,13 +68,20 @@ syntax keyword pfmainConf bounce_notice_recipient
syntax keyword pfmainConf bounce_queue_lifetime
syntax keyword pfmainConf bounce_service_name
syntax keyword pfmainConf bounce_size_limit
+syntax keyword pfmainConf bounce_template_file
syntax keyword pfmainConf broken_sasl_auth_clients
+syntax keyword pfmainConf canonical_classes
syntax keyword pfmainConf canonical_maps
syntax keyword pfmainConf cleanup_service_name
syntax keyword pfmainConf command_directory
+syntax keyword pfmainConf command_execution_directory
syntax keyword pfmainConf command_expansion_filter
syntax keyword pfmainConf command_time_limit
syntax keyword pfmainConf config_directory
+syntax keyword pfmainConf connection_cache_protocol_timeout
+syntax keyword pfmainConf connection_cache_service_name
+syntax keyword pfmainConf connection_cache_status_update_time
+syntax keyword pfmainConf connection_cache_ttl_limit
syntax keyword pfmainConf content_filter
syntax keyword pfmainConf daemon_directory
syntax keyword pfmainConf daemon_timeout
@@ -91,6 +104,7 @@ syntax keyword pfmainConf default_verp_delimiters
syntax keyword pfmainConf defer_code
syntax keyword pfmainConf defer_service_name
syntax keyword pfmainConf defer_transports
+syntax keyword pfmainConf delay_logging_resolution_limit
syntax keyword pfmainConf delay_notice_recipient
syntax keyword pfmainConf delay_warning_time
syntax keyword pfmainConf deliver_lock_attempts
@@ -104,14 +118,14 @@ syntax keyword pfmainConf dont_remove
syntax keyword pfmainConf double_bounce_sender
syntax keyword pfmainConf duplicate_filter_limit
syntax keyword pfmainConf empty_address_recipient
-syntax keyword pfmainConf enable_errors_to
syntax keyword pfmainConf enable_original_recipient
syntax keyword pfmainConf error_notice_recipient
syntax keyword pfmainConf error_service_name
+syntax keyword pfmainConf execution_directory_expansion_filter
syntax keyword pfmainConf expand_owner_alias
syntax keyword pfmainConf export_environment
-syntax keyword pfmainConf fallback_relay
syntax keyword pfmainConf fallback_transport
+syntax keyword pfmainConf fallback_transport_maps
syntax keyword pfmainConf fast_flush_domains
syntax keyword pfmainConf fast_flush_purge_time
syntax keyword pfmainConf fast_flush_refresh_time
@@ -121,6 +135,7 @@ syntax keyword pfmainConf fork_attempts
syntax keyword pfmainConf fork_delay
syntax keyword pfmainConf forward_expansion_filter
syntax keyword pfmainConf forward_path
+syntax keyword pfmainConf frozen_delivered_to
syntax keyword pfmainConf hash_queue_depth
syntax keyword pfmainConf hash_queue_names
syntax keyword pfmainConf header_address_token_limit
@@ -134,34 +149,68 @@ syntax keyword pfmainConf ignore_mx_lookup_error
syntax keyword pfmainConf import_environment
syntax keyword pfmainConf in_flow_delay
syntax keyword pfmainConf inet_interfaces
+syntax keyword pfmainConf inet_protocols
syntax keyword pfmainConf initial_destination_concurrency
syntax keyword pfmainConf invalid_hostname_reject_code
syntax keyword pfmainConf ipc_idle
syntax keyword pfmainConf ipc_timeout
syntax keyword pfmainConf ipc_ttl
syntax keyword pfmainConf line_length_limit
-syntax keyword pfmainConf lmtp_cache_connection
+syntax keyword pfmainConf lmtp_bind_address
+syntax keyword pfmainConf lmtp_bind_address6
+syntax keyword pfmainConf lmtp_cname_overrides_servername
syntax keyword pfmainConf lmtp_connect_timeout
+syntax keyword pfmainConf lmtp_connection_cache_destinations
+syntax keyword pfmainConf lmtp_connection_cache_on_demand
+syntax keyword pfmainConf lmtp_connection_cache_time_limit
+syntax keyword pfmainConf lmtp_connection_reuse_time_limit
syntax keyword pfmainConf lmtp_data_done_timeout
syntax keyword pfmainConf lmtp_data_init_timeout
syntax keyword pfmainConf lmtp_data_xfer_timeout
+syntax keyword pfmainConf lmtp_defer_if_no_mx_address_found
syntax keyword pfmainConf lmtp_destination_concurrency_limit
syntax keyword pfmainConf lmtp_destination_recipient_limit
+syntax keyword pfmainConf lmtp_discard_lhlo_keyword_address_maps
+syntax keyword pfmainConf lmtp_discard_lhlo_keywords
+syntax keyword pfmainConf lmtp_enforce_tls
+syntax keyword pfmainConf lmtp_generic_maps
+syntax keyword pfmainConf lmtp_host_lookup
+syntax keyword pfmainConf lmtp_lhlo_name
syntax keyword pfmainConf lmtp_lhlo_timeout
+syntax keyword pfmainConf lmtp_line_length_limit
syntax keyword pfmainConf lmtp_mail_timeout
+syntax keyword pfmainConf lmtp_mx_address_limit
+syntax keyword pfmainConf lmtp_mx_session_limit
+syntax keyword pfmainConf lmtp_pix_workaround_delay_time
+syntax keyword pfmainConf lmtp_pix_workaround_threshold_time
syntax keyword pfmainConf lmtp_quit_timeout
+syntax keyword pfmainConf lmtp_quote_rfc821_envelope
+syntax keyword pfmainConf lmtp_randomize_addresses
syntax keyword pfmainConf lmtp_rcpt_timeout
syntax keyword pfmainConf lmtp_rset_timeout
syntax keyword pfmainConf lmtp_sasl_auth_enable
+syntax keyword pfmainConf lmtp_sasl_mechanism_filter
syntax keyword pfmainConf lmtp_sasl_password_maps
+syntax keyword pfmainConf lmtp_sasl_path
syntax keyword pfmainConf lmtp_sasl_security_options
+syntax keyword pfmainConf lmtp_sasl_tls_security_options
+syntax keyword pfmainConf lmtp_sasl_tls_verified_security_options
+syntax keyword pfmainConf lmtp_sasl_type
syntax keyword pfmainConf lmtp_send_xforward_command
-syntax keyword pfmainConf lmtp_skip_quit_response
+syntax keyword pfmainConf lmtp_sender_dependent_authentication
+syntax keyword pfmainConf lmtp_skip_5xx_greeting
+syntax keyword pfmainConf lmtp_starttls_timeout
syntax keyword pfmainConf lmtp_tcp_port
+syntax keyword pfmainConf lmtp_tls_enforce_peername
+syntax keyword pfmainConf lmtp_tls_note_starttls_offer
+syntax keyword pfmainConf lmtp_tls_per_site
+syntax keyword pfmainConf lmtp_tls_scert_verifydepth
+syntax keyword pfmainConf lmtp_use_tls
syntax keyword pfmainConf lmtp_xforward_timeout
syntax keyword pfmainConf local_command_shell
syntax keyword pfmainConf local_destination_concurrency_limit
syntax keyword pfmainConf local_destination_recipient_limit
+syntax keyword pfmainConf local_header_rewrite_clients
syntax keyword pfmainConf local_recipient_maps
syntax keyword pfmainConf local_transport
syntax keyword pfmainConf luser_relay
@@ -175,6 +224,7 @@ syntax keyword pfmainConf mailbox_command_maps
syntax keyword pfmainConf mailbox_delivery_lock
syntax keyword pfmainConf mailbox_size_limit
syntax keyword pfmainConf mailbox_transport
+syntax keyword pfmainConf mailbox_transport_maps
syntax keyword pfmainConf mailq_path
syntax keyword pfmainConf manpage_directory
syntax keyword pfmainConf maps_rbl_domains
@@ -186,7 +236,9 @@ syntax keyword pfmainConf max_idle
syntax keyword pfmainConf max_use
syntax keyword pfmainConf maximal_backoff_time
syntax keyword pfmainConf maximal_queue_lifetime
+syntax keyword pfmainConf message_reject_characters
syntax keyword pfmainConf message_size_limit
+syntax keyword pfmainConf message_strip_characters
syntax keyword pfmainConf mime_boundary_length_limit
syntax keyword pfmainConf mime_header_checks
syntax keyword pfmainConf mime_nesting_limit
@@ -206,6 +258,7 @@ syntax keyword pfmainConf owner_request_special
syntax keyword pfmainConf parent_domain_matches_subdomains
syntax keyword pfmainConf permit_mx_backup_networks
syntax keyword pfmainConf pickup_service_name
+syntax keyword pfmainConf plaintext_reject_code
syntax keyword pfmainConf prepend_delivered_header
syntax keyword pfmainConf process_id_directory
syntax keyword pfmainConf propagate_unmatched_extensions
@@ -228,6 +281,7 @@ syntax keyword pfmainConf rbl_reply_maps
syntax keyword pfmainConf readme_directory
syntax keyword pfmainConf receive_override_options
syntax keyword pfmainConf recipient_bcc_maps
+syntax keyword pfmainConf recipient_canonical_classes
syntax keyword pfmainConf recipient_canonical_maps
syntax keyword pfmainConf recipient_delimiter
syntax keyword pfmainConf reject_code
@@ -240,14 +294,17 @@ syntax keyword pfmainConf relay_recipient_maps
syntax keyword pfmainConf relay_transport
syntax keyword pfmainConf relayhost
syntax keyword pfmainConf relocated_maps
+syntax keyword pfmainConf remote_header_rewrite_domain
syntax keyword pfmainConf require_home_directory
syntax keyword pfmainConf resolve_dequoted_address
syntax keyword pfmainConf resolve_null_domain
+syntax keyword pfmainConf resolve_numeric_domain
syntax keyword pfmainConf rewrite_service_name
syntax keyword pfmainConf sample_directory
-syntax keyword pfmainConf sender_based_routing
syntax keyword pfmainConf sender_bcc_maps
+syntax keyword pfmainConf sender_canonical_classes
syntax keyword pfmainConf sender_canonical_maps
+syntax keyword pfmainConf sender_dependent_relayhost_maps
syntax keyword pfmainConf sendmail_path
syntax keyword pfmainConf service_throttle_time
syntax keyword pfmainConf setgid_group
@@ -255,14 +312,24 @@ syntax keyword pfmainConf show_user_unknown_table_name
syntax keyword pfmainConf showq_service_name
syntax keyword pfmainConf smtp_always_send_ehlo
syntax keyword pfmainConf smtp_bind_address
+syntax keyword pfmainConf smtp_bind_address6
+syntax keyword pfmainConf smtp_cname_overrides_servername
syntax keyword pfmainConf smtp_connect_timeout
+syntax keyword pfmainConf smtp_connection_cache_destinations
+syntax keyword pfmainConf smtp_connection_cache_on_demand
+syntax keyword pfmainConf smtp_connection_cache_time_limit
+syntax keyword pfmainConf smtp_connection_reuse_time_limit
syntax keyword pfmainConf smtp_data_done_timeout
syntax keyword pfmainConf smtp_data_init_timeout
syntax keyword pfmainConf smtp_data_xfer_timeout
syntax keyword pfmainConf smtp_defer_if_no_mx_address_found
syntax keyword pfmainConf smtp_destination_concurrency_limit
syntax keyword pfmainConf smtp_destination_recipient_limit
+syntax keyword pfmainConf smtp_discard_ehlo_keyword_address_maps
+syntax keyword pfmainConf smtp_discard_ehlo_keywords
syntax keyword pfmainConf smtp_enforce_tls
+syntax keyword pfmainConf smtp_fallback_relay
+syntax keyword pfmainConf smtp_generic_maps
syntax keyword pfmainConf smtp_helo_name
syntax keyword pfmainConf smtp_helo_timeout
syntax keyword pfmainConf smtp_host_lookup
@@ -279,11 +346,15 @@ syntax keyword pfmainConf smtp_randomize_addresses
syntax keyword pfmainConf smtp_rcpt_timeout
syntax keyword pfmainConf smtp_rset_timeout
syntax keyword pfmainConf smtp_sasl_auth_enable
+syntax keyword pfmainConf smtp_sasl_mechanism_filter
syntax keyword pfmainConf smtp_sasl_password_maps
+syntax keyword pfmainConf smtp_sasl_path
syntax keyword pfmainConf smtp_sasl_security_options
syntax keyword pfmainConf smtp_sasl_tls_security_options
syntax keyword pfmainConf smtp_sasl_tls_verified_security_options
+syntax keyword pfmainConf smtp_sasl_type
syntax keyword pfmainConf smtp_send_xforward_command
+syntax keyword pfmainConf smtp_sender_dependent_authentication
syntax keyword pfmainConf smtp_skip_5xx_greeting
syntax keyword pfmainConf smtp_skip_quit_response
syntax keyword pfmainConf smtp_starttls_timeout
@@ -308,15 +379,23 @@ syntax keyword pfmainConf smtpd_authorized_xclient_hosts
syntax keyword pfmainConf smtpd_authorized_xforward_hosts
syntax keyword pfmainConf smtpd_banner
syntax keyword pfmainConf smtpd_client_connection_count_limit
-syntax keyword pfmainConf smtpd_client_connection_limit_exceptions
syntax keyword pfmainConf smtpd_client_connection_rate_limit
+syntax keyword pfmainConf smtpd_client_event_limit_exceptions
+syntax keyword pfmainConf smtpd_client_message_rate_limit
+syntax keyword pfmainConf smtpd_client_new_tls_session_rate_limit
+syntax keyword pfmainConf smtpd_client_recipient_rate_limit
syntax keyword pfmainConf smtpd_client_restrictions
syntax keyword pfmainConf smtpd_data_restrictions
+syntax keyword pfmainConf smtpd_delay_open_until_valid_rcpt
syntax keyword pfmainConf smtpd_delay_reject
+syntax keyword pfmainConf smtpd_discard_ehlo_keyword_address_maps
+syntax keyword pfmainConf smtpd_discard_ehlo_keywords
+syntax keyword pfmainConf smtpd_end_of_data_restrictions
syntax keyword pfmainConf smtpd_enforce_tls
syntax keyword pfmainConf smtpd_error_sleep_time
syntax keyword pfmainConf smtpd_etrn_restrictions
syntax keyword pfmainConf smtpd_expansion_filter
+syntax keyword pfmainConf smtpd_forbidden_commands
syntax keyword pfmainConf smtpd_hard_error_limit
syntax keyword pfmainConf smtpd_helo_required
syntax keyword pfmainConf smtpd_helo_restrictions
@@ -324,6 +403,7 @@ syntax keyword pfmainConf smtpd_history_flush_threshold
syntax keyword pfmainConf smtpd_junk_command_limit
syntax keyword pfmainConf smtpd_noop_commands
syntax keyword pfmainConf smtpd_null_access_lookup_key
+syntax keyword pfmainConf smtpd_peername_lookup
syntax keyword pfmainConf smtpd_policy_service_max_idle
syntax keyword pfmainConf smtpd_policy_service_max_ttl
syntax keyword pfmainConf smtpd_policy_service_timeout
@@ -336,12 +416,14 @@ syntax keyword pfmainConf smtpd_recipient_restrictions
syntax keyword pfmainConf smtpd_reject_unlisted_recipient
syntax keyword pfmainConf smtpd_reject_unlisted_sender
syntax keyword pfmainConf smtpd_restriction_classes
-syntax keyword pfmainConf smtpd_sasl_application_name
syntax keyword pfmainConf smtpd_sasl_auth_enable
+syntax keyword pfmainConf smtpd_sasl_authenticated_header
syntax keyword pfmainConf smtpd_sasl_exceptions_networks
syntax keyword pfmainConf smtpd_sasl_local_domain
+syntax keyword pfmainConf smtpd_sasl_path
syntax keyword pfmainConf smtpd_sasl_security_options
syntax keyword pfmainConf smtpd_sasl_tls_security_options
+syntax keyword pfmainConf smtpd_sasl_type
syntax keyword pfmainConf smtpd_sender_login_maps
syntax keyword pfmainConf smtpd_sender_restrictions
syntax keyword pfmainConf smtpd_soft_error_limit
@@ -378,7 +460,6 @@ syntax keyword pfmainConf swap_bangpath
syntax keyword pfmainConf syslog_facility
syntax keyword pfmainConf syslog_name
syntax keyword pfmainConf tls_daemon_random_bytes
-syntax keyword pfmainConf tls_daemon_random_source
syntax keyword pfmainConf tls_random_bytes
syntax keyword pfmainConf tls_random_exchange_name
syntax keyword pfmainConf tls_random_prng_update_period
@@ -429,6 +510,7 @@ syntax match pfmainRef "$\<address_verify_positive_refresh_time\>"
syntax match pfmainRef "$\<address_verify_relay_transport\>"
syntax match pfmainRef "$\<address_verify_relayhost\>"
syntax match pfmainRef "$\<address_verify_sender\>"
+syntax match pfmainRef "$\<address_verify_sender_dependent_relayhost_maps\>"
syntax match pfmainRef "$\<address_verify_service_name\>"
syntax match pfmainRef "$\<address_verify_transport_maps\>"
syntax match pfmainRef "$\<address_verify_virtual_transport\>"
@@ -441,9 +523,14 @@ syntax match pfmainRef "$\<allow_percent_hack\>"
syntax match pfmainRef "$\<allow_untrusted_routing\>"
syntax match pfmainRef "$\<alternate_config_directories\>"
syntax match pfmainRef "$\<always_bcc\>"
+syntax match pfmainRef "$\<anvil_rate_time_unit\>"
+syntax match pfmainRef "$\<anvil_status_update_time\>"
syntax match pfmainRef "$\<append_at_myorigin\>"
syntax match pfmainRef "$\<append_dot_mydomain\>"
syntax match pfmainRef "$\<application_event_drain_time\>"
+syntax match pfmainRef "$\<authorized_flush_users\>"
+syntax match pfmainRef "$\<authorized_mailq_users\>"
+syntax match pfmainRef "$\<authorized_submit_users\>"
syntax match pfmainRef "$\<backwards_bounce_logfile_compatibility\>"
syntax match pfmainRef "$\<berkeley_db_create_buffer_size\>"
syntax match pfmainRef "$\<berkeley_db_read_buffer_size\>"
@@ -455,13 +542,20 @@ syntax match pfmainRef "$\<bounce_notice_recipient\>"
syntax match pfmainRef "$\<bounce_queue_lifetime\>"
syntax match pfmainRef "$\<bounce_service_name\>"
syntax match pfmainRef "$\<bounce_size_limit\>"
+syntax match pfmainRef "$\<bounce_template_file\>"
syntax match pfmainRef "$\<broken_sasl_auth_clients\>"
+syntax match pfmainRef "$\<canonical_classes\>"
syntax match pfmainRef "$\<canonical_maps\>"
syntax match pfmainRef "$\<cleanup_service_name\>"
syntax match pfmainRef "$\<command_directory\>"
+syntax match pfmainRef "$\<command_execution_directory\>"
syntax match pfmainRef "$\<command_expansion_filter\>"
syntax match pfmainRef "$\<command_time_limit\>"
syntax match pfmainRef "$\<config_directory\>"
+syntax match pfmainRef "$\<connection_cache_protocol_timeout\>"
+syntax match pfmainRef "$\<connection_cache_service_name\>"
+syntax match pfmainRef "$\<connection_cache_status_update_time\>"
+syntax match pfmainRef "$\<connection_cache_ttl_limit\>"
syntax match pfmainRef "$\<content_filter\>"
syntax match pfmainRef "$\<daemon_directory\>"
syntax match pfmainRef "$\<daemon_timeout\>"
@@ -484,6 +578,7 @@ syntax match pfmainRef "$\<default_verp_delimiters\>"
syntax match pfmainRef "$\<defer_code\>"
syntax match pfmainRef "$\<defer_service_name\>"
syntax match pfmainRef "$\<defer_transports\>"
+syntax match pfmainRef "$\<delay_logging_resolution_limit\>"
syntax match pfmainRef "$\<delay_notice_recipient\>"
syntax match pfmainRef "$\<delay_warning_time\>"
syntax match pfmainRef "$\<deliver_lock_attempts\>"
@@ -497,14 +592,14 @@ syntax match pfmainRef "$\<dont_remove\>"
syntax match pfmainRef "$\<double_bounce_sender\>"
syntax match pfmainRef "$\<duplicate_filter_limit\>"
syntax match pfmainRef "$\<empty_address_recipient\>"
-syntax match pfmainRef "$\<enable_errors_to\>"
syntax match pfmainRef "$\<enable_original_recipient\>"
syntax match pfmainRef "$\<error_notice_recipient\>"
syntax match pfmainRef "$\<error_service_name\>"
+syntax match pfmainRef "$\<execution_directory_expansion_filter\>"
syntax match pfmainRef "$\<expand_owner_alias\>"
syntax match pfmainRef "$\<export_environment\>"
-syntax match pfmainRef "$\<fallback_relay\>"
syntax match pfmainRef "$\<fallback_transport\>"
+syntax match pfmainRef "$\<fallback_transport_maps\>"
syntax match pfmainRef "$\<fast_flush_domains\>"
syntax match pfmainRef "$\<fast_flush_purge_time\>"
syntax match pfmainRef "$\<fast_flush_refresh_time\>"
@@ -514,6 +609,7 @@ syntax match pfmainRef "$\<fork_attempts\>"
syntax match pfmainRef "$\<fork_delay\>"
syntax match pfmainRef "$\<forward_expansion_filter\>"
syntax match pfmainRef "$\<forward_path\>"
+syntax match pfmainRef "$\<frozen_delivered_to\>"
syntax match pfmainRef "$\<hash_queue_depth\>"
syntax match pfmainRef "$\<hash_queue_names\>"
syntax match pfmainRef "$\<header_address_token_limit\>"
@@ -527,34 +623,68 @@ syntax match pfmainRef "$\<ignore_mx_lookup_error\>"
syntax match pfmainRef "$\<import_environment\>"
syntax match pfmainRef "$\<in_flow_delay\>"
syntax match pfmainRef "$\<inet_interfaces\>"
+syntax match pfmainRef "$\<inet_protocols\>"
syntax match pfmainRef "$\<initial_destination_concurrency\>"
syntax match pfmainRef "$\<invalid_hostname_reject_code\>"
syntax match pfmainRef "$\<ipc_idle\>"
syntax match pfmainRef "$\<ipc_timeout\>"
syntax match pfmainRef "$\<ipc_ttl\>"
syntax match pfmainRef "$\<line_length_limit\>"
-syntax match pfmainRef "$\<lmtp_cache_connection\>"
+syntax match pfmainRef "$\<lmtp_bind_address\>"
+syntax match pfmainRef "$\<lmtp_bind_address6\>"
+syntax match pfmainRef "$\<lmtp_cname_overrides_servername\>"
syntax match pfmainRef "$\<lmtp_connect_timeout\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_destinations\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_on_demand\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_time_limit\>"
+syntax match pfmainRef "$\<lmtp_connection_reuse_time_limit\>"
syntax match pfmainRef "$\<lmtp_data_done_timeout\>"
syntax match pfmainRef "$\<lmtp_data_init_timeout\>"
syntax match pfmainRef "$\<lmtp_data_xfer_timeout\>"
+syntax match pfmainRef "$\<lmtp_defer_if_no_mx_address_found\>"
syntax match pfmainRef "$\<lmtp_destination_concurrency_limit\>"
syntax match pfmainRef "$\<lmtp_destination_recipient_limit\>"
+syntax match pfmainRef "$\<lmtp_discard_lhlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<lmtp_discard_lhlo_keywords\>"
+syntax match pfmainRef "$\<lmtp_enforce_tls\>"
+syntax match pfmainRef "$\<lmtp_generic_maps\>"
+syntax match pfmainRef "$\<lmtp_host_lookup\>"
+syntax match pfmainRef "$\<lmtp_lhlo_name\>"
syntax match pfmainRef "$\<lmtp_lhlo_timeout\>"
+syntax match pfmainRef "$\<lmtp_line_length_limit\>"
syntax match pfmainRef "$\<lmtp_mail_timeout\>"
+syntax match pfmainRef "$\<lmtp_mx_address_limit\>"
+syntax match pfmainRef "$\<lmtp_mx_session_limit\>"
+syntax match pfmainRef "$\<lmtp_pix_workaround_delay_time\>"
+syntax match pfmainRef "$\<lmtp_pix_workaround_threshold_time\>"
syntax match pfmainRef "$\<lmtp_quit_timeout\>"
+syntax match pfmainRef "$\<lmtp_quote_rfc821_envelope\>"
+syntax match pfmainRef "$\<lmtp_randomize_addresses\>"
syntax match pfmainRef "$\<lmtp_rcpt_timeout\>"
syntax match pfmainRef "$\<lmtp_rset_timeout\>"
syntax match pfmainRef "$\<lmtp_sasl_auth_enable\>"
+syntax match pfmainRef "$\<lmtp_sasl_mechanism_filter\>"
syntax match pfmainRef "$\<lmtp_sasl_password_maps\>"
+syntax match pfmainRef "$\<lmtp_sasl_path\>"
syntax match pfmainRef "$\<lmtp_sasl_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_tls_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_tls_verified_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_type\>"
syntax match pfmainRef "$\<lmtp_send_xforward_command\>"
-syntax match pfmainRef "$\<lmtp_skip_quit_response\>"
+syntax match pfmainRef "$\<lmtp_sender_dependent_authentication\>"
+syntax match pfmainRef "$\<lmtp_skip_5xx_greeting\>"
+syntax match pfmainRef "$\<lmtp_starttls_timeout\>"
syntax match pfmainRef "$\<lmtp_tcp_port\>"
+syntax match pfmainRef "$\<lmtp_tls_enforce_peername\>"
+syntax match pfmainRef "$\<lmtp_tls_note_starttls_offer\>"
+syntax match pfmainRef "$\<lmtp_tls_per_site\>"
+syntax match pfmainRef "$\<lmtp_tls_scert_verifydepth\>"
+syntax match pfmainRef "$\<lmtp_use_tls\>"
syntax match pfmainRef "$\<lmtp_xforward_timeout\>"
syntax match pfmainRef "$\<local_command_shell\>"
syntax match pfmainRef "$\<local_destination_concurrency_limit\>"
syntax match pfmainRef "$\<local_destination_recipient_limit\>"
+syntax match pfmainRef "$\<local_header_rewrite_clients\>"
syntax match pfmainRef "$\<local_recipient_maps\>"
syntax match pfmainRef "$\<local_transport\>"
syntax match pfmainRef "$\<luser_relay\>"
@@ -568,6 +698,7 @@ syntax match pfmainRef "$\<mailbox_command_maps\>"
syntax match pfmainRef "$\<mailbox_delivery_lock\>"
syntax match pfmainRef "$\<mailbox_size_limit\>"
syntax match pfmainRef "$\<mailbox_transport\>"
+syntax match pfmainRef "$\<mailbox_transport_maps\>"
syntax match pfmainRef "$\<mailq_path\>"
syntax match pfmainRef "$\<manpage_directory\>"
syntax match pfmainRef "$\<maps_rbl_domains\>"
@@ -579,7 +710,9 @@ syntax match pfmainRef "$\<max_idle\>"
syntax match pfmainRef "$\<max_use\>"
syntax match pfmainRef "$\<maximal_backoff_time\>"
syntax match pfmainRef "$\<maximal_queue_lifetime\>"
+syntax match pfmainRef "$\<message_reject_characters\>"
syntax match pfmainRef "$\<message_size_limit\>"
+syntax match pfmainRef "$\<message_strip_characters\>"
syntax match pfmainRef "$\<mime_boundary_length_limit\>"
syntax match pfmainRef "$\<mime_header_checks\>"
syntax match pfmainRef "$\<mime_nesting_limit\>"
@@ -599,6 +732,7 @@ syntax match pfmainRef "$\<owner_request_special\>"
syntax match pfmainRef "$\<parent_domain_matches_subdomains\>"
syntax match pfmainRef "$\<permit_mx_backup_networks\>"
syntax match pfmainRef "$\<pickup_service_name\>"
+syntax match pfmainRef "$\<plaintext_reject_code\>"
syntax match pfmainRef "$\<prepend_delivered_header\>"
syntax match pfmainRef "$\<process_id_directory\>"
syntax match pfmainRef "$\<propagate_unmatched_extensions\>"
@@ -621,6 +755,7 @@ syntax match pfmainRef "$\<rbl_reply_maps\>"
syntax match pfmainRef "$\<readme_directory\>"
syntax match pfmainRef "$\<receive_override_options\>"
syntax match pfmainRef "$\<recipient_bcc_maps\>"
+syntax match pfmainRef "$\<recipient_canonical_classes\>"
syntax match pfmainRef "$\<recipient_canonical_maps\>"
syntax match pfmainRef "$\<recipient_delimiter\>"
syntax match pfmainRef "$\<reject_code\>"
@@ -633,14 +768,17 @@ syntax match pfmainRef "$\<relay_recipient_maps\>"
syntax match pfmainRef "$\<relay_transport\>"
syntax match pfmainRef "$\<relayhost\>"
syntax match pfmainRef "$\<relocated_maps\>"
+syntax match pfmainRef "$\<remote_header_rewrite_domain\>"
syntax match pfmainRef "$\<require_home_directory\>"
syntax match pfmainRef "$\<resolve_dequoted_address\>"
syntax match pfmainRef "$\<resolve_null_domain\>"
+syntax match pfmainRef "$\<resolve_numeric_domain\>"
syntax match pfmainRef "$\<rewrite_service_name\>"
syntax match pfmainRef "$\<sample_directory\>"
-syntax match pfmainRef "$\<sender_based_routing\>"
syntax match pfmainRef "$\<sender_bcc_maps\>"
+syntax match pfmainRef "$\<sender_canonical_classes\>"
syntax match pfmainRef "$\<sender_canonical_maps\>"
+syntax match pfmainRef "$\<sender_dependent_relayhost_maps\>"
syntax match pfmainRef "$\<sendmail_path\>"
syntax match pfmainRef "$\<service_throttle_time\>"
syntax match pfmainRef "$\<setgid_group\>"
@@ -648,14 +786,24 @@ syntax match pfmainRef "$\<show_user_unknown_table_name\>"
syntax match pfmainRef "$\<showq_service_name\>"
syntax match pfmainRef "$\<smtp_always_send_ehlo\>"
syntax match pfmainRef "$\<smtp_bind_address\>"
+syntax match pfmainRef "$\<smtp_bind_address6\>"
+syntax match pfmainRef "$\<smtp_cname_overrides_servername\>"
syntax match pfmainRef "$\<smtp_connect_timeout\>"
+syntax match pfmainRef "$\<smtp_connection_cache_destinations\>"
+syntax match pfmainRef "$\<smtp_connection_cache_on_demand\>"
+syntax match pfmainRef "$\<smtp_connection_cache_time_limit\>"
+syntax match pfmainRef "$\<smtp_connection_reuse_time_limit\>"
syntax match pfmainRef "$\<smtp_data_done_timeout\>"
syntax match pfmainRef "$\<smtp_data_init_timeout\>"
syntax match pfmainRef "$\<smtp_data_xfer_timeout\>"
syntax match pfmainRef "$\<smtp_defer_if_no_mx_address_found\>"
syntax match pfmainRef "$\<smtp_destination_concurrency_limit\>"
syntax match pfmainRef "$\<smtp_destination_recipient_limit\>"
+syntax match pfmainRef "$\<smtp_discard_ehlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<smtp_discard_ehlo_keywords\>"
syntax match pfmainRef "$\<smtp_enforce_tls\>"
+syntax match pfmainRef "$\<smtp_fallback_relay\>"
+syntax match pfmainRef "$\<smtp_generic_maps\>"
syntax match pfmainRef "$\<smtp_helo_name\>"
syntax match pfmainRef "$\<smtp_helo_timeout\>"
syntax match pfmainRef "$\<smtp_host_lookup\>"
@@ -672,11 +820,15 @@ syntax match pfmainRef "$\<smtp_randomize_addresses\>"
syntax match pfmainRef "$\<smtp_rcpt_timeout\>"
syntax match pfmainRef "$\<smtp_rset_timeout\>"
syntax match pfmainRef "$\<smtp_sasl_auth_enable\>"
+syntax match pfmainRef "$\<smtp_sasl_mechanism_filter\>"
syntax match pfmainRef "$\<smtp_sasl_password_maps\>"
+syntax match pfmainRef "$\<smtp_sasl_path\>"
syntax match pfmainRef "$\<smtp_sasl_security_options\>"
syntax match pfmainRef "$\<smtp_sasl_tls_security_options\>"
syntax match pfmainRef "$\<smtp_sasl_tls_verified_security_options\>"
+syntax match pfmainRef "$\<smtp_sasl_type\>"
syntax match pfmainRef "$\<smtp_send_xforward_command\>"
+syntax match pfmainRef "$\<smtp_sender_dependent_authentication\>"
syntax match pfmainRef "$\<smtp_skip_5xx_greeting\>"
syntax match pfmainRef "$\<smtp_skip_quit_response\>"
syntax match pfmainRef "$\<smtp_starttls_timeout\>"
@@ -701,15 +853,23 @@ syntax match pfmainRef "$\<smtpd_authorized_xclient_hosts\>"
syntax match pfmainRef "$\<smtpd_authorized_xforward_hosts\>"
syntax match pfmainRef "$\<smtpd_banner\>"
syntax match pfmainRef "$\<smtpd_client_connection_count_limit\>"
-syntax match pfmainRef "$\<smtpd_client_connection_limit_exceptions\>"
syntax match pfmainRef "$\<smtpd_client_connection_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_event_limit_exceptions\>"
+syntax match pfmainRef "$\<smtpd_client_message_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_new_tls_session_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_recipient_rate_limit\>"
syntax match pfmainRef "$\<smtpd_client_restrictions\>"
syntax match pfmainRef "$\<smtpd_data_restrictions\>"
+syntax match pfmainRef "$\<smtpd_delay_open_until_valid_rcpt\>"
syntax match pfmainRef "$\<smtpd_delay_reject\>"
+syntax match pfmainRef "$\<smtpd_discard_ehlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<smtpd_discard_ehlo_keywords\>"
+syntax match pfmainRef "$\<smtpd_end_of_data_restrictions\>"
syntax match pfmainRef "$\<smtpd_enforce_tls\>"
syntax match pfmainRef "$\<smtpd_error_sleep_time\>"
syntax match pfmainRef "$\<smtpd_etrn_restrictions\>"
syntax match pfmainRef "$\<smtpd_expansion_filter\>"
+syntax match pfmainRef "$\<smtpd_forbidden_commands\>"
syntax match pfmainRef "$\<smtpd_hard_error_limit\>"
syntax match pfmainRef "$\<smtpd_helo_required\>"
syntax match pfmainRef "$\<smtpd_helo_restrictions\>"
@@ -717,6 +877,7 @@ syntax match pfmainRef "$\<smtpd_history_flush_threshold\>"
syntax match pfmainRef "$\<smtpd_junk_command_limit\>"
syntax match pfmainRef "$\<smtpd_noop_commands\>"
syntax match pfmainRef "$\<smtpd_null_access_lookup_key\>"
+syntax match pfmainRef "$\<smtpd_peername_lookup\>"
syntax match pfmainRef "$\<smtpd_policy_service_max_idle\>"
syntax match pfmainRef "$\<smtpd_policy_service_max_ttl\>"
syntax match pfmainRef "$\<smtpd_policy_service_timeout\>"
@@ -729,12 +890,14 @@ syntax match pfmainRef "$\<smtpd_recipient_restrictions\>"
syntax match pfmainRef "$\<smtpd_reject_unlisted_recipient\>"
syntax match pfmainRef "$\<smtpd_reject_unlisted_sender\>"
syntax match pfmainRef "$\<smtpd_restriction_classes\>"
-syntax match pfmainRef "$\<smtpd_sasl_application_name\>"
syntax match pfmainRef "$\<smtpd_sasl_auth_enable\>"
+syntax match pfmainRef "$\<smtpd_sasl_authenticated_header\>"
syntax match pfmainRef "$\<smtpd_sasl_exceptions_networks\>"
syntax match pfmainRef "$\<smtpd_sasl_local_domain\>"
+syntax match pfmainRef "$\<smtpd_sasl_path\>"
syntax match pfmainRef "$\<smtpd_sasl_security_options\>"
syntax match pfmainRef "$\<smtpd_sasl_tls_security_options\>"
+syntax match pfmainRef "$\<smtpd_sasl_type\>"
syntax match pfmainRef "$\<smtpd_sender_login_maps\>"
syntax match pfmainRef "$\<smtpd_sender_restrictions\>"
syntax match pfmainRef "$\<smtpd_soft_error_limit\>"
@@ -771,7 +934,6 @@ syntax match pfmainRef "$\<swap_bangpath\>"
syntax match pfmainRef "$\<syslog_facility\>"
syntax match pfmainRef "$\<syslog_name\>"
syntax match pfmainRef "$\<tls_daemon_random_bytes\>"
-syntax match pfmainRef "$\<tls_daemon_random_source\>"
syntax match pfmainRef "$\<tls_random_bytes\>"
syntax match pfmainRef "$\<tls_random_exchange_name\>"
syntax match pfmainRef "$\<tls_random_prng_update_period\>"
@@ -807,13 +969,84 @@ syntax match pfmainRef "$\<virtual_mailbox_maps\>"
syntax match pfmainRef "$\<virtual_minimum_uid\>"
syntax match pfmainRef "$\<virtual_transport\>"
syntax match pfmainRef "$\<virtual_uid_maps\>"
+syntax keyword pfmainWord all
+syntax keyword pfmainWord check_address_map
+syntax keyword pfmainWord check_ccert_access
+syntax keyword pfmainWord check_client_access
+syntax keyword pfmainWord check_etrn_access
+syntax keyword pfmainWord check_helo_access
+syntax keyword pfmainWord check_helo_mx_access
+syntax keyword pfmainWord check_helo_ns_access
+syntax keyword pfmainWord check_policy_service
+syntax keyword pfmainWord check_recipient_access
+syntax keyword pfmainWord check_recipient_maps
+syntax keyword pfmainWord check_recipient_mx_access
+syntax keyword pfmainWord check_recipient_ns_access
+syntax keyword pfmainWord check_relay_domains
+syntax keyword pfmainWord check_sender_access
+syntax keyword pfmainWord check_sender_mx_access
+syntax keyword pfmainWord check_sender_ns_access
+syntax keyword pfmainWord class
+syntax keyword pfmainWord defer_if_permit
+syntax keyword pfmainWord defer_if_reject
+syntax keyword pfmainWord dns
+syntax keyword pfmainWord envelope_recipient
+syntax keyword pfmainWord envelope_sender
+syntax keyword pfmainWord header_recipient
+syntax keyword pfmainWord header_sender
+syntax keyword pfmainWord host
+syntax keyword pfmainWord ipv4
+syntax keyword pfmainWord ipv6
+syntax keyword pfmainWord native
+syntax keyword pfmainWord permit
+syntax keyword pfmainWord permit_auth_destination
+syntax keyword pfmainWord permit_inet_interfaces
+syntax keyword pfmainWord permit_mx_backup
+syntax keyword pfmainWord permit_mynetworks
+syntax keyword pfmainWord permit_naked_ip_address
+syntax keyword pfmainWord permit_sasl_authenticated
+syntax keyword pfmainWord permit_tls_all_clientcerts
+syntax keyword pfmainWord permit_tls_clientcerts
+syntax keyword pfmainWord reject
+syntax keyword pfmainWord reject_invalid_helo_hostname
+syntax keyword pfmainWord reject_invalid_hostname
+syntax keyword pfmainWord reject_maps_rbl
+syntax keyword pfmainWord reject_multi_recipient_bounce
+syntax keyword pfmainWord reject_non_fqdn_helo_hostname
+syntax keyword pfmainWord reject_non_fqdn_hostname
+syntax keyword pfmainWord reject_non_fqdn_recipient
+syntax keyword pfmainWord reject_non_fqdn_sender
+syntax keyword pfmainWord reject_plaintext_session
+syntax keyword pfmainWord reject_rbl
+syntax keyword pfmainWord reject_rbl_client
+syntax keyword pfmainWord reject_rhsbl_client
+syntax keyword pfmainWord reject_rhsbl_helo
+syntax keyword pfmainWord reject_rhsbl_recipient
+syntax keyword pfmainWord reject_rhsbl_sender
+syntax keyword pfmainWord reject_sender_login_mismatch
+syntax keyword pfmainWord reject_unauth_destination
+syntax keyword pfmainWord reject_unauth_pipelining
+syntax keyword pfmainWord reject_unknown_address
+syntax keyword pfmainWord reject_unknown_client
+syntax keyword pfmainWord reject_unknown_client_hostname
+syntax keyword pfmainWord reject_unknown_forward_client_hostname
+syntax keyword pfmainWord reject_unknown_helo_hostname
+syntax keyword pfmainWord reject_unknown_hostname
+syntax keyword pfmainWord reject_unknown_recipient_domain
+syntax keyword pfmainWord reject_unknown_reverse_client_hostname
+syntax keyword pfmainWord reject_unknown_sender_domain
+syntax keyword pfmainWord reject_unlisted_recipient
+syntax keyword pfmainWord reject_unlisted_sender
+syntax keyword pfmainWord reject_unverified_recipient
+syntax keyword pfmainWord reject_unverified_sender
+syntax keyword pfmainWord sleep
+syntax keyword pfmainWord smtpd_access_maps
+syntax keyword pfmainWord subnet
+syntax keyword pfmainWord warn_if_reject
-syntax keyword pfmainDictDB hash btree dbm
-syntax keyword pfmainDictRE regexp pcre
-syntax keyword pfmainDictEXT ldap environ nis netinfo
-syntax keyword pfmainQueue active bounce corrupt defer deferred
-syntax keyword pfmainQueue flush incoming saved
-syntax keyword pfmainTransport smtp lmtp unix local error
+syntax keyword pfmainDict btree cidr environ hash nis pcre proxy regexp sdbm sdbm static tcp unix
+syntax keyword pfmainQueueDir incoming active deferred corrupt hold
+syntax keyword pfmainTransport smtp lmtp unix local relay uucp virtual
syntax keyword pfmainLock fcntl flock dotlock
syntax keyword pfmainAnswer yes no
@@ -821,7 +1054,32 @@ syntax match pfmainComment "#.*$"
syntax match pfmainNumber "\<\d\+\>"
syntax match pfmainTime "\<\d\+[hmsd]\>"
syntax match pfmainIP "\<\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\>"
-syntax match pfmainVariable "\$\w\+" contains=pfmainRef ",pfmainRefTLS
+syntax match pfmainVariable "\$\w\+" contains=pfmainRef
+
+syntax match pfmainSpecial "\<alias\>"
+syntax match pfmainSpecial "\<canonical\>"
+syntax match pfmainSpecial "\<command\>"
+syntax match pfmainSpecial "\<file\>"
+syntax match pfmainSpecial "\<forward\>"
+syntax match pfmainSpecial "\<noanonymous\>"
+syntax match pfmainSpecial "\<noplaintext\>"
+syntax match pfmainSpecial "\<resource\>"
+syntax match pfmainSpecial "\<software\>"
+
+syntax match pfmainSpecial "\<bounce\>"
+syntax match pfmainSpecial "\<cleanup\>"
+syntax match pfmainSpecial "\<cyrus\>"
+syntax match pfmainSpecial "\<defer\>"
+syntax match pfmainSpecial "\<error\>"
+syntax match pfmainSpecial "\<flush\>"
+syntax match pfmainSpecial "\<pickup\>"
+syntax match pfmainSpecial "\<postdrop\>"
+syntax match pfmainSpecial "\<qmgr\>"
+syntax match pfmainSpecial "\<rewrite\>"
+syntax match pfmainSpecial "\<scache\>"
+syntax match pfmainSpecial "\<showq\>"
+syntax match pfmainSpecial "\<trace\>"
+syntax match pfmainSpecial "\<verify\>"
if version >= 508 || !exists("pfmain_syntax_init")
if version < 508
@@ -831,24 +1089,22 @@ if version >= 508 || !exists("pfmain_syntax_init")
command -nargs=+ HiLink hi def link <args>
endif
- HiLink pfmainComment Comment
- HiLink pfmainConf Keyword
- HiLink pfmainNumber Number
- HiLink pfmainTime Number
- HiLink pfmainIP Number
- HiLink pfmainDictDB Type
- HiLink pfmainDictRE Type
- HiLink pfmainDictEXT Type
- HiLink pfmainQueue Constant
+ HiLink pfmainConf Statement
+ HiLink pfmainRef PreProc
+ HiLink pfmainWord identifier
+
+ HiLink pfmainDict Type
+ HiLink pfmainQueueDir Constant
HiLink pfmainTransport Constant
HiLink pfmainLock Constant
HiLink pfmainAnswer Constant
- HiLink pfmainRef Macro
-
- " HiLink pfmainConfTLS Special
- " HiLink pfmainRefTLS Macro
+ HiLink pfmainComment Comment
+ HiLink pfmainNumber Number
+ HiLink pfmainTime Number
+ HiLink pfmainIP Number
HiLink pfmainVariable Error
+ HiLink pfmainSpecial Special
delcommand HiLink
endif
diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim
index 4fbc242e91b6ade0a2d7a1a3e427c04c592d68ce..6ec42d27d98eaebf7ffe214a022487ee3b85d199 100644
--- a/runtime/syntax/resolv.vim
+++ b/runtime/syntax/resolv.vim
@@ -1,10 +1,11 @@
" Vim syntax file
-" Language: resolver configuration file
-" Maintaner: Radu Dineiu <littledragon@altern.org>
-" URL: http://ld.yi.org/vim/resolv.vim
-" ChangeLog: http://ld.yi.org/vim/resolv.ChangeLog
-" Last Change: 2003 May 11
-" Version: 0.1
+" Language: resolver configuration file
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Original Maintaner: Radu Dineiu <littledragon@altern.org>
+" License: This file can be redistribued and/or modified under the same terms
+" as Vim itself.
+" URL: http://trific.ath.cx/Ftp/vim/syntax/resolv.vim
+" Last Change: 2006-04-16
if version < 600
syntax clear
@@ -14,12 +15,10 @@ endif
" Errors, comments and operators
syn match resolvError /./
-syn match resolvNull /^\s*$/
-syn match resolvComment /^\s*#.*$/
+syn match resolvComment /\s*[#;].*$/
syn match resolvOperator /[\/:]/ contained
" IP
-
syn cluster resolvIPCluster contains=resolvIPError,resolvIPSpecial
syn match resolvIPError /\%(\d\{4,}\|25[6-9]\|2[6-9]\d\|[3-9]\d\{2}\)[\.0-9]*/ contained
syn match resolvIPSpecial /\%(127\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)/ contained
@@ -30,23 +29,26 @@ syn match resolvIPNetmask contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1
syn match resolvHostname contained /\w\{-}\.[-0-9A-Za-z_\.]*/
" Particular
-syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\{1,3}/ contains=@resolvIPCluster
-syn match resolvHostnameSearch contained /\%(\w\{-}\.[-0-9A-Za-z_\.]\{-}\%(\s\|$\)\)\{1,6}/
-syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?\%(\s\|$\)\)\{1,10}/ contains=resolvOperator,@resolvIPCluster
+syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\+/ contains=@resolvIPCluster
+syn match resolvHostnameSearch contained /\%(\%([-0-9A-Za-z_]\+\.\)*[-0-9A-Za-z_]\+\.\?\%(\s\|$\)\)\+/
+syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?\%(\s\|$\)\)\+/ contains=resolvOperator,@resolvIPCluster
" Identifiers
-syn match resolvNameserver /^nameserver / nextgroup=resolvIPNameserver
-syn match resolvDomain /^domain / nextgroup=resolvHostname
-syn match resolvSearch /^search / nextgroup=resolvHostnameSearch
-syn match resolvSortList /^sortlist / nextgroup=resolvIPNetmaskSortList
-syn match resolvOptions /^options / nextgroup=resolvOption
+syn match resolvNameserver /^\s*nameserver\>/ nextgroup=resolvIPNameserver skipwhite
+syn match resolvLwserver /^\s*lwserver\>/ nextgroup=resolvIPNameserver skipwhite
+syn match resolvDomain /^\s*domain\>/ nextgroup=resolvHostname skipwhite
+syn match resolvSearch /^\s*search\>/ nextgroup=resolvHostnameSearch skipwhite
+syn match resolvSortList /^\s*sortlist\>/ nextgroup=resolvIPNetmaskSortList skipwhite
+syn match resolvOptions /^\s*options\>/ nextgroup=resolvOption skipwhite
" Options
-syn match resolvOption /\%(debug\|ndots:\d\)/ contained contains=resolvOperator
+" FIXME: The manual page and the source code do not exactly agree on the set
+" of allowed options
+syn match resolvOption /\<\%(debug\|no_tld_query\|rotate\|no-check-names\|inet6\)\>/ contained nextgroup=resolvOption skipwhite
+syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contains=resolvOperator nextgroup=resolvOption skipwhite
" Additional errors
syn match resolvError /^search .\{257,}/
-syn match resolvNull /\s\{1,}$/
if version >= 508 || !exists("did_config_syntax_inits")
if version < 508
@@ -66,6 +68,7 @@ if version >= 508 || !exists("did_config_syntax_inits")
HiLink resolvIPNetmaskSortList Number
HiLink resolvNameServer Identifier
+ HiLink resolvLwserver Identifier
HiLink resolvDomain Identifier
HiLink resolvSearch Identifier
HiLink resolvSortList Identifier
diff --git a/runtime/syntax/sisu.vim b/runtime/syntax/sisu.vim
index 166f50bad026be3c97722e7e927dc6601a02b638..d211a5d392139fa7e8efd11f711010a0388c987e 100644
--- a/runtime/syntax/sisu.vim
+++ b/runtime/syntax/sisu.vim
@@ -1,6 +1,6 @@
"%% SiSU Vim syntax file
-" Markup: SiSU
" SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
+" SiSU Markup: SiSU (sisu-0.38)
" (originally looked at Ruby Vim by Mirko Nasato)
if version < 600
syntax clear
@@ -42,8 +42,11 @@ syn match sisu_error "<a href\|</a>]" contains=sisu_error
" Simple Markup:
"% header
syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^0\~\(\S\+\|[^-]\)" end="$"
+syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^0\~\(tags\?\|date\)\s\+"rs=e-1 end="\n$"
+syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^@\S\+:[+-]\?\s"rs=e-1 end="$"
+syn region sisu_header_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break matchgroup=sisu_header start="^@\(tags\?\|date\):\s\+"rs=e-1 end="\n$"
"% headings
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_structure start="^[1-8]\~\(\S\+\|[^-]\)" end="$"
+syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_structure start="^\([1-8]\|:\?[A-C]\)\~\(\S\+\|[^-]\)" end="$"
"% grouped text
syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell matchgroup=sisu_contain start="table{.\+" end="}table"
syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell matchgroup=sisu_contain start="{t\~h}" end="$$"
@@ -57,8 +60,9 @@ syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_co
"% line operations
syn region sisu_link contains=sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
syn region sisu_control contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_control start="\(\(^\| \)!_ \|<:b>\)" end="$"
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_markpara start="^_\([12]\*\?\|\*\) " end="$"
-syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
+syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_markpara start="^_\([12*]\|[12]\*\) " end="$"
+syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace,sisu_error_spell matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
+syn region sisu_comment contains=sisu_error_spell matchgroup=sisu_comment start="^%\{1,2\} " end="$"
"% font face curly brackets
syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell matchgroup=sisu_fontface start="\*{" end="}\*"
syn region sisu_control contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error,sisu_error_spell matchgroup=sisu_fontface start="!{" end="}!"
@@ -93,7 +97,6 @@ else " not Expensive
syn region sisu_content_alt matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline
endif " Expensive?
"% 5 Headers: and Headings (Document Instructions)
-syn match sisu_comment "^% .*\|^%% .*"
syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+"
syn region sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$"
"% 4 Errors?
@@ -111,6 +114,7 @@ syn match sisu_error contains=sisu_error "^[0-9]\~\s*$"
syn match sisu_error contains=sisu_error "^[0-9]\~\S\+\s*$"
syn match sisu_error contains=sisu_error "[^{]\~\^[^ \)]"
syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
+syn match sisu_error contains=sisu_error "{\~^\S\+"
syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
syn match sisu_error contains=sisu_error "<dir>"
@@ -157,6 +161,7 @@ if version >= 508 || !exists("did_sisu_syntax_inits")
HiLink sisu_action Identifier
HiLink sisu_comment Comment
HiLink sisu_error_spell SpellErrors "line does nothing
+" HiLink sisu_error_spell ErrorMsg
HiLink sisu_error_wspace Error
HiLink sisu_error Error
delcommand HiLink
diff --git a/src/GvimExt/GvimExt.reg b/src/GvimExt/GvimExt.reg
index 0169fe10bdf533b7d8b055f84d9f92a689e300e3..325c2e7d9a94fb1f2c61a94ddcb256dd011bb1ca 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.0d]
- "DisplayName"="Vim 7.0d: Edit with Vim popup menu entry"
+[HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Vim 7.0e]
+ "DisplayName"="Vim 7.0e: Edit with Vim popup menu entry"
"UninstallString"="uninstal.exe"
diff --git a/src/Makefile b/src/Makefile
index 0a8bbbe09106f37d6582a471043018069447bf91..bbcbc1ca5c764eb3245fa421e813e242d8af1564 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -880,7 +880,7 @@ MAN1DIR = /man1
### Vim version (adjusted by a script)
VIMMAJOR = 7
-VIMMINOR = 0d
+VIMMINOR = 0e
### 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/auto/configure b/src/auto/configure
index 644d4efe82d79814b971cf9382e574086a1df50e..ed5ea561718f1a46e57b88a31bf5e999cbde2e6d 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14123,7 +14123,7 @@ echo "$as_me:$LINENO: checking how to create tags" >&5
echo $ECHO_N "checking how to create tags... $ECHO_C" >&6
test -f tags && mv tags tags.save
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
- TAGPRG="ctags -I INIT+"
+ TAGPRG="ctags -I INIT+ --fields=+S"
else
(eval etags /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags"
(eval etags -c /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="etags -c"
diff --git a/src/configure.in b/src/configure.in
index 3b867e5f5b170ed0c8409cdbd83a841100a9be67..21a5f80c02ebb279bf775531aaa1561de16929cc 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -2668,6 +2668,7 @@ AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,)
dnl Check how we can run ctags
dnl --version for Exuberant ctags (preferred)
+dnl Add --fields=+S to get function signatures for omni completion.
dnl -t for typedefs (many ctags have this)
dnl -s for static functions (Elvis ctags only?)
dnl -v for variables. Dangerous, most ctags take this for 'vgrind style'.
@@ -2675,7 +2676,7 @@ dnl -i+m to test for older Exuberant ctags
AC_MSG_CHECKING(how to create tags)
test -f tags && mv tags tags.save
if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&AC_FD_CC 2>&1; then
- TAGPRG="ctags -I INIT+"
+ TAGPRG="ctags -I INIT+ --fields=+S"
else
(eval etags /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags"
(eval etags -c /dev/null) < /dev/null 1>&AC_FD_CC 2>&1 && TAGPRG="etags -c"
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9ba3e81412b33bb76bb6d95c1540510fa57ed181..533b2cc097a96d2cc0fa94e4446032c15f50a8b2 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -299,32 +299,38 @@ sort_compare(s1, s2)
int result = 0;
/* If the user interrupts, there's no way to stop qsort() immediately, but
- * if we return 0 every time, qsort will assume it's done sorting and exit */
+ * if we return 0 every time, qsort will assume it's done sorting and
+ * exit. */
if (sort_abort)
return 0;
fast_breakcheck();
if (got_int)
sort_abort = TRUE;
- /* When sorting numbers "start_col_nr" is the number, not the column number. */
+ /* When sorting numbers "start_col_nr" is the number, not the column
+ * number. */
if (sort_nr)
result = l1.start_col_nr - l2.start_col_nr;
else
{
- /* We need to copy one line into "sortbuf1", because there is no guarantee
- * that the first pointer becomes invalid when obtaining the second one. */
- STRNCPY(sortbuf1, ml_get(l1.lnum) + l1.start_col_nr, l1.end_col_nr - l1.start_col_nr + 1);
+ /* We need to copy one line into "sortbuf1", because there is no
+ * guarantee that the first pointer becomes invalid when obtaining the
+ * second one. */
+ STRNCPY(sortbuf1, ml_get(l1.lnum) + l1.start_col_nr,
+ l1.end_col_nr - l1.start_col_nr + 1);
sortbuf1[l1.end_col_nr - l1.start_col_nr] = 0;
- STRNCPY(sortbuf2, ml_get(l2.lnum) + l2.start_col_nr, l2.end_col_nr - l2.start_col_nr + 1);
+ STRNCPY(sortbuf2, ml_get(l2.lnum) + l2.start_col_nr,
+ l2.end_col_nr - l2.start_col_nr + 1);
sortbuf2[l2.end_col_nr - l2.start_col_nr] = 0;
- result = sort_ic ? STRICMP(sortbuf1, sortbuf2) : STRCMP(sortbuf1, sortbuf2);
+ result = sort_ic ? STRICMP(sortbuf1, sortbuf2)
+ : STRCMP(sortbuf1, sortbuf2);
}
- /* If the two lines have the same value, preserve the original line order */
+
+ /* If two lines have the same value, preserve the original line order. */
if (result == 0)
- return (int) (l1.lnum - l2.lnum);
- else
- return result;
+ return (int)(l1.lnum - l2.lnum);
+ return result;
}
/*
diff --git a/src/fileio.c b/src/fileio.c
index e0ae301dacc90d021ff4887d3f852b25475fe1a8..46b50f8cf43007b5b44bbccecffaccb7b72cbb3e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1259,6 +1259,13 @@ retry:
if (bad_char_behavior != BAD_DROP)
{
fio_flags = 0; /* don't convert this */
+# ifdef USE_ICONV
+ if (iconv_fd != (iconv_t)-1)
+ {
+ iconv_close(iconv_fd);
+ iconv_fd = (iconv_t)-1;
+ }
+# endif
if (bad_char_behavior == BAD_KEEP)
{
/* Keep the trailing bytes as-is. */
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index b44100e5bbb9c88ed19de92ab3d2d3edbfb06b89..9eb85ce1441d44cf02bb324948e037d81565fbd7 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5338,17 +5338,33 @@ gui_mch_get_color(char_u *name)
/* A number of colors that some X11 systems don't have */
static const char *const vimnames[][2] =
{
- {"LightRed", "#FFBBBB"},
- {"LightGreen", "#88FF88"},
- {"LightMagenta", "#FFBBFF"},
- {"DarkCyan", "#008888"},
- {"DarkBlue", "#0000BB"},
- {"DarkRed", "#BB0000"},
- {"DarkMagenta", "#BB00BB"},
- {"DarkGrey", "#BBBBBB"},
- {"DarkYellow", "#BBBB00"},
- {"Grey90", "#E5E5E5"},
- {"Gray90", "#E5E5E5"},
+ {"LightRed", "#FFBBBB"},
+ {"LightGreen", "#88FF88"},
+ {"LightMagenta","#FFBBFF"},
+ {"DarkCyan", "#008888"},
+ {"DarkBlue", "#0000BB"},
+ {"DarkRed", "#BB0000"},
+ {"DarkMagenta", "#BB00BB"},
+ {"DarkGrey", "#BBBBBB"},
+ {"DarkYellow", "#BBBB00"},
+ {"Gray10", "#1A1A1A"},
+ {"Grey10", "#1A1A1A"},
+ {"Gray20", "#333333"},
+ {"Grey20", "#333333"},
+ {"Gray30", "#4D4D4D"},
+ {"Grey30", "#4D4D4D"},
+ {"Gray40", "#666666"},
+ {"Grey40", "#666666"},
+ {"Gray50", "#7F7F7F"},
+ {"Grey50", "#7F7F7F"},
+ {"Gray60", "#999999"},
+ {"Grey60", "#999999"},
+ {"Gray70", "#B3B3B3"},
+ {"Grey70", "#B3B3B3"},
+ {"Gray80", "#CCCCCC"},
+ {"Grey80", "#CCCCCC"},
+ {"Gray90", "#E5E5E5"},
+ {"Grey90", "#E5E5E5"},
{NULL, NULL}
};
diff --git a/src/gui_mac.c b/src/gui_mac.c
index d9bb609999dc3f97c5c79fa9d52f364ca82d7af3..762d30c955fb773b3e4a2f67bac44c4b48d193d6 100644
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -3642,6 +3642,22 @@ gui_mch_get_color(char_u *name)
{"Grey", RGB(0xC0, 0xC0, 0xC0)}, /*W*/
{"lightgray", RGB(0xE0, 0xE0, 0xE0)}, /*W*/
{"lightgrey", RGB(0xE0, 0xE0, 0xE0)}, /*W*/
+ {"gray10", RGB(0x1A, 0x1A, 0x1A)}, /*W*/
+ {"grey10", RGB(0x1A, 0x1A, 0x1A)}, /*W*/
+ {"gray20", RGB(0x33, 0x33, 0x33)}, /*W*/
+ {"grey20", RGB(0x33, 0x33, 0x33)}, /*W*/
+ {"gray30", RGB(0x4D, 0x4D, 0x4D)}, /*W*/
+ {"grey30", RGB(0x4D, 0x4D, 0x4D)}, /*W*/
+ {"gray40", RGB(0x66, 0x66, 0x66)}, /*W*/
+ {"grey40", RGB(0x66, 0x66, 0x66)}, /*W*/
+ {"gray50", RGB(0x7F, 0x7F, 0x7F)}, /*W*/
+ {"grey50", RGB(0x7F, 0x7F, 0x7F)}, /*W*/
+ {"gray60", RGB(0x99, 0x99, 0x99)}, /*W*/
+ {"grey60", RGB(0x99, 0x99, 0x99)}, /*W*/
+ {"gray70", RGB(0xB3, 0xB3, 0xB3)}, /*W*/
+ {"grey70", RGB(0xB3, 0xB3, 0xB3)}, /*W*/
+ {"gray80", RGB(0xCC, 0xCC, 0xCC)}, /*W*/
+ {"grey80", RGB(0xCC, 0xCC, 0xCC)}, /*W*/
{"gray90", RGB(0xE5, 0xE5, 0xE5)}, /*W*/
{"grey90", RGB(0xE5, 0xE5, 0xE5)}, /*W*/
{"white", RGB(0xFF, 0xFF, 0xFF)},
diff --git a/src/gui_photon.c b/src/gui_photon.c
index e651922e964750c2c4e48b1647c4e23cf8288f31..3408ba6e7f3fc6ceaeb0c8d8811150f5599c47af 100644
--- a/src/gui_photon.c
+++ b/src/gui_photon.c
@@ -2007,6 +2007,22 @@ gui_mch_get_color(char_u *name)
{"Grey", RGB(0xC0, 0xC0, 0xC0)},
{"LightGray", RGB(0xD3, 0xD3, 0xD3)},
{"LightGrey", RGB(0xD3, 0xD3, 0xD3)},
+ {"Gray10", RGB(0x1A, 0x1A, 0x1A)},
+ {"Grey10", RGB(0x1A, 0x1A, 0x1A)},
+ {"Gray20", RGB(0x33, 0x33, 0x33)},
+ {"Grey20", RGB(0x33, 0x33, 0x33)},
+ {"Gray30", RGB(0x4D, 0x4D, 0x4D)},
+ {"Grey30", RGB(0x4D, 0x4D, 0x4D)},
+ {"Gray40", RGB(0x66, 0x66, 0x66)},
+ {"Grey40", RGB(0x66, 0x66, 0x66)},
+ {"Gray50", RGB(0x7F, 0x7F, 0x7F)},
+ {"Grey50", RGB(0x7F, 0x7F, 0x7F)},
+ {"Gray60", RGB(0x99, 0x99, 0x99)},
+ {"Grey60", RGB(0x99, 0x99, 0x99)},
+ {"Gray70", RGB(0xB3, 0xB3, 0xB3)},
+ {"Grey70", RGB(0xB3, 0xB3, 0xB3)},
+ {"Gray80", RGB(0xCC, 0xCC, 0xCC)},
+ {"Grey80", RGB(0xCC, 0xCC, 0xCC)},
{"Gray90", RGB(0xE5, 0xE5, 0xE5)},
{"Grey90", RGB(0xE5, 0xE5, 0xE5)},
{"White", RGB(0xFF, 0xFF, 0xFF)},
diff --git a/src/gui_riscos.c b/src/gui_riscos.c
index 073bbfefb77c5e64018b5d64a05c4a020febdd6d..46e79c0485e10ca0f62c59ad6757257e8fa9fa97 100644
--- a/src/gui_riscos.c
+++ b/src/gui_riscos.c
@@ -1145,8 +1145,24 @@ gui_mch_get_color(char_u *name)
{ "LightGrey", grgb(211, 211, 211) },
{ "DarkGray", grgb(169, 169, 169) },
{ "DarkGrey", grgb(169, 169, 169) },
- { "Grey90", grgb(229, 229, 229) },
+ { "Gray10", grgb(26, 26, 26) },
+ { "Grey10", grgb(26, 26, 26) },
+ { "Gray20", grgb(51, 51, 51) },
+ { "Grey20", grgb(51, 51, 51) },
+ { "Gray30", grgb(77, 77, 77) },
+ { "Grey30", grgb(77, 77, 77) },
+ { "Gray40", grgb(102, 102, 102) },
+ { "Grey40", grgb(102, 102, 102) },
+ { "Gray50", grgb(127, 127, 127) },
+ { "Grey50", grgb(127, 127, 127) },
+ { "Gray60", grgb(153, 153, 153) },
+ { "Grey60", grgb(153, 153, 153) },
+ { "Gray70", grgb(179, 179, 179) },
+ { "Grey70", grgb(179, 179, 179) },
+ { "Gray80", grgb(204, 204, 204) },
+ { "Grey80", grgb(204, 204, 204) },
{ "Gray90", grgb(229, 229, 229) },
+ { "Grey90", grgb(229, 229, 229) },
{ "Black", grgb(0, 0, 0) },
{ "White", grgb(255, 255, 255) },
diff --git a/src/gui_w48.c b/src/gui_w48.c
index f99662f9a0b4850a9e0bd8d67dcf7fa6d2808919..ef1e0713d35bd221e01b14f8c3ece187ef5051be 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -1343,6 +1343,22 @@ gui_mch_get_color(char_u *name)
{"Grey", RGB(0xC0, 0xC0, 0xC0)},
{"LightGray", RGB(0xE0, 0xE0, 0xE0)},
{"LightGrey", RGB(0xE0, 0xE0, 0xE0)},
+ {"Gray10", RGB(0x1A, 0x1A, 0x1A)},
+ {"Grey10", RGB(0x1A, 0x1A, 0x1A)},
+ {"Gray20", RGB(0x33, 0x33, 0x33)},
+ {"Grey20", RGB(0x33, 0x33, 0x33)},
+ {"Gray30", RGB(0x4D, 0x4D, 0x4D)},
+ {"Grey30", RGB(0x4D, 0x4D, 0x4D)},
+ {"Gray40", RGB(0x66, 0x66, 0x66)},
+ {"Grey40", RGB(0x66, 0x66, 0x66)},
+ {"Gray50", RGB(0x7F, 0x7F, 0x7F)},
+ {"Grey50", RGB(0x7F, 0x7F, 0x7F)},
+ {"Gray60", RGB(0x99, 0x99, 0x99)},
+ {"Grey60", RGB(0x99, 0x99, 0x99)},
+ {"Gray70", RGB(0xB3, 0xB3, 0xB3)},
+ {"Grey70", RGB(0xB3, 0xB3, 0xB3)},
+ {"Gray80", RGB(0xCC, 0xCC, 0xCC)},
+ {"Grey80", RGB(0xCC, 0xCC, 0xCC)},
{"Gray90", RGB(0xE5, 0xE5, 0xE5)},
{"Grey90", RGB(0xE5, 0xE5, 0xE5)},
{"White", RGB(0xFF, 0xFF, 0xFF)},
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 433030553249399e7fa8312577b9b4f062211294..c49bbe5f42071edc05809eeec26cbfaa612ddccd 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2296,6 +2296,22 @@ gui_mch_get_color(reqname)
{"DarkMagenta", "#BB00BB"},
{"DarkGrey", "#BBBBBB"},
{"DarkYellow", "#BBBB00"},
+ {"Gray10", "#1A1A1A"},
+ {"Grey10", "#1A1A1A"},
+ {"Gray20", "#333333"},
+ {"Grey20", "#333333"},
+ {"Gray30", "#4D4D4D"},
+ {"Grey30", "#4D4D4D"},
+ {"Gray40", "#666666"},
+ {"Grey40", "#666666"},
+ {"Gray50", "#7F7F7F"},
+ {"Grey50", "#7F7F7F"},
+ {"Gray60", "#999999"},
+ {"Grey60", "#999999"},
+ {"Gray70", "#B3B3B3"},
+ {"Grey70", "#B3B3B3"},
+ {"Gray80", "#CCCCCC"},
+ {"Grey80", "#CCCCCC"},
{"Gray90", "#E5E5E5"},
{"Grey90", "#E5E5E5"},
{NULL, NULL}
diff --git a/src/misc1.c b/src/misc1.c
index dd1da4694905d1003c9a609213971863b26ef86c..6c3b5ad25ae1505dc21c37a9d15c53282f208154 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -6058,7 +6058,7 @@ get_c_indent()
pos_T cur_curpos;
int amount;
int scope_amount;
- int cur_amount;
+ int cur_amount = MAXCOL;
colnr_T col;
char_u *theline;
char_u *linecopy;
@@ -6409,7 +6409,6 @@ get_c_indent()
else
{
amount = -1;
- cur_amount = MAXCOL;
our_paren_pos = *trypos;
for (lnum = cur_curpos.lnum - 1; lnum > our_paren_pos.lnum; --lnum)
{
@@ -6562,7 +6561,7 @@ get_c_indent()
/* Add ind_unclosed2 for each '(' before our matching one, but
* ignore (void) before the line (ignore_paren_col). */
col = our_paren_pos.col;
- while (our_paren_pos.col > ignore_paren_col)
+ while ((int)our_paren_pos.col > ignore_paren_col)
{
--our_paren_pos.col;
switch (*ml_get_pos(&our_paren_pos))
diff --git a/src/screen.c b/src/screen.c
index d371ed9fe837a32d2d6d8ead9fc22822504309c3..8d2a69ef70aed3508cf62cdea678a67dc8799388 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -8971,6 +8971,10 @@ draw_tabline()
TabPageIdxs[Columns - 1] = -999;
}
}
+
+ /* Reset the flag here again, in case evaluating 'tabline' causes it to be
+ * set. */
+ redraw_tabline = FALSE;
}
/*
diff --git a/src/syntax.c b/src/syntax.c
index 268682821a640c9e6ab252cf1f496aa9c53fb6b3..d6ce69cc574025c05b49f3f9d8f7f7d9eeabf38e 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -6115,10 +6115,6 @@ static char *(highlight_init_both[]) =
CENT("TabLineFill term=reverse cterm=reverse",
"TabLineFill term=reverse cterm=reverse gui=reverse"),
#endif
-#ifdef FEAT_AUTOCMD
- CENT("MatchParen term=reverse ctermbg=Cyan",
- "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
-#endif
#ifdef FEAT_GUI
"Cursor guibg=fg guifg=bg",
"lCursor guibg=fg guifg=bg", /* should be different, but what? */
@@ -6196,6 +6192,10 @@ static char *(highlight_init_light[]) =
CENT("CursorLine term=underline cterm=underline",
"CursorLine term=underline cterm=underline guibg=Grey90"),
#endif
+#ifdef FEAT_AUTOCMD
+ CENT("MatchParen term=reverse ctermbg=Cyan",
+ "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
+#endif
#ifdef FEAT_GUI
"Normal gui=NONE",
#endif
@@ -6268,9 +6268,13 @@ static char *(highlight_init_dark[]) =
#endif
#ifdef FEAT_SYN_HL
CENT("CursorColumn term=reverse ctermbg=DarkGrey",
- "CursorColumn term=reverse ctermbg=DarkGrey guibg=Grey90"),
+ "CursorColumn term=reverse ctermbg=DarkGrey guibg=Grey40"),
CENT("CursorLine term=underline cterm=underline",
- "CursorLine term=underline cterm=underline guibg=Grey90"),
+ "CursorLine term=underline cterm=underline guibg=Grey40"),
+#endif
+#ifdef FEAT_AUTOCMD
+ CENT("MatchParen term=reverse ctermbg=DarkCyan",
+ "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"),
#endif
#ifdef FEAT_GUI
"Normal gui=NONE",
diff --git a/src/version.h b/src/version.h
index fdb32c8a8973b6b2c01155160dc6df83598af207..7f6e96ecf4a254e46d496c7be5d5d7938cf9a742 100644
--- a/src/version.h
+++ b/src/version.h
@@ -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 "vim70d"
-#define VIM_VERSION_SHORT "7.0d"
-#define VIM_VERSION_MEDIUM "7.0d05 BETA"
-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0d05 BETA (2006 Apr 15)"
-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0d05 BETA (2006 Apr 15, compiled "
+#define VIM_VERSION_NODOT "vim70e"
+#define VIM_VERSION_SHORT "7.0e"
+#define VIM_VERSION_MEDIUM "7.0e BETA"
+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0e BETA (2006 Apr 16)"
+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0e BETA (2006 Apr 16, compiled "
diff --git a/src/window.c b/src/window.c
index 5ee8172e3fc286495c0aa7fe80cbbe3ae9ba1fc3..dabfe2d5aae1025b56c33a802bdec3533a5a85fe 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1705,8 +1705,11 @@ win_equal_rec(next_curwin, current, topfr, dir, col, row, width, height)
&& (room + (totwincount - 2))
/ (totwincount - 1) > p_wiw)
{
- next_curwin_size = (room + p_wiw + totwincount * p_wmw
- + (totwincount - 1)) / totwincount;
+ /* Can make all windows wider than 'winwidth', spread
+ * the room equally. */
+ next_curwin_size = (room + p_wiw
+ + (totwincount - 1) * p_wmw
+ + (totwincount - 1)) / totwincount;
room -= next_curwin_size - p_wiw;
}
else
@@ -1847,7 +1850,10 @@ win_equal_rec(next_curwin, current, topfr, dir, col, row, width, height)
&& (room + (totwincount - 2))
/ (totwincount - 1) > p_wh)
{
- next_curwin_size = (room + p_wh + totwincount * p_wmh
+ /* can make all windows higher than 'winheight',
+ * spread the room equally. */
+ next_curwin_size = (room + p_wh
+ + (totwincount - 1) * p_wmh
+ (totwincount - 1)) / totwincount;
room -= next_curwin_size - p_wh;
}