updated for version 7.0b01

Filelist

@@ -333,7 +333,8 @@ SRC_DOS_BIN =	\
 		src/vim.tlb \
 		src/vimtbar.lib \
 		src/vimtbar.dll \
-		nsis/icons \
+		nsis/icons/*.bmp \
+		nsis/icons/*.ico \
 
 # source files for Amiga, DOS, etc. (also in the extra archive)
 SRC_AMI_DOS =	\

nsis/gvim.nsi

@@ -116,7 +116,7 @@ Function .onInit
   # $2 - holds the names to create batch files for
   StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}"
   StrCpy $1 "-register-OLE"
-  StrCpy $2 "gvim evim gview gvimdiff"
+  StrCpy $2 "gvim evim gview gvimdiff vimtutor"
 
 FunctionEnd
 
@@ -214,6 +214,9 @@ Section "Vim executables and runtime files"
 	SetOutPath $0\plugin
 	File ${VIMRT}\plugin\*.*
 
+	SetOutPath $0\autoload
+	File ${VIMRT}\autoload\*.*
+
 	SetOutPath $0\syntax
 	File ${VIMRT}\syntax\*.*
 

runtime/autoload/zip.vim

@@ -76,7 +76,7 @@ fun! zip#Browse(zipfile)
   $
 
 "  call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'")
-  exe "silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'"
+  exe "silent r! unzip -l ".escape(a:zipfile,s:zipfile_escape)
   $d
   silent 4,$v/^\s\+\d\+\s\{0,5}\d/d
   silent  4,$s/^\%(.*\)\s\+\(\S\)/\1/
@@ -141,7 +141,7 @@ fun! zip#Read(fname,mode)
 "  call Decho("zipfile<".zipfile."> fname<".fname.">")
 
 "  call Decho("exe r! unzip -p '".escape(zipfile,s:zipfile_escape)."' ".fname)
-  exe "r! unzip -p '".escape(zipfile,s:zipfile_escape)."' ".fname
+  exe "r! unzip -p ".escape(zipfile,s:zipfile_escape)." ".fname
 
   " cleanup
   0d

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0b.  Last change: 2006 Mar 22
+*eval.txt*      For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -4710,6 +4710,11 @@ tabpagewinnr({tabarg}, [{arg}])				*tabpagewinnr()*
 		    tabpagewinnr(4, '$')    " number of windows in tab page 4
 <		When {tabarg} is invalid zero is returned.
 
+							*tagfiles()*
+tagfiles()	Returns a |List| with the file names used to search for tags
+		for the current buffer.  This is the 'tags' option expanded.
+
+
 taglist({expr})							*taglist()*
 		Returns a list of tags matching the regular expression {expr}.
 		Each list item is a dictionary with at least the following
@@ -4746,11 +4751,6 @@ taglist({expr})							*taglist()*
 		located by Vim. Refer to |tags-file-format| for the format of
 		the tags file generated by the different ctags tools.
 
-							*tagfiles()*
-tagfiles()	Returns a |List| with the file names used to search for tags
-		for the current buffer.  This is the 'tags' option expanded.
-
-
 tempname()					*tempname()* *temp-file-name*
 		The result is a String, which is the name of a file that
 		doesn't exist.  It can be used for a temporary file.  The name

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0b.  Last change: 2006 Mar 18
+*options.txt*	For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1222,6 +1222,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 'casemap' 'cmp'		string	(default: "internal,keepascii")
 			global
 			{not in Vi}
+			{only available when compiled with the |+multi_byte|
+			feature}
 	Specifies details about changing the case of letters.  It may contain
 	these words, separated by a comma:
 	internal	Use internal case mapping functions, the current

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0b.  Last change: 2006 Mar 06
+*pattern.txt*   For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1217,9 +1217,6 @@ Finally, these constructs are unique to Perl:
 		with ":match" only exists in the current window.  It is kept
 		when switching to another buffer.
 
-		The |matchparen| plugin uses match highlighting, thus will
-		disable your ":match" command as soon as you move to a paren.
-
 		'ignorecase' does not apply, use |/\c| in the pattern to
 		ignore case.  Otherwise case is not ignored.
 

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0b.  Last change: 2006 Mar 05
+*starting.txt*  For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -379,7 +379,7 @@ a slash.  Thus "-R" means recovery and "-/R" readonly.
 		for every file given as argument.  The maximum is set with
 		'tabpagemax' pages (default 10).  If there are more tab pages
 		than arguments, the last few tab pages will be editing an
-		empty file.
+		empty file.  Also see |tabpage|.
 		{not in Vi}
 
 							*-T*

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0b.  Last change: 2006 Mar 24
+*todo.txt*      For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,17 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-The 16 bit DOS version doesn't link because too much static memory is used.
-Drop it?
-
-test61 sometimes fails, probably because of timing variations.
-
-Check version7.txt for:
-- new syntax files and other runtime files.
-- new functions
-- new options
-- etc.
-
 Add more tests for all new functionality in Vim 7.  Especially new functions.
 
 Win32: Describe how to do debugging. (George Reilly)

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0b.  Last change: 2006 Mar 21
+*various.txt*   For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -760,6 +760,7 @@ At this moment translations are available for:
 	Chinese - multiple authors
 	French  - translated by David Blanchet
 	Italian - translated by Antonio Colombo
+	Polish  - translated by Mikolaj Machowski
 	Russian - translated by Vassily Ragosin
 See the Vim website to find them: http://www.vim.org/translations.php
 

runtime/doc/version7.txt

@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0b.  Last change: 2006 Mar 24
+*version7.txt*  For Vim version 7.0b.  Last change: 2006 Mar 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -688,8 +688,11 @@ New and extended functions: ~
 |add()|			append an item to a List
 |append()|		append List of lines to the buffer
 |browsedir()|		dialog to select a directory
+|bufnr()|		takes an extra argument: create buffer
 |byteidx()| 		index of a character (Ilya Sher)
 |call()|		call a function with List as arguments
+|changenr()|		number of current change
+|complete()|		set matches for Insert mode completion
 |complete_add()|	add match for 'completefunc'
 |complete_check()|	check for key pressed, for 'completefunc'
 |copy()|		make a shallow copy of a List or Dictionary
@@ -697,9 +700,10 @@ New and extended functions: ~
 |cursor()|		also accepts an offset for 'virtualedit', and
 			the first argument can be a list: [lnum, col, off]
 |deepcopy()|		make a full copy of a List or Dictionary
+|diff_filler()|		returns number of filler lines above line {lnum}.
+|diff_hlID()|		returns the highlight ID for diff mode
 |empty()|		check if List or Dictionary is empty
-|getloclist()|		list of location list items (Yegappan Lakshmanan)
-|getqflist()|		list of quickfix errors (Yegappan Lakshmanan)
+|eval()|		evaluate {string} and return the result
 |extend()|		append one List to another or add items from one
 			Dictionary to another
 |filter()|		remove selected items from a List or Dictionary
@@ -707,6 +711,8 @@ New and extended functions: ~
 |findfile()|		find a file in 'path' (Johannes Zellner)
 |foldtextresult()|  	the text displayed for a closed fold at line "lnum"
 |function()|		make a Funcref out of a function name
+|garbagecollect()|	cleanup unused |Lists| and |Dictionaries| with circular
+			references
 |get()|			get an item from a List or Dictionary
 |getbufline()|		get a list of lines from a specified buffer
 			(Yegappan Lakshmanan)
@@ -716,42 +722,65 @@ New and extended functions: ~
 |getfperm()|		get file permission string (Nikolai Weibull)
 |getftype()|		get type of file (Nikolai Weibull)
 |getline()|		with second argument: get List with buffer lines
+|getloclist()|		list of location list items (Yegappan Lakshmanan)
 |getpos()|		return a list with the position of cursor, mark, etc.
+|getqflist()|		list of quickfix errors (Yegappan Lakshmanan)
+|getreg()|		get contents of a register
 |has_key()|		check whether a key appears in a Dictionary
+|hasmapto()|		check for a mapping to a string
 |inputlist()|		select an entry from a list
+|index()|		index of item in List
+|inputlist()|		prompt the user to make a selection from a list
 |insert()|		insert an item somewhere in a List
+|islocked()|		check if a variable is locked
 |items()|		get List of Dictionary key-value pairs
 |join()|		join List items into a String
 |keys()|		get List of Dictionary keys
 |len()|			number of items in a List or Dictionary
 |map()|			change each List or Dictionary item
+|maparg()|		extra argument: use abbreviation
+|mapcheck()|		extra argument: use abbreviation
+|match()|		extra argument: count
+|matchend()|		extra argument: count
 |matchlist()|		list with match and submatches of a pattern in a string
+|matchstr()|		extra argument: count
 |max()|			maximum value in a List or Dictionary
 |min()|			minimum value in a List or Dictionary
 |mkdir()|		create a directory
 |printf()|		format text
+|pumvisible()|		check whether the popup menu is displayed
+|range()|		generate a List with numbers
 |readfile()|		read a file into a list of lines
 |reltime()|		get time value, possibly relative
 |reltimestr()|		turn a time value into a string
 |remove()|		remove one or more items from a List or Dictionary
 |repeat()| 		repeat "expr" "count" times (Christophe Poucet)
 |reverse()|		reverse the order of a List
+|search()|		extra argument:
 |searchdecl()|		search for declaration of variable
+|searchpair()|		extra argument: line to stop searching
 |searchpairpos()|	return a List with the position of the match
 |searchpos()|	        return a List with the position of the match
 |setloclist()|		modify a location list (Yegappan Lakshmanan)
+|setpos()|		set cursor or mark to a position
 |setqflist()|		modify a quickfix list (Yegappan Lakshmanan)
 |sort()|		sort a List
 |soundfold()|		get the sound-a-like equivalent of a word
-|split()|		split a String into a List
 |spellbadword()|	get a badly spelled word
 |spellsuggest()|	get suggestions for correct spelling
+|split()|		split a String into a List
 |str2nr()|		convert a string to a number, base 8, 10 or 16
+|stridx()|		extra argument: start position
 |string()|		string representation of a List or Dictionary
-|system()|		filters {input} through a shell command
+|system()|		extra argument: filters {input} through a shell command
+|tabpagebuflist()|	List of buffers in a tab page
+|tabpagenr()|		number of current or last tab page
+|tabpagewinnr()|	window number in a tab page
+|tagfiles()|		List with tags file names
 |taglist()|		get list of matching tags (Yegappan Lakshmanan)
 |tr()|			translate characters (Ron Aaron)
 |values()|		get List of Dictionary values
+|winnr()|		takes an argument: what window to use
 |winrestview()|		restore the view of the current window
 |winsaveview()|		save the view of the current window
 |writefile()|		write a list of lines into a file
@@ -762,30 +791,39 @@ directory in 'runtimepath'.  See |autoload-functions|.
 
 New autocommand events: ~
 
-|InsertEnter|		starting Insert or Replace mode
-|InsertChange|		going from Insert to Replace mode or back
-|InsertLeave|		leaving Insert or Replace mode
-
 |ColorScheme|		after loading a color scheme
-|QuickFixCmdPre|	before :make, :grep et al. (Ciaran McCreesh)
-|QuickFixCmdPost|	after :make, :grep et al. (Ciaran McCreesh)
-|SessionLoadPost|	after loading a session file. (Yegappan Lakshmanan)
-
-|SpellFileMissing|	when a spell file can't be found
-
-|ShellCmdPost|		after executing a shell command
-|ShellFilterPost|	after filtering with a shell command
-
-|VimResized|		after the Vim window size changed (Yakov Lerner)
-
-|FileChangedShellPost|	after handling a file changed outside of Vim
-
-|SourcePre|		before sourcing a Vim script
 
 |CursorHoldI|		the user doesn't press a key for a while in Insert mode
 |CursorMoved|		the cursor was moved in Normal mode
 |CursorMovedI|		the cursor was moved in Insert mode
 
+|FileChangedShellPost|	after handling a file changed outside of Vim
+
+|InsertEnter|		starting Insert or Replace mode
+|InsertChange|		going from Insert to Replace mode or back
+|InsertLeave|		leaving Insert or Replace mode
+
+|MenuPopup|		just before showing popup menu
+
+|QuickFixCmdPre|	before :make, :grep et al. (Ciaran McCreesh)
+|QuickFixCmdPost|	after :make, :grep et al. (Ciaran McCreesh)
+
+|SessionLoadPost|	after loading a session file. (Yegappan Lakshmanan)
+
+|ShellCmdPost|		after executing a shell command
+|ShellFilterPost|	after filtering with a shell command
+
+|SourcePre|		before sourcing a Vim script
+
+|SpellFileMissing|	when a spell file can't be found
+
+|SwapExists|		found existing swap file when editing a file
+
+|TabEnter|		just after entering a tab page
+|TabLeave|		just before leaving a tab page
+
+|VimResized|		after the Vim window size changed (Yakov Lerner)
+
 
 New items in search patterns: ~
 |/\%d| \%d123		search for character with decimal number
@@ -816,47 +854,120 @@ useful, just for compatibility.
 
 New Syntax/Indent/FTplugin files: ~
 
-MuPAD source syntax, indent and ftplugin. (Dave Silvia)
-
-ABAB/4 syntax file. (Marius van Wyk)
-
-SQL-Informix syntax file. (Dean L Hill)
-
-Handling of various SQL variants. (David Fishburn)
-
-PHP compiler plugin. (Doug Kearns)
-
-Sive syntax file. (Nikolai Weibull)
-
-Pascal indent file. (Neil Carter)
-
-Many filetype plugins and others from Nikolai Weibull.
-
-Xquery syntax file. (Jean-Marc Vanel)
-
 Moved all the indent settings from the filetype plugin to the indent file.
 Implemented b:undo_indent to undo indent settings when setting 'filetype' to a
 different value.
 
-VHDL indent file (Gerald Lai)
-
+a2ps syntax and ftplugin file. (Nikolai Weibull)
+ABAB/4 syntax file. (Marius van Wyk)
+alsaconf ftplugin file. (Nikolai Weibull)
+AppendMatchGroup ftplugin file. (Dave Silvia)
+arch ftplugin file. (Nikolai Weibull)
+asterisk and asteriskvm syntax file. (Tilghman Lesher)
+BDF ftplugin file. (Nikolai Weibull)
+BibTeX indent file. (Dorai Sitaram)
+BTM ftplugin file. (Bram Moolenaar)
+calendar ftplugin file. (Nikolai Weibull)
+Changelog indent file. (Nikolai Weibull)
+conf ftplugin file. (Nikolai Weibull)
+context syntax and ftplugin file. (Nikolai Weibull)
+CRM114 ftplugin file. (Nikolai Weibull)
+cvs RC ftplugin file. (Nikolai Weibull)
+D indent file. (Jason Mills)
+dictconf and dictdconf syntax, indent and ftplugin files. (Nikolai Weibull)
+diff ftplugin file. (Bram Moolenaar)
+dircolors ftplugin file. (Nikolai Weibull)
+django and htmldjango syntax file. (Dave Hodder)
+elinks ftplugin file. (Nikolai Weibull)
+eterm ftplugin file. (Nikolai Weibull)
+eviews syntax file. (Vaidotas Zemlys)
+fetchmail RC ftplugin file. (Nikolai Weibull)
+Generic indent file. (Dave Silvia)
+gpg ftplugin file. (Nikolai Weibull)
+gretl syntax file. (Vaidotas Zemlys)
+groovy syntax file. (Alessio Pace)
+group syntax and ftplugin file. (Nikolai Weibull)
+grub ftplugin file. (Nikolai Weibull)
+Haskell ftplugin file. (Nikolai Weibull)
+help ftplugin file. (Nikolai Weibull)
+indent ftplugin file. (Nikolai Weibull)
+Javascript ftplugin file. (Bram Moolenaar)
+ld syntax, indent and ftplugin file. (Nikolai Weibull)
+lftp ftplugin file. (Nikolai Weibull)
+libao config ftplugin file. (Nikolai Weibull)
+limits syntax and ftplugin file. (Nikolai Weibull)
+Lisp indent file. (Sergey Khorev)
+loginaccess and logindefs syntax and ftplugin file. (Nikolai Weibull)
+m4 ftplugin file. (Nikolai Weibull)
+mailcap ftplugin file. (Nikolai Weibull)
+manconf syntax and ftplugin file. (Nikolai Weibull)
+matlab ftplugin file. (Jake Wasserman)
 MGL syntax file. (Gero Kuhlmann)
-
+modconf ftplugin file. (Nikolai Weibull)
+mplayer config ftplugin file. (Nikolai Weibull)
+MuPAD source syntax, indent and ftplugin. (Dave Silvia)
+mutt RC ftplugin file. (Nikolai Weibull)
+nanorc syntax and ftplugin file. (Nikolai Weibull)
+netrc ftplugin file. (Nikolai Weibull)
+pamconf syntax and ftplugin file. (Nikolai Weibull)
+Pascal indent file. (Neil Carter)
+passwd syntax and ftplugin file. (Nikolai Weibull)
+PHP compiler plugin. (Doug Kearns)
+pinfo ftplugin file. (Nikolai Weibull)
+plaintex ftplugin file. (Benji Fisher)
+procmail ftplugin file. (Nikolai Weibull)
+prolog ftplugin file. (Nikolai Weibull)
+protocols syntax and ftplugin file. (Nikolai Weibull)
+quake ftplugin file. (Nikolai Weibull)
+racc syntax and ftplugin file. (Nikolai Weibull)
 rd syntax file. (Johannes Ranke)
+readline ftplugin file. (Nikolai Weibull)
+rhelp syntax file. (Johannes Ranke)
+Relax NG compact ftplugin file. (Nikolai Weibull)
+Scheme indent file. (Sergey Khorev)
+screen ftplugin file. (Nikolai Weibull)
+sensors syntax and ftplugin file. (Nikolai Weibull)
+services syntax and ftplugin file. (Nikolai Weibull)
+setserial syntax and ftplugin file. (Nikolai Weibull)
+sieve syntax and ftplugin file. (Nikolai Weibull)
+Sive syntax file. (Nikolai Weibull)
+slp config, reg and spi syntax and ftplugin files. (Nikolai Weibull)
+SML indent file. (Saikat Guha)
+SQL anywhere syntax and indent file. (David Fishburn)
+SQL indent file.
+SQL-Informix syntax file. (Dean L Hill)
+SQL: Handling of various variants. (David Fishburn)
+sshconfig ftplugin file. (Nikolai Weibull)
+sudoers ftplugin file. (Nikolai Weibull)
+sysctl syntax and ftplugin file. (Nikolai Weibull)
+terminfo ftplugin file. (Nikolai Weibull)
+trustees syntax file. (Nima Talebi)
+udev config, permissions and rules syntax and ftplugin files. (Nikolai Weibull)
+updatedb syntax and ftplugin file. (Nikolai Weibull)
+VHDL indent file (Gerald Lai)
+WSML syntax file. (Thomas Haselwanter)
+Xdefaults ftplugin file. (Nikolai Weibull)
+XFree86 config ftplugin file. (Nikolai Weibull)
+xinetd syntax, indent and ftplugin file. (Nikolai Weibull)
+xmodmap ftplugin file. (Nikolai Weibull)
+Xquery syntax file. (Jean-Marc Vanel)
+xsd (XML schema) indent file.
+YAML ftplugin file. (Nikolai Weibull)
+Zsh ftplugin file. (Nikolai Weibull)
+
 
 New Keymaps: ~
 
 Sinhala (Sri Lanka) (Harshula Jayasuriya)
-
 Tamil in TSCII encoding (Yegappan Lakshmanan)
+Greek in cp737 (Panagiotis Louridas)
+Polish-slash (HS6_06)
+Ukrainian-jcuken (Anatoli Sakhnik)
 
 
 New message translations: ~
 
 The Ukranian messages are now also available in cp1251.
-
-Irish message translations. (Kevin Patrick Scannell)
-
 Vietnamese message translations and menu. (Phan Vinh Thinh)
 
 
@@ -2061,4 +2172,19 @@ Yu-sung, 2005 March 21)
 Ruby interface: when inserting/deleting lines display wasn't updated. (Ryan
 Paul)
 
+--- fixes since Vim 6.0b ---
+
+Getting the GCC version in configure didn't work with Solaris sed.  First
+strip any "darwin." and then get the version number.
+
+The "autoload" directory was missing from the self-installing executable for
+MS-Windows.
+
+The MS-Windows install program would find "vimtutor.bat" in the install
+directory.  After changing to "c:" also change to "\" to avoid looking in the
+install directory.
+
+To make the 16 bit DOS version compile exclude not used highlight
+initializations and build a tiny instead of small version.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/vim-fr.1

@@ -516,9 +516,17 @@ Initialisation de
 .B Vim
 pour l'ensemble du syst<73>me.
 .TP
+~/.vimrc
+Initialisation de
+.B Vim
+de votre compte utilisateur.
+.TP
 /usr/local/lib/vim/gvimrc
 Initialisation de gvim pour l'ensemble du syst<73>me.
 .TP
+~/.gvimrc
+Initialisation de gvim pour votre compte utilisateur.
+.TP
 /usr/local/lib/vim/optwin.vim
 Script utilis<69> pour la commande ":options", une mani<6E>re pratique de consulter
 et de modifier les options.

runtime/doc/vim.1

@@ -314,6 +314,10 @@ When N is omitted, open one window for each file.
 Open N windows side by side.
 When N is omitted, open one window for each file.
 .TP
+\-p[N]
+Open N tab pages.
+When N is omitted, open one tab page for each file.
+.TP
 \-R
 Read-only mode.
 The 'readonly' option will be set.

runtime/doc/vim.man

@@ -217,62 +217,65 @@ OPTIONS
        -O[N]       Open N windows side by side.  When N is omitted,  open  one
                    window for each file.
 
-       -R          Read-only  mode.   The  'readonly' option will be set.  You
+       -p[N]       Open N tab pages.  When N is omitted, open one tab page for
+                   each file.
+
+       -R          Read-only mode.  The 'readonly' option will  be  set.   You
                    can still edit the buffer, but will be prevented from acci-
-                   dently  overwriting  a file.  If you do want to overwrite a
-                   file, add an exclamation mark to  the  Ex  command,  as  in
-                   ":w!".   The  -R  option  also  implies  the -n option (see
-                   below).  The 'readonly' option  can  be  reset  with  ":set
+                   dently overwriting a file.  If you do want to  overwrite  a
+                   file,  add  an  exclamation  mark  to the Ex command, as in
+                   ":w!".  The -R option  also  implies  the  -n  option  (see
+                   below).   The  'readonly'  option  can  be reset with ":set
                    noro".  See ":help 'readonly'".
 
-       -r          List  swap  files,  with  information  about using them for
+       -r          List swap files, with  information  about  using  them  for
                    recovery.
 
-       -r {file}   Recovery mode.  The swap file is used to recover a  crashed
-                   editing  session.   The  swap  file is a file with the same
+       -r {file}   Recovery  mode.  The swap file is used to recover a crashed
+                   editing session.  The swap file is a  file  with  the  same
                    filename as the text file with ".swp" appended.  See ":help
                    recovery".
 
-       -s          Silent  mode.   Only  when started as "Ex" or when the "-e"
+       -s          Silent mode.  Only when started as "Ex" or  when  the  "-e"
                    option was given before the "-s" option.
 
        -s {scriptin}
-                   The script file {scriptin} is read.  The characters in  the
-                   file  are  interpreted  as if you had typed them.  The same
+                   The  script file {scriptin} is read.  The characters in the
+                   file are interpreted as if you had typed  them.   The  same
                    can be done with the command ":source! {scriptin}".  If the
                    end of the file is reached before the editor exits, further
                    characters are read from the keyboard.
 
        -T {terminal}
-                   Tells Vim the name of the terminal  you  are  using.   Only
-                   required  when the automatic way doesn't work.  Should be a
-                   terminal known to Vim (builtin) or defined in  the  termcap
+                   Tells  Vim  the  name  of the terminal you are using.  Only
+                   required when the automatic way doesn't work.  Should be  a
+                   terminal  known  to Vim (builtin) or defined in the termcap
                    or terminfo file.
 
-       -u {vimrc}  Use  the  commands in the file {vimrc} for initializations.
-                   All the other initializations are  skipped.   Use  this  to
-                   edit  a special kind of files.  It can also be used to skip
-                   all initializations by giving the name "NONE".  See  ":help
+       -u {vimrc}  Use the commands in the file {vimrc}  for  initializations.
+                   All  the  other  initializations  are skipped.  Use this to
+                   edit a special kind of files.  It can also be used to  skip
+                   all  initializations by giving the name "NONE".  See ":help
                    initialization" within vim for more details.
 
-       -U {gvimrc} Use  the  commands in the file {gvimrc} for GUI initializa-
-                   tions.  All the other GUI initializations are skipped.   It
-                   can  also be used to skip all GUI initializations by giving
-                   the name "NONE".  See ":help gui-init" within vim for  more
+       -U {gvimrc} Use the commands in the file {gvimrc} for  GUI  initializa-
+                   tions.   All the other GUI initializations are skipped.  It
+                   can also be used to skip all GUI initializations by  giving
+                   the  name "NONE".  See ":help gui-init" within vim for more
                    details.
 
-       -V[N]       Verbose.   Give  messages about which files are sourced and
-                   for reading and writing a viminfo file.  The optional  num-
+       -V[N]       Verbose.  Give messages about which files are  sourced  and
+                   for  reading and writing a viminfo file.  The optional num-
                    ber N is the value for 'verbose'.  Default is 10.
 
-       -v          Start  Vim  in Vi mode, just like the executable was called
-                   "vi".  This only has effect when the executable  is  called
+       -v          Start Vim in Vi mode, just like the executable  was  called
+                   "vi".   This  only has effect when the executable is called
                    "ex".
 
        -w {scriptout}
-                   All  the  characters that you type are recorded in the file
-                   {scriptout}, until you exit Vim.  This  is  useful  if  you
-                   want  to  create  a script file to be used with "vim -s" or
+                   All the characters that you type are recorded in  the  file
+                   {scriptout},  until  you  exit  Vim.  This is useful if you
+                   want to create a script file to be used with  "vim  -s"  or
                    ":source!".  If the {scriptout} file exists, characters are
                    appended.
 
@@ -282,27 +285,27 @@ OPTIONS
        -x          Use encryption when writing files.  Will prompt for a crypt
                    key.
 
-       -X          Don't connect to the X server.  Shortens startup time in  a
-                   terminal,  but  the  window title and clipboard will not be
+       -X          Don't  connect to the X server.  Shortens startup time in a
+                   terminal, but the window title and clipboard  will  not  be
                    used.
 
        -y          Start Vim in easy mode, just like the executable was called
-                   "evim"  or "eview".  Makes Vim behave like a click-and-type
+                   "evim" or "eview".  Makes Vim behave like a  click-and-type
                    editor.
 
-       -Z          Restricted mode.  Works like  the  executable  starts  with
+       -Z          Restricted  mode.   Works  like  the executable starts with
                    "r".
 
-       --          Denotes  the end of the options.  Arguments after this will
-                   be handled as a file name.  This can  be  used  to  edit  a
+       --          Denotes the end of the options.  Arguments after this  will
+                   be  handled  as  a  file  name.  This can be used to edit a
                    filename that starts with a '-'.
 
        --echo-wid  GTK GUI only: Echo the Window ID on stdout.
 
        --help      Give a help message and exit, just like "-h".
 
-       --literal   Take  file  name  arguments  literally, do not expand wild-
-                   cards.  This has no effect on Unix where the shell  expands
+       --literal   Take file name arguments literally,  do  not  expand  wild-
+                   cards.   This has no effect on Unix where the shell expands
                    wildcards.
 
        --noplugin  Skip loading plugins.  Implied by -u NONE.
@@ -312,18 +315,18 @@ OPTIONS
                    is given and the files are edited in the current Vim.
 
        --remote-expr {expr}
-                   Connect  to  a  Vim server, evaluate {expr} in it and print
+                   Connect to a Vim server, evaluate {expr} in  it  and  print
                    the result on stdout.
 
        --remote-send {keys}
                    Connect to a Vim server and send {keys} to it.
 
        --remote-silent
-                   As --remote, but without the  warning  when  no  server  is
+                   As  --remote,  but  without  the  warning when no server is
                    found.
 
        --remote-wait
-                   As  --remote,  but  Vim  does not exit until the files have
+                   As --remote, but Vim does not exit  until  the  files  have
                    been edited.
 
        --remote-wait-silent
@@ -334,31 +337,31 @@ OPTIONS
                    List the names of all Vim servers that can be found.
 
        --servername {name}
-                   Use  {name}  as the server name.  Used for the current Vim,
+                   Use {name} as the server name.  Used for the  current  Vim,
                    unless used with a --remote argument, then it's the name of
                    the server to connect to.
 
        --socketid {id}
-                   GTK  GUI  only:  Use  the  GtkPlug mechanism to run gvim in
+                   GTK GUI only: Use the GtkPlug  mechanism  to  run  gvim  in
                    another window.
 
        --version   Print version information and exit.
 
 ON-LINE HELP
-       Type ":help" in Vim to get started.  Type ":help subject" to  get  help
-       on  a  specific  subject.   For example: ":help ZZ" to get help for the
-       "ZZ" command.  Use <Tab> and CTRL-D to complete subjects  (":help  cmd-
-       line-completion").   Tags are present to jump from one place to another
+       Type  ":help"  in Vim to get started.  Type ":help subject" to get help
+       on a specific subject.  For example: ":help ZZ" to  get  help  for  the
+       "ZZ"  command.   Use <Tab> and CTRL-D to complete subjects (":help cmd-
+       line-completion").  Tags are present to jump from one place to  another
        (sort of hypertext links, see ":help").  All documentation files can be
        viewed in this way, for example ":help syntax.txt".
 
 FILES
        /usr/local/lib/vim/doc/*.txt
-                      The  Vim documentation files.  Use ":help doc-file-list"
+                      The Vim documentation files.  Use ":help  doc-file-list"
                       to get the complete list.
 
        /usr/local/lib/vim/doc/tags
-                      The tags file used for finding information in the  docu-
+                      The  tags file used for finding information in the docu-
                       mentation files.
 
        /usr/local/lib/vim/syntax/syntax.vim
@@ -378,7 +381,7 @@ FILES
        ~/.gvimrc      Your personal gvim initializations.
 
        /usr/local/lib/vim/optwin.vim
-                      Script  used  for  the ":options" command, a nice way to
+                      Script used for the ":options" command, a  nice  way  to
                       view and set options.
 
        /usr/local/lib/vim/menu.vim
@@ -388,11 +391,11 @@ FILES
                       Script to generate a bug report.  See ":help bugs".
 
        /usr/local/lib/vim/filetype.vim
-                      Script to detect the type of a file by  its  name.   See
+                      Script  to  detect  the type of a file by its name.  See
                       ":help 'filetype'".
 
        /usr/local/lib/vim/scripts.vim
-                      Script  to  detect  the  type of a file by its contents.
+                      Script to detect the type of a  file  by  its  contents.
                       See ":help 'filetype'".
 
        /usr/local/lib/vim/*.ps
@@ -407,17 +410,17 @@ SEE ALSO
 AUTHOR
        Most of Vim was made by Bram Moolenaar, with a lot of help from others.
        See ":help credits" in Vim.
-       Vim  is  based  on Stevie, worked on by: Tim Thompson, Tony Andrews and
-       G.R. (Fred) Walter.  Although hardly any of the original code  remains.
+       Vim is based on Stevie, worked on by: Tim Thompson,  Tony  Andrews  and
+       G.R.  (Fred) Walter.  Although hardly any of the original code remains.
 
 BUGS
        Probably.  See ":help todo" for a list of known problems.
 
-       Note  that a number of things that may be regarded as bugs by some, are
-       in fact caused by a too-faithful reproduction of Vi's  behaviour.   And
-       if  you  think  other things are bugs "because Vi does it differently",
-       you should take a closer look at the vi_diff.txt file  (or  type  :help
-       vi_diff.txt  when  in  Vim).   Also have a look at the 'compatible' and
+       Note that a number of things that may be regarded as bugs by some,  are
+       in  fact  caused by a too-faithful reproduction of Vi's behaviour.  And
+       if you think other things are bugs "because Vi  does  it  differently",
+       you  should  take  a closer look at the vi_diff.txt file (or type :help
+       vi_diff.txt when in Vim).  Also have a look  at  the  'compatible'  and
        'cpoptions' options.
 
 

runtime/doc/xxd-fr.1

@@ -24,9 +24,9 @@ binaire ou de l'entr
 Il peut <20>galement convertir un fichier de codes hexad<61>cimaux en un fichier
 binaire.
 Comme
-.BR uuencode(1)
+.BR uuencode (1)
 et
-.BR uudecode(1)
+.BR uudecode (1)
 il permet la transmission de donn<6E>es binaires dans une repr<70>sentation ASCII
 compatible avec le courrier <20>lectronique, mais a l'avantage de d<>coder la
 sortie standard.
@@ -126,19 +126,19 @@ suppl
 .TP
 .I \-seek d<EFBFBD>calage
 Utilis<EFBFBD> apr<70>s l'option
-.I \-r
-\: inverse la conversion en ajoutant
+.IR \-r :
+inverse la conversion en ajoutant
 .RI < d<EFBFBD>calage >
 aux positions dans le fichier donn<6E>es dans le code hexad<61>cimal.
 .TP
-.I \-s [\+][\-]d<>calage
+.I \-s [+][\-]d<>calage
 D<EFBFBD>bute au
 .RI < d<EFBFBD>calage >
 absolu ou relatif dans fichier_entree.
-\fI\+ \fRindique que le d<>calage est relatif <20> la position courante dans
+\fI+ fRindique que le d<>calage est relatif <20> la position courante dans
 l'entr<74>e standard (sans effet si la lecture n'a pas lieu sur l'entr<74>e
 standard). \fI\- \fRindique un d<>calage en caract<63>res depuis la fin de
-l'entr<74>e (utilis<69> avec \fI \+ \fR, d<>signe la position avant la position
+l'entr<74>e (utilis<69> avec \fI+\fR, d<>signe la position avant la position
 actuelle de l'entr<74>e standard).
 Sans l'option \-s, xxd d<>marre <20> la position courante du fichier.
 .TP
@@ -177,12 +177,12 @@ Remarquez la diff
 .br
 et
 .br
-\fI% xxd \-i \< fichier\fR
+\fI% xxd \-i < fichier\fR
 .PP
 .I xxd \-s \+seek
 peut diff<66>rer de 
-.I xxd \-s seek
-\, car lseek(2) est utilis<69> pour <20> revenir en arri<72>re <20>. Le '+' fait une
+.IR "xxd \-s seek" ,
+car lseek(2) est utilis<69> pour <20> revenir en arri<72>re <20>. Le '+' fait une
 diff<EFBFBD>rence quand la source des donn<6E>es est l'entr<74>e standard et si la position
 dans le fichier de l'entr<74>e standard n'est pas au d<>but du fichier lorsque xxd
 est d<>marr<72> et qu'il re<72>oit ses donn<6E>es.
@@ -201,7 +201,7 @@ ajout
 \fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +128 >
 donnees_hexa' < fichier\fR
 .PP
-Convertir de fichier depuis la position 0x100 (= 1024 - 768) du fichier.
+Convertir de fichier depuis la position 0x100 (= 1024 \- 768) du fichier.
 .br
 \fI% sh \-c 'dd of=donnees_binaires bs=1k count=1; xxd \-s +\-768 >
 donnees_hexa' < fichier\fR

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 24
+" Last Change:	2006 Mar 25
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -255,6 +255,15 @@ au BufNewFile,BufRead named.conf,rndc.conf	setf named
 
 " BIND zone
 au BufNewFile,BufRead named.root		setf bindzone
+au BufNewFile,BufRead *.db			call s:BindzoneCheck('')
+
+func! s:BindzoneCheck(default)
+  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA'
+    setf bindzone
+  elseif a:default != ''
+    exe 'setf ' . a:default
+  endif
+endfunc
 
 " Blank
 au BufNewFile,BufRead *.bl			setf blank
@@ -478,10 +487,7 @@ au BufNewFile,BufRead *.rul
 	\ endif
 
 " DCL (Digital Command Language - vms) or DNS zone file
-au BufNewFile,BufRead *.com
-	\ if getline(1).getline(2) =~ '$ORIGIN\|$TTL\|IN\s*SOA'
-	\	|| getline(1).getline(2).getline(3).getline(4) =~ 'BIND.*named'
-	\ | setf dns | else | setf dcl | endif
+au BufNewFile,BufRead *.com			call s:BindzoneCheck('dcl')
 
 " DOT
 au BufNewFile,BufRead *.dot			setf dot
@@ -1958,7 +1964,7 @@ au BufNewFile,BufRead *asterisk/*.conf*         call s:StarSetf('asterisk')
 au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 
 " BIND zone
-au BufNewFile,BufRead /var/named/*		call s:StarSetf('bindzone')
+au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 
 " Changelog
 au BufNewFile,BufRead [cC]hange[lL]og*

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 Mar 24
+" Last Change:	2006 Mar 25
 
 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -143,7 +143,7 @@ SynMenu DE.Diff:diff
 SynMenu DE.Digital\ Command\ Lang:dcl
 SynMenu DE.Dircolors:dircolors
 SynMenu DE.Django\ template:django
-SynMenu DE.DNS/BIND\ zone:dns
+SynMenu DE.DNS/BIND\ zone:bindzone
 SynMenu DE.DocBook.auto-detect:docbk
 SynMenu DE.DocBook.SGML:docbksgml
 SynMenu DE.DocBook.XML:docbkxml

runtime/scripts.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2006 Feb 01
+" Last change:	2006 Mar 25
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -278,9 +278,8 @@ else
     set ft=sindacmp
 
     " DNS zone files
-  elseif s:line1.s:line2 =~ '$ORIGIN\|$TTL\|IN\s*SOA'
-	\ || s:line1.s:line2.s:line3.s:line4 =~ 'BIND.*named'
-    set ft=dns
+  elseif s:line1.s:line2.s:line3.s:line4 =~ '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA'
+    set ft=bindzone
 
     " BAAN
   elseif s:line1 =~ '|\*\{1,80}' && s:line2 =~ 'VRC '

runtime/synmenu.vim

@@ -123,7 +123,7 @@ an 50.30.160 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
 an 50.30.170 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
 an 50.30.180 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
 an 50.30.190 &Syntax.DE.Django\ template :cal SetSyn("django")<CR>
-an 50.30.200 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("dns")<CR>
+an 50.30.200 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("bindzone")<CR>
 an 50.30.210 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
 an 50.30.220 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
 an 50.30.230 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>

runtime/syntax/dns.vim

@@ -1,47 +1,5 @@
 " Vim syntax file
 " Language:     DNS/BIND Zone File
-" Maintainer:   jehsom@jehsom.com
-" URL:		http://scripts.jehsom.com
-" Last Change:  2001 Sep 02
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
-    finish
-endif
-
-" Last match is taken!
-syn match	dnsKeyword	"\<\(IN\|A\|SOA\|NS\|CNAME\|MX\|PTR\|SOA\|MB\|MG\|MR\|NULL\|WKS\|HINFO\|TXT\|CS\|CH\|CPU\|OS\)\>"
-syn match   dnsRecordName       "^[^ 	]*"
-syn match   dnsPreProc		"^\$[^ ]*"
-syn match   dnsComment		";.*$"
-syn match   dnsDataFQDN		"\<[^ 	]*\.[ 	]*$"
-syn match   dnsConstant			"\<\([0-9][0-9.]*\|[0-9.]*[0-9]\)\>"
-syn match   dnsIPaddr		"\<\(\([0-2]\)\{0,1}\([0-9]\)\{1,2}\.\)\{3}\([0-2]\)\{0,1}\([0-9]\)\{1,2}\>[ 	]*$"
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_dns_syntax_inits")
-    if version < 508
-	let did_dns_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
-
-    HiLink dnsComment     Comment
-    HiLink dnsDataFQDN    Identifier
-    HiLink dnsPreProc     PreProc
-    HiLink dnsKeyword     Keyword
-    HiLink dnsRecordName  Type
-    HiLink dnsIPaddr      Type
-    HiLink dnsIPerr       Error
-    HiLink dnsConstant	  Constant
-
-    delcommand HiLink
-endif
-
-let b:current_syntax = "dns"
+" This has been replaced by the bindzone syntax
+:runtime! syntax/bindzone.vim

src/Make_bc3.mak

@@ -168,7 +168,7 @@ vim.cfg: Make_bc3.mak
 -Iproto
 -I$(INCLUDEPATH)
 -L$(LIBPATH)
--DMSDOS$(SPAWND)
+-DMSDOS;FEAT_TINY$(SPAWND)
 | vim.cfg
 
 test:

src/Makefile

@@ -1708,7 +1708,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
 #
 test check:
 	$(MAKE) -f Makefile $(VIMTARGET)
-	-@if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
+	-if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
 		cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
 	fi
 	cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)

src/auto/configure

@@ -2781,7 +2781,7 @@ if test -z "$CFLAGS"; then
   test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
 fi
 if test "$GCC" = yes; then
-  gccversion=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([0-9]\.[0-9.]*\).*$/\2/g'`
+  gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
     if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
     echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
     CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-O/'`
@@ -15249,7 +15249,7 @@ echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
 echo $ECHO_N "checking for GCC 3 or later... $ECHO_C" >&6
 DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
-  gccmajor=`"$CC" --version | sed -e '2,$d;s/^[^0-9]*\(darwin.[^0-9]*\)*\([1-9]\)\.[0-9].*$/\2/g'`
+  gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
   fi

src/configure.in

@@ -29,7 +29,7 @@ if test -z "$CFLAGS"; then
   test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
 fi
 if test "$GCC" = yes; then
-  gccversion=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[0-9]]\.[[0-9.]]*\).*$/\2/g'`
+  gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
   dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
   if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
     echo 'GCC [[34]].0.[[12]] has a bug in the optimizer, disabling "-O#"'
@@ -2834,7 +2834,7 @@ dnl the number before the version number.
 AC_MSG_CHECKING(for GCC 3 or later)
 DEPEND_CFLAGS_FILTER=
 if test "$GCC" = yes; then
-  gccmajor=`"$CC" --version | sed -e '2,$d;s/^[[^0-9]]*\(darwin.[[^0-9]]*\)*\([[1-9]]\)\.[[0-9]].*$/\2/g'`
+  gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
   if test "$gccmajor" -gt "2"; then
     DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
   fi

src/dosinst.c

@@ -361,7 +361,9 @@ find_bat_exe(int check_bat_only)
 {
     int		i;
 
-    mch_chdir(sysdrive);	/* avoid looking in the "installdir" */
+    /* avoid looking in the "installdir" by chdir to system root */
+    mch_chdir(sysdrive);
+    mch_chdir("\\");
 
     for (i = 1; i < TARGET_COUNT; ++i)
     {
@@ -376,7 +378,10 @@ find_bat_exe(int check_bat_only)
 	    remove_tail(default_bat_dir);
 	}
 	if (check_bat_only && targets[i].oldbat != NULL)
+	{
 	    free(targets[i].oldbat);
+	    targets[i].oldbat = NULL;
+	}
     }
 
     mch_chdir(installdir);

src/option.c

@@ -649,8 +649,13 @@ static struct vimoption
 #endif
 			    },
     {"casemap",	    "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+#ifdef FEAT_MBYTE
 			    (char_u *)&p_cmp, PV_NONE,
 			    {(char_u *)"internal,keepascii", (char_u *)0L}
+#else
+			    (char_u *)NULL, PV_NONE,
+			    {(char_u *)0L, (char_u *)0L}
+#endif
 			    },
     {"cdpath",	    "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
 #ifdef FEAT_SEARCHPATH
@@ -4928,7 +4933,9 @@ didset_options()
     /* initialize the table for 'iskeyword' et.al. */
     (void)init_chartab();
 
+#ifdef FEAT_MBYTE
     (void)opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE);
+#endif
     (void)opt_strings_flags(p_bkc, p_bkc_values, &bkc_flags, TRUE);
 #ifdef FEAT_SESSION
     (void)opt_strings_flags(p_ssop, p_ssop_values, &ssop_flags, TRUE);
@@ -6377,12 +6384,14 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 	    errmsg = e_invarg;
     }
 
+#ifdef FEAT_MBYTE
     /* 'casemap' */
     else if (varp == &p_cmp)
     {
 	if (opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE) != OK)
 	    errmsg = e_invarg;
     }
+#endif
 
 #ifdef FEAT_DIFF
     /* 'diffopt' */

src/option.h

@@ -350,13 +350,15 @@ EXTERN int	p_consk;	/* 'conskey' */
 #ifdef FEAT_LINEBREAK
 EXTERN char_u	*p_breakat;	/* 'breakat' */
 #endif
+#ifdef FEAT_MBYTE
 EXTERN char_u	*p_cmp;		/* 'casemap' */
 EXTERN unsigned	cmp_flags;
-#ifdef IN_OPTION_C
+# ifdef IN_OPTION_C
 static char *(p_cmp_values[]) = {"internal", "keepascii", NULL};
+# endif
+# define CMP_INTERNAL		0x001
+# define CMP_KEEPASCII		0x002
 #endif
-#define CMP_INTERNAL		0x001
-#define CMP_KEEPASCII		0x002
 #ifdef FEAT_MBYTE
 EXTERN char_u	*p_enc;		/* 'encoding' */
 EXTERN int	p_deco;		/* 'delcombine' */

src/os_mswin.c

@@ -598,8 +598,16 @@ display_errors()
 		}
 #endif
 
-		(void)gui_mch_dialog(VIM_ERROR, (char_u *)_("Error"),
-					      p, (char_u *)_("&Ok"), 1, NULL);
+		(void)gui_mch_dialog(
+#ifdef FEAT_GUI
+				     gui.starting ? VIM_INFO :
+#endif
+					     VIM_ERROR,
+#ifdef FEAT_GUI
+				     gui.starting ? (char_u *)_("Message") :
+#endif
+					     (char_u *)_("Error"),
+				     p, (char_u *)_("&Ok"), 1, NULL);
 #if 0
 #ifdef WIN3264
 		MessageBox(NULL, p, "Vim", MB_TASKMODAL|MB_SETFOREGROUND);

src/os_unixx.h

@@ -128,6 +128,10 @@
 
 /* shared library access */
 #if defined(HAVE_DLFCN_H) && defined(USE_DLOPEN)
+# ifdef __MVS__
+    /* needed to define RTLD_LAZY (Anthony Giorgio) */
+#  define __SUSV3
+# endif
 # include <dlfcn.h>
 #else
 # if defined(HAVE_DL_H) && defined(HAVE_SHL_LOAD)

src/po/ja.po

@@ -4708,7 +4708,7 @@ msgstr "%s
 
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%d <20><><EFBFBD>ܤ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
+msgstr "%s <20><><EFBFBD>ܤ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>"
 
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE <20><><EFBFBD><EFBFBD><EFBFBD>ꤵ<EFBFBD><EAA4B5><EFBFBD>ʤ<EFBFBD> COMPOUNDSYLMAX"
@@ -4772,7 +4772,7 @@ msgstr "
 
 #, c-format
 msgid "Reading word file %s ..."
-msgstr "ɸ<><C9B8><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD>..."
+msgstr "ɸ<><C9B8><EFBFBD><EFBFBD><EFBFBD>Ϥ<EFBFBD><CFA4><EFBFBD><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD><EFBFBD> %s ..."
 
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4780,7 +4780,7 @@ msgstr "%s
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "<22><>s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> ñ<><C3B1><EFBFBD>θ<EFBFBD><CEB8><EFBFBD> /encoding= <20>Ԥ<EFBFBD>̵<EFBFBD>뤷<EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
+msgstr "%s <EFBFBD><EFBFBD>s <20><> %d <20><><EFBFBD>ܤ<EFBFBD> ñ<><C3B1><EFBFBD>θ<EFBFBD><CEB8><EFBFBD> /encoding= <20>Ԥ<EFBFBD>̵<EFBFBD>뤷<EFBFBD>ޤ<EFBFBD><DEA4><EFBFBD>: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4891,7 +4891,7 @@ msgstr "E778: .sug
 
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: <20>Ť<EFBFBD> .sug <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʤΤ<CAA4>, <20><><EFBFBD>åץǡ<D7A5><C7A1>Ȥ<EFBFBD><C8A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E779: <20>Ť<EFBFBD> .sug <20>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʤΤ<CAA4>, <20><><EFBFBD>åץǡ<D7A5><C7A1>Ȥ<EFBFBD><C8A4>Ƥ<EFBFBD><C6A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"

src/po/ja.sjis.po

@@ -4708,7 +4708,7 @@ msgstr "%s
 
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%d <20>s<EFBFBD>ڂ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
+msgstr "%s <20>s<EFBFBD>ڂ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
 
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE <20><><EFBFBD>w<EFBFBD>肳<EFBFBD><E882B3><EFBFBD>Ȃ<EFBFBD> COMPOUNDSYLMAX"
@@ -4772,7 +4772,7 @@ msgstr "
 
 #, c-format
 msgid "Reading word file %s ..."
-msgstr "<22>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD>..."
+msgstr "<22>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD> %s ..."
 
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4780,7 +4780,7 @@ msgstr "%s
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "<22><>s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> <20>P<EFBFBD><50><EFBFBD>̌<EFBFBD><CC8C><EFBFBD> /encoding= <20>s<EFBFBD>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
+msgstr "%s <EFBFBD><EFBFBD>s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> <20>P<EFBFBD><50><EFBFBD>̌<EFBFBD><CC8C><EFBFBD> /encoding= <20>s<EFBFBD>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4891,7 +4891,7 @@ msgstr "E778: .sug
 
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: <20>Â<EFBFBD> .sug <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>Ȃ̂<C882>, <20>A<EFBFBD>b<EFBFBD>v<EFBFBD>f<EFBFBD>[<5B>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+msgstr "E779: <20>Â<EFBFBD> .sug <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>Ȃ̂<C882>, <20>A<EFBFBD>b<EFBFBD>v<EFBFBD>f<EFBFBD>[<5B>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
 
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"

src/syntax.c

@@ -6063,89 +6063,207 @@ syn_get_foldlevel(wp, lnum)
  * The default highlight groups.  These are compiled-in for fast startup and
  * they still work when the runtime files can't be found.
  * When making changes here, also change runtime/colors/default.vim!
+ * The #ifdefs are needed to reduce the amount of static data.  Helps to make
+ * the 16 bit DOS (museum) version compile.
  */
 static char *(highlight_init_both[]) =
     {
+	"ErrorMsg term=standout ctermbg=DarkRed ctermfg=White",
+	"IncSearch term=reverse cterm=reverse",
+	"ModeMsg term=bold cterm=bold",
+	"NonText term=bold ctermfg=Blue",
+	"StatusLine term=reverse,bold cterm=reverse,bold",
+	"StatusLineNC term=reverse cterm=reverse",
+#ifdef FEAT_VERTSPLIT
+	"VertSplit term=reverse cterm=reverse",
+#endif
+#ifdef FEAT_CLIPBOARD
+	"VisualNOS term=underline,bold cterm=underline,bold",
+#endif
+#ifdef FEAT_DIFF
+	"DiffText term=reverse cterm=bold ctermbg=Red",
+#endif
+#ifdef FEAT_INS_EXPAND
+	"PmenuThumb cterm=reverse",
+	"PmenuSbar ctermbg=Grey",
+#endif
+#ifdef FEAT_WINDOWS
+	"TabLineSel term=bold cterm=bold",
+	"TabLineFill term=reverse cterm=reverse",
+#endif
+#ifdef FEAT_AUTOCMD
+	"MatchParen term=reverse ctermbg=Cyan",
+#endif
 #ifdef FEAT_GUI
+	"ErrorMsg guibg=Red guifg=White",
+	"IncSearch gui=reverse",
+	"ModeMsg gui=bold",
+	"NonText gui=bold guifg=Blue",
+	"StatusLine gui=reverse,bold",
+	"StatusLineNC gui=reverse",
+	"VertSplit gui=reverse",
+	"VisualNOS gui=underline,bold",
+	"DiffText gui=bold guibg=Red",
+	"PmenuThumb gui=reverse",
+	"PmenuSbar guibg=Grey",
+	"TabLineSel gui=bold",
+	"TabLineFill gui=reverse",
+	"MatchParen guibg=Cyan",
 	"Cursor guibg=fg guifg=bg",
 	"lCursor guibg=fg guifg=bg",	/* should be different, but what? */
 #endif
-	"ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White",
-	"IncSearch term=reverse cterm=reverse gui=reverse",
-	"ModeMsg term=bold cterm=bold gui=bold",
-	"NonText term=bold ctermfg=Blue gui=bold guifg=Blue",
-	"StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold",
-	"StatusLineNC term=reverse cterm=reverse gui=reverse",
-	"VertSplit term=reverse cterm=reverse gui=reverse",
-	"VisualNOS term=underline,bold cterm=underline,bold gui=underline,bold",
-	"DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red",
-	"PmenuThumb cterm=reverse gui=reverse",
-	"PmenuSbar ctermbg=Grey guibg=Grey",
-	"TabLineSel term=bold cterm=bold gui=bold",
-	"TabLineFill term=reverse cterm=reverse gui=reverse",
-	"MatchParen term=reverse ctermbg=Cyan guibg=Cyan",
 	NULL
     };
 
 static char *(highlight_init_light[]) =
     {
-	"Directory term=bold ctermfg=DarkBlue guifg=Blue",
-	"LineNr term=underline ctermfg=Brown guifg=Brown",
-	"MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen",
+	"Directory term=bold ctermfg=DarkBlue",
+	"LineNr term=underline ctermfg=Brown",
+	"MoreMsg term=bold ctermfg=DarkGreen",
+	"Question term=standout ctermfg=DarkGreen",
+	"Search term=reverse ctermbg=Yellow ctermfg=NONE",
+#ifdef FEAT_SPELL
+	"SpellBad term=reverse ctermbg=LightRed",
+	"SpellCap term=reverse ctermbg=LightBlue",
+	"SpellRare term=reverse ctermbg=LightMagenta",
+	"SpellLocal term=underline ctermbg=Cyan",
+#endif
+#ifdef FEAT_INS_EXPAND
+	"Pmenu ctermbg=LightMagenta",
+	"PmenuSel ctermbg=LightGrey",
+#endif
+	"SpecialKey term=bold ctermfg=DarkBlue",
+	"Title term=bold ctermfg=DarkMagenta",
+	"WarningMsg term=standout ctermfg=DarkRed",
+#ifdef FEAT_WILDMENU
+	"WildMenu term=standout ctermbg=Yellow ctermfg=Black",
+#endif
+#ifdef FEAT_FOLDING
+	"Folded term=standout ctermbg=Grey ctermfg=DarkBlue",
+	"FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
+#endif
+#ifdef FEAT_SIGNS
+	"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
+#endif
+#ifdef FEAT_VISUAL
+	"Visual term=reverse ctermbg=Magenta",
+#endif
+#ifdef FEAT_DIFF
+	"DiffAdd term=bold ctermbg=LightBlue",
+	"DiffChange term=bold ctermbg=LightMagenta",
+	"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
+#endif
+#ifdef FEAT_WINDOWS
+	"TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey",
+#endif
+#ifdef FEAT_SYN_HL
+	"CursorColumn term=reverse ctermbg=LightGrey",
+	"CursorLine term=underline cterm=underline",
+#endif
+#ifdef FEAT_GUI
+	"Directory guifg=Blue",
+	"LineNr guifg=Brown",
+	"MoreMsg gui=bold guifg=SeaGreen",
 	"Normal gui=NONE",
-	"Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen",
-	"Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE",
-	"SpellBad term=reverse ctermbg=LightRed guisp=Red gui=undercurl",
-	"SpellCap term=reverse ctermbg=LightBlue guisp=Blue gui=undercurl",
-	"SpellRare term=reverse ctermbg=LightMagenta guisp=Magenta gui=undercurl",
-	"SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl",
-	"Pmenu ctermbg=LightMagenta guibg=LightMagenta",
-	"PmenuSel ctermbg=LightGrey guibg=Grey",
-	"SpecialKey term=bold ctermfg=DarkBlue guifg=Blue",
-	"Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta",
-	"WarningMsg term=standout ctermfg=DarkRed guifg=Red",
-	"WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
-	"Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue",
-	"FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
-	"SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
-	"Visual term=reverse ctermbg=Magenta guibg=LightGrey",
-	"DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue",
-	"DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta",
-	"DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan",
-	"TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey",
-	"CursorColumn term=reverse ctermbg=LightGrey guibg=LightGrey",
-	"CursorLine term=underline cterm=underline guibg=LightGrey",
+	"Question gui=bold guifg=SeaGreen",
+	"Search guibg=Yellow guifg=NONE",
+	"SpellBad guisp=Red gui=undercurl",
+	"SpellCap guisp=Blue gui=undercurl",
+	"SpellRare guisp=Magenta gui=undercurl",
+	"SpellLocal guisp=DarkCyan gui=undercurl",
+	"Pmenu guibg=LightMagenta",
+	"PmenuSel guibg=Grey",
+	"SpecialKey guifg=Blue",
+	"Title gui=bold guifg=Magenta",
+	"WarningMsg guifg=Red",
+	"WildMenu guibg=Yellow guifg=Black",
+	"Folded guibg=LightGrey guifg=DarkBlue",
+	"FoldColumn guibg=Grey guifg=DarkBlue",
+	"SignColumn guibg=Grey guifg=DarkBlue",
+	"Visual guibg=LightGrey",
+	"DiffAdd guibg=LightBlue",
+	"DiffChange guibg=LightMagenta",
+	"DiffDelete gui=bold guifg=Blue guibg=LightCyan",
+	"TabLine gui=underline guibg=LightGrey",
+	"CursorColumn guibg=LightGrey",
+	"CursorLine guibg=LightGrey",
+#endif
 	NULL
     };
 
 static char *(highlight_init_dark[]) =
     {
-	"Directory term=bold ctermfg=LightCyan guifg=Cyan",
-	"LineNr term=underline ctermfg=Yellow guifg=Yellow",
-	"MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen",
+	"Directory term=bold ctermfg=LightCyan",
+	"LineNr term=underline ctermfg=Yellow",
+	"MoreMsg term=bold ctermfg=LightGreen",
+	"Question term=standout ctermfg=LightGreen",
+	"Search term=reverse ctermbg=Yellow ctermfg=Black",
+	"SpecialKey term=bold ctermfg=LightBlue",
+#ifdef FEAT_SPELL
+	"SpellBad term=reverse ctermbg=Red",
+	"SpellCap term=reverse ctermbg=Blue",
+	"SpellRare term=reverse ctermbg=Magenta",
+	"SpellLocal term=underline ctermbg=Cyan",
+#endif
+#ifdef FEAT_INS_EXPAND
+	"Pmenu ctermbg=Magenta",
+	"PmenuSel ctermbg=DarkGrey",
+#endif
+	"Title term=bold ctermfg=LightMagenta",
+	"WarningMsg term=standout ctermfg=LightRed",
+#ifdef FEAT_WILDMENU
+	"WildMenu term=standout ctermbg=Yellow ctermfg=Black",
+#endif
+#ifdef FEAT_FOLDING
+	"Folded term=standout ctermbg=DarkGrey ctermfg=Cyan",
+	"FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
+#endif
+#ifdef FEAT_SIGNS
+	"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
+#endif
+#ifdef FEAT_VISUAL
+	"Visual term=reverse ctermbg=Magenta",
+#endif
+#ifdef FEAT_DIFF
+	"DiffAdd term=bold ctermbg=DarkBlue",
+	"DiffChange term=bold ctermbg=DarkMagenta",
+	"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
+#endif
+#ifdef FEAT_WINDOWS
+	"TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey",
+#endif
+#ifdef FEAT_SYN_HL
+	"CursorColumn term=reverse ctermbg=DarkGrey",
+	"CursorLine term=underline cterm=underline",
+#endif
+#ifdef FEAT_GUI
+	"Directory guifg=Cyan",
+	"LineNr guifg=Yellow",
+	"MoreMsg gui=bold guifg=SeaGreen",
 	"Normal gui=NONE",
-	"Question term=standout ctermfg=LightGreen gui=bold guifg=Green",
-	"Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
-	"SpecialKey term=bold ctermfg=LightBlue guifg=Cyan",
-	"SpellBad term=reverse ctermbg=Red guisp=Red gui=undercurl",
-	"SpellCap term=reverse ctermbg=Blue guisp=Blue gui=undercurl",
-	"SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl",
-	"SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl",
-	"Pmenu ctermbg=Magenta guibg=Magenta",
-	"PmenuSel ctermbg=DarkGrey guibg=DarkGrey",
-	"Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta",
-	"WarningMsg term=standout ctermfg=LightRed guifg=Red",
-	"WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
-	"Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan",
-	"FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
-	"SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
-	"Visual term=reverse ctermbg=Magenta guibg=DarkGrey",
-	"DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue",
-	"DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta",
-	"DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan",
-	"TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey",
-	"CursorColumn term=reverse ctermbg=DarkGrey guibg=DarkGrey",
-	"CursorLine term=underline cterm=underline guibg=DarkGrey",
+	"Question gui=bold guifg=Green",
+	"Search guibg=Yellow guifg=Black",
+	"SpecialKey guifg=Cyan",
+	"SpellBad guisp=Red gui=undercurl",
+	"SpellCap guisp=Blue gui=undercurl",
+	"SpellRare guisp=Magenta gui=undercurl",
+	"SpellLocal guisp=Cyan gui=undercurl",
+	"Pmenu guibg=Magenta",
+	"PmenuSel guibg=DarkGrey",
+	"Title gui=bold guifg=Magenta",
+	"WarningMsg guifg=Red",
+	"WildMenu guibg=Yellow guifg=Black",
+	"Folded guibg=DarkGrey guifg=Cyan",
+	"FoldColumn guibg=Grey guifg=Cyan",
+	"SignColumn guibg=Grey guifg=Cyan",
+	"Visual guibg=DarkGrey",
+	"DiffAdd guibg=DarkBlue",
+	"DiffChange guibg=DarkMagenta",
+	"DiffDelete gui=bold guifg=Blue guibg=DarkCyan",
+	"TabLine gui=underline guibg=DarkGrey",
+	"CursorColumn guibg=DarkGrey",
+	"CursorLine guibg=DarkGrey",
+#endif
 	NULL
     };
 

src/testdir/test61.in

@@ -30,7 +30,7 @@ g-:.w >>test.out
 :"
 :/^222/w >>test.out
 :" Delay for three seconds and go some seconds forward and backward
-:sleep 3
+:sleep 2
 Aa:set ul=100
 Ab:set ul=100
 Ac:set ul=100

src/version.h

@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70b"
 #define VIM_VERSION_SHORT	"7.0b"
 #define VIM_VERSION_MEDIUM	"7.0b BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0b BETA (2006 Mar 24)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0b BETA (2006 Mar 24, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0b BETA (2006 Mar 25)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0b BETA (2006 Mar 25, compiled "