updated for version 7.0084

2025-07-16 09:12:00 +00:00 · 2005-06-13 22:28:56 +00:00
parent bac97eb8ae
commit 9ba0eb850c
41 changed files with 3431 additions and 691 deletions
--- a/runtime/bugreport.vim
+++ b/runtime/bugreport.vim
@ -2,7 +2,7 @@
 :" information about the environment of a possible bug in Vim.
 :"
 :" Maintainer:	Bram Moolenaar <Bram@vim.org>
-:" Last change:	2001 Feb 02
+:" Last change:	2005 Jun 12
 :"
 :" To use inside Vim:
 :"	:so $VIMRUNTIME/bugreport.vim
@ -49,6 +49,8 @@
 :  call <SID>CheckFile($VIMRUNTIME . "/syntax/synload.vim")
 :  delfun <SID>CheckDir
 :  delfun <SID>CheckFile
+:  echo "--- Scripts sourced ---"
+:  scriptnames
 :endif
 :set all
 :set termcap
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 04
+*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -375,8 +375,10 @@ checking engine in Vim, for various reasons:

 - Missing support for multi-byte encodings.  At least UTF-8 must be supported,
  so that more than one language can be used in the same file.
+  Doing on-the-fly conversion is not always possible (would require iconv
+  support).
 - For the programs and libraries: Using them as-is would require installing
-  them separately from Vim.  That's not impossible, but a drawback.
+  them separately from Vim.  That's mostly not impossible, but a drawback.
 - Performance: A few tests showed that it's possible to check spelling on the
  fly (while redrawing), just like syntax highlighting.  But the mechanisms
  used by other code are much slower.  Myspell uses a simplistic hashtable,
@ -392,7 +394,9 @@ checking engine in Vim, for various reasons:
  all English words and highlight non-Canadian words differently.
 - Missing support for rare words.  Many words are correct but hardly ever used
  and could be a misspelled often-used word.
-
+- For making suggestions the speed is less important and requiring to install
+  another program or library would be acceptable.  But the word lists probably
+  differ, the suggestions may be wrong words.

 ==============================================================================
 4. Assumptions						*design-assumptions*
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 07
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -235,6 +235,18 @@ the same value. >
 	:echo alist == blist
 <	1

+Note about comparing lists: Two lists are considered equal if they have the
+same length and all items compare equal, as with using "==".  There is one
+exception: When comparing a number with a string and the string contains extra
+characters beside the number they are not equal. Example: >
+	echo 4 == "4x"
+<	1 >
+	echo [4] == ["4x"]
+<	0
+
+This is to fix the odd behavior of == that can't be changed for backward
+compatibility reasons.
+

 List unpack ~

@ -2593,7 +2605,8 @@ getwinposy()	The result is a Number, which is the Y coordinate in pixels of

 getwinvar({nr}, {varname})				*getwinvar()*
 		The result is the value of option or local window variable
-		{varname} in window {nr}.
+		{varname} in window {nr}.  When {nr} is zero the current
+		window is used.
 		This also works for a global option, buffer-local option and
 		window-local option, but it doesn't work for a global variable
 		or buffer-local variable.
@ -3692,7 +3705,7 @@ setreg({regname}, {value} [,{options}])

 setwinvar({nr}, {varname}, {val})			*setwinvar()*
 		Set option or local variable {varname} in window {nr} to
-		{val}.
+		{val}.  When {nr} is zero the current window is used.
 		This also works for a global or local buffer option, but it
 		doesn't work for a global or local buffer variable.
 		For a local buffer option the global value is unchanged.
@ -3804,6 +3817,7 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 			Number		123
 			Funcref		function('name')
 			List		[item, item]
+			Dictionary	{key: value, key: value}
 		Note that in String values the ' character is doubled.

 							*strlen()*
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Mar 29
+*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Jun 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -198,7 +198,7 @@ The user may create scripts for Vim that use external commands.  These might
 introduce Y2K problems, but those are not really part of Vim itself.

 ==============================================================================
-3. Credits						*credits* *author*
+3. Credits				*credits* *author* *Bram* *Moolenaar*

 Most of Vim was written by Bram Moolenaar <Bram@vim.org>.

--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 08
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 13


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -51,7 +51,7 @@ To search for the next misspelled word:
 [S			Like "]S" but search backwards.


-To add words to your own word list:
+To add words to your own word list:				*E764*

 							*zg*
 zg			Add word under the cursor as a good word to
@ -73,6 +73,21 @@ automatically be updated.  More details about the 'spellfile' format below
 |spell-wordlist-format|.


+Finding suggestions for bad words:
+
+							*z?*
+z?			For the badly spelled word under the cursor suggest
+			the correctly spelled word.
+			When there is no badly spelled word under the cursor
+			use the one after the cursor, in the same line.
+			The results are sorted on similarity to the badly
+			spelled word.
+			This may take a long time.  Hit CTRL-C when you are
+			bored.
+			You can enter the number of your choice or press
+			<Enter> if you don't want to replace.
+
+
 PERFORMANCE

 Note that Vim does on-the-fly spell checking.  To make this work fast the
@ -170,6 +185,10 @@ Vim uses a fixed method to recognize a word.  This is independent of
 include characters like '-' in 'iskeyword'.  The word characters do depend on
 'encoding'.

+The table with word characters is stored in the main .spl file.  Therefore it
+matters what the current locale is when generating it!  A .add.spl file does
+not contain a word table.
+
 A word that starts with a digit is always ignored.  That includes hex numbers
 in the form 0xff and 0XFF.

@ -224,6 +243,9 @@ You can also use a plain word list.
 <			This combines the English word lists for US, CA and AU
 			into one en.spl file.
 			Up to eight regions can be combined. *E754* *755*
+			The REP and SAL items of the first .aff file where
+			they appear are used. |spell-affix-REP|
+			|spell-affix-SAL|

 			When the spell file was written all currently used
 			spell files will be reloaded.
@ -452,4 +474,53 @@ words that are correct for the language, but are hardly ever used and could be
 a typing mistake anyway.


+REPLACEMENTS						*spell-affix-REP*
+
+In the affix file REP items can be used to define common mistakes.  This is
+used to make spelling suggestions.  The items define the "from" text and the
+"to" replacement.  Example:
+
+	REP 4 ~
+	REP f ph ~
+	REP ph f ~
+	REP k ch ~
+	REP ch k ~
+
+The first line specifies the number of REP lines following.  Vim ignores it.
+
+
+SIMILAR CHARACTERS					*spell-affix-MAP*
+
+In the affix file MAP items can be used to define letters that very much
+alike.  This is mostly used for a letter with different accents.  This is used
+to prefer suggestions with these letters substituted.  Example:
+
+	MAP 2 ~
+	MAP e<><65><EFBFBD><EFBFBD> ~
+	MAP u<><75><EFBFBD><EFBFBD> ~
+
+The first line specifies the number of MAP lines following.  Vim ignores it.
+
+
+SOUNDS-A-LIKE						*spell-affix-SAL*
+
+In the affix file SAL items can be used to define the sounds-a-like mechanism
+to be used.  The main items define the "from" text and the "to" replacement.
+Example:
+
+	SAL CIA                  X ~
+	SAL CH                   X ~
+	SAL C                    K ~
+	SAL K                    K ~
+
+TODO: explain how it works.
+
+There are a few special items:
+
+	SAL followup		true ~
+	SAL collapse_result	true ~
+	SAL remove_accents	true ~
+
+"1" has the same meaning as "true".  Any other value means "false".
+
 vim:tw=78:sw=4:ts=8:ft=help:norl:
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@ -2835,6 +2835,7 @@ Athena	gui_x11.txt	/*Athena*
 B	motion.txt	/*B*
 BeBox	os_beos.txt	/*BeBox*
 BeOS	os_beos.txt	/*BeOS*
+Bram	intro.txt	/*Bram*
 BufAdd	autocmd.txt	/*BufAdd*
 BufCreate	autocmd.txt	/*BufCreate*
 BufDelete	autocmd.txt	/*BufDelete*
@ -3805,6 +3806,7 @@ Mac-format-write	editing.txt	/*Mac-format-write*
 Macintosh	os_mac.txt	/*Macintosh*
 Mark	motion.txt	/*Mark*
 MiNT	os_mint.txt	/*MiNT*
+Moolenaar	intro.txt	/*Moolenaar*
 MorphOS	os_amiga.txt	/*MorphOS*
 Motif	gui_x11.txt	/*Motif*
 MzScheme	if_mzsch.txt	/*MzScheme*
@ -5125,6 +5127,7 @@ 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*
@ -6250,9 +6253,12 @@ speed-up	tips.txt	/*speed-up*
 spell	spell.txt	/*spell*
 spell-affix-KEP	spell.txt	/*spell-affix-KEP*
 spell-affix-RAR	spell.txt	/*spell-affix-RAR*
+spell-affix-REP	spell.txt	/*spell-affix-REP*
+spell-affix-SAL	spell.txt	/*spell-affix-SAL*
 spell-affix-chars	spell.txt	/*spell-affix-chars*
 spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*
 spell-affix-vim	spell.txt	/*spell-affix-vim*
+spell-dic-format	spell.txt	/*spell-dic-format*
 spell-file-format	spell.txt	/*spell-file-format*
 spell-mkspell	spell.txt	/*spell-mkspell*
 spell-quickstart	spell.txt	/*spell-quickstart*
@ -7070,6 +7076,7 @@ z/OS	os_390.txt	/*z\/OS*
 z<CR>	scroll.txt	/*z<CR>*
 z<Left>	scroll.txt	/*z<Left>*
 z<Right>	scroll.txt	/*z<Right>*
+z?	spell.txt	/*z?*
 zA	fold.txt	/*zA*
 zC	fold.txt	/*zC*
 zD	fold.txt	/*zD*
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 08
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 13


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -30,7 +30,15 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------

-New menu file doesn't work with older vim.  exists("spell") doesn't work?
+Range(0) should return an empty list (Servatius Brandt).
+
+a few builtin functions call set_var() internally to set a variable.  They do
+not check for a valid variable name.  Example: setbufvar(1, ";", 1) sets a
+variable named ";". (Servatius Brandt)
+
+Patch for if_python to make exit work better with threads. (ugo)
+Still seems to fail 15% of the time.
+Vim 7 breaks, works OK with 6.3 version of if_python (Thakkar)

 Add extra list of file locations.  Can be used with:
    :ltag	      list of matching tags, like :tselect
@ -86,18 +94,25 @@ Awaiting response:
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
    the screen.

-Patch for if_python to make exit work better with threads. (ugo)
-Still seems to fail 15% of the time.


 PLANNED FOR VERSION 7.0:

 -   Add SPELLCHECKER, with support for many languages.
    - Spell checking code todo's:
-	- How about making suggestions?  Use an external program like aspell?
-	  Or include the myspell suggestion code in Vim?
-	- Support for approximate-regexps will help with finding similar words
-	  (agrep http://www.tgries.de/agrep/).
+	- Code for making suggestions:
+	  - Also need to store "toupper" in the .spl file.
+	  - Give better score for words that sound like the bad word?
+	  - "sounds-like" matching: Also try variants of the soundslike word.
+	  - Aspell has the "special" character, useful?
+	  - Support for approximate-regexps will help with finding similar
+	    words (agrep http://www.tgries.de/agrep/).
+	- Give a warning for ":mkspell it_IT wordfile", thus using a region
+	  name with only one input file.
+	- Also put list of word characters in word list file.  Otherwise the
+	  one for Italian may differ from the one used for English.
+	- Somehow mark "frequent" words, so that suggestions with "a" and
+	  "the" can be preferred?
 	- Make "en-rare" spell file.
 	  Convention: use en_US (language_region) and en-rare (language-field)
          Add hl groups to 'spelllang'?
@ -130,7 +145,8 @@ PLANNED FOR VERSION 7.0:
    Later:
    - Implement compound words when it works for Myspell.  Current idea has
      the problem that "foo/X" always allows "foofoo", there is no way to
-      specify a word can only be at the start or end.
+      specify a word can only be at the start or end, or that only certain
+      words combine.

 -   REFACTORING: The main() function is very long.  Move parts to separate
    functions, especially loops.  Ideas from Walter Briscoe (2003 Apr 3, 2004
@ -266,7 +282,7 @@ on MS-Windows. (George Reilly)
 Add strtol() to avoid the problems with leading zero causing octal conversion.

 Try new POSIX tests, made after my comments. (Geoff Clare, 2005 April 7)
-Before April 23 if possible.
+Version 1.5 is in ~/src/posix/1.5. (Lynne Canal)

 Add a 'tool' window: behaves like a preview window but there can be several.
 Don't count it in only_one_window(). (Alexei Alexandrov)
@ -2342,6 +2358,9 @@ Insert mode:


 'cindent', 'smartindent':
+8   Wrong indent below ? : with ():
+	if ((a ? (b) : c) != 0)
+		       aligns with ":".
 8   Wrong indent for ":" after a method with line break in arguments:
 	Foo::Foo (int one,
 		    int two)
@ -2927,12 +2946,8 @@ Options:
 8   When using ":mksession", also store a command to reset all options to
    their default value, before setting the options that are not at their
    default value.
-8   Should ":mksession" restore the current directory when writing the
-    session, or the directory where the session file is?  Probably need a word
-    in 'sessionoptions' to make a choice:
-    "curdir" (cd to current directory when session file was generated)
-    "sessiondir" (cd to directory of session file)
-    "nodir" (don't cd at all)
+7   With ":mksession" also store the tag stack and jump history. (Michal
+    Malecki)
 8   Make "old" number options that really give a number of effects into string
    options that are a comma separated list.  The old number values should
    also be supported.
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@ -1,4 +1,4 @@
-*usr_11.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_11.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 09

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0aa.  Last change: 2005 May 18
+*usr_41.txt*	For Vim version 7.0aa.  Last change: 2005 Jun 09

 		     VIM USER MANUAL - by Bram Moolenaar

@ -612,13 +612,13 @@ List manipulation:
 	join()			join List items into a String
 	string()		String representation of a List
 	call()			call a function with List as arguments
-	index()			index of a value in a list
+	index()			index of a value in a List
 	max()			maximum value in a List
 	min()			minimum value in a List
 	count()			count number of times a value appears in a List

 Dictionary manipulation:
-	get()			get an entries without error for wrong key
+	get()			get an entry without an error for a wrong key
 	len()			number of entries in a Dictionary
 	has_key()		check whether a key appears in a Dictionary
 	empty()			check if Dictionary is empty
@ -1117,7 +1117,7 @@ over them: >
 	one ~
 	two ~

-The will notice the items are not ordered.  You can sort the list to get a
+The will notice the keys are not ordered.  You can sort the list to get a
 specific order: >

 	:for key in sort(keys(uk2nl))
@ -2237,8 +2237,8 @@ That script must define the "mylib#myfunction()" function.

 You can put many other functions in the mylib.vim script, you are free to
 organize your functions in library scripts.  But you must use function names
-where the part before the colon matches the script name.  Otherwise Vim
-would not know what script to load.
+where the part before the '#' matches the script name.  Otherwise Vim would
+not know what script to load.

 If you get really enthousiastic and write lots of library scripts, you may
 want to use subdirectories.  Example: >
@ -2256,7 +2256,7 @@ Where the function is defined like this: >
 	endfunction

 Notice that the name the function is defined with is exactly the same as the
-name used for calling the function.  And the part before the last colon
+name used for calling the function.  And the part before the last '#'
 exactly matches the subdirectory and script name.

 You can use the same mechanism for variables: >
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 07
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 13


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -144,6 +144,11 @@ with scripts, but they were slow and/or required an external program.

 The 'spell' option is used to switch spell checking on or off.
 The 'spelllang' option is used to specify the languages that are accepted.
+The 'spellfile' option specifies where new words are added.
+
+The |[s| and |]s| commands can be used to move to the next or previous error.
+The |zg| and |zw| commands can be used to add good and wrong words.
+The |z?| command can be used to correct the word.

 The "undercurl" highlighting attribute was added to nicely point out spelling
 mistakes in the GUI (based on patch from Marcin Dalecki).
@ -649,6 +654,9 @@ Added the "%s" item to 'errorformat'. (Yegappan Lakshmanan)
 GTK GUI: use the GTK file dialog when it's available.  Mix from patches by
 Grahame Bowland and Evan Webb.

+Added ":scriptnames" to bugreport.vim, so that we can see what plugins were
+used.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*

@ -1074,6 +1082,7 @@ reallocating the buffer every time. (Alexei Alexandrov)

 When using a Python "atexit" function it was not invoked when Vim exits.  Now
 call Py_Finalize() for that. (Ugo Di Girolamo)
+This breaks the thread stuff though, fixed by Ugo.

 GTK GUI: using a .vimrc with "set cmdheight=2 lines=43" and ":split" right
 after startup, the window layout is messed up. (Michael Schaap)  Added
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@ -2,7 +2,13 @@
 " Language:	Lua script
 " Maintainer:	Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
 " First Author:	Max Ischenko <mfi 'at' ukr.net>
-" Last Change:	2004 Aug 29
+" Last Change:	2005 Jun 09
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1

 " Only define the function once.
 if exists("*GetLuaIndent")
--- a/runtime/indent/xsd.vim
+++ b/runtime/indent/xsd.vim
@ -0,0 +1,13 @@
+" Vim indent file
+" Language: 	.xsd files (XML Schema)
+" Maintainer:	Nobody
+" Last Change:	2005 Jun 09
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use XML formatting rules
+runtime! indent/xml.vim
+
--- 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:	2005 Jun 08
+" Last Change:	2005 Jun 11

 " 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.
--- a/runtime/spell/en.ascii.spl
+++ b/runtime/spell/en.ascii.spl
--- a/runtime/spell/en.latin1.spl
+++ b/runtime/spell/en.latin1.spl
--- a/runtime/spell/en.utf-8.spl
+++ b/runtime/spell/en.utf-8.spl
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:	Squid config file
 " Maintainer:	Klaus Muth <klaus@hampft.de>
-" Last Change:	2004 Feb 01
+" Last Change:	2005 Jun 12
 " URL:		http://www.hampft.de/vim/syntax/squid.vim
-" ThanksTo:	Ilya Sher <iso8601@mail.ru>
+" ThanksTo:	Ilya Sher <iso8601@mail.ru>,
+"               Michael Dotzler <Michael.Dotzler@leoni.com>


 " For version 5.x: Clear all syntax items
@ -22,63 +23,62 @@ syn match	squidComment	"#.*$" contains=squidTodo,squidTag
 syn match	squidTag	contained "TAG: .*$"

 " Lots & lots of Keywords!
-syn keyword	squidConf	acl always_direct announce_host
-syn keyword	squidConf	announce_period announce_port announce_to
-syn keyword	squidConf	anonymize_headers append_domain
-syn keyword	squidConf	as_whois_server authenticate_children
-syn keyword	squidConf	authenticate_program authenticate_ttl
-syn keyword	squidConf	broken_posts buffered_logs cache_access_log
-syn keyword	squidConf	cache_announce cache_dir cache_dns_program
-syn keyword	squidConf	cache_effective_group cache_effective_user
-syn keyword	squidConf	cache_host cache_host_acl cache_host_domain
-syn keyword	squidConf	cache_log cache_mem cache_mem_high
-syn keyword	squidConf	cache_mem_low cache_mgr cachemgr_passwd
-syn keyword	squidConf	cache_peer cache_stoplist
-syn keyword	squidConf	cache_stoplist_pattern cache_store_log
-syn keyword	squidConf	cache_swap cache_swap_high cache_swap_log
-syn keyword	squidConf	cache_swap_low client_db client_lifetime
-syn keyword	squidConf	client_netmask connect_timeout coredump_dir
-syn keyword	squidConf	dead_peer_timeout debug_options delay_access
-syn keyword	squidConf	delay_class delay_initial_bucket_level
-syn keyword	squidConf	delay_parameters delay_pools dns_children
-syn keyword	squidConf	dns_defnames dns_nameservers dns_testnames
-syn keyword	squidConf	emulate_httpd_log err_html_text
-syn keyword	squidConf	fake_user_agent firewall_ip forwarded_for
-syn keyword	squidConf	forward_snmpd_port fqdncache_size
+syn keyword	squidConf	acl always_direct announce_host announce_period
+syn keyword	squidConf	announce_port announce_to anonymize_headers
+syn keyword	squidConf	append_domain as_whois_server auth_param_basic
+syn keyword	squidConf	authenticate_children authenticate_program
+syn keyword	squidConf	authenticate_ttl broken_posts buffered_logs
+syn keyword	squidConf	cache_access_log cache_announce cache_dir
+syn keyword	squidConf	cache_dns_program cache_effective_group
+syn keyword	squidConf	cache_effective_user cache_host cache_host_acl
+syn keyword	squidConf	cache_host_domain cache_log cache_mem
+syn keyword	squidConf	cache_mem_high cache_mem_low cache_mgr
+syn keyword	squidConf	cachemgr_passwd cache_peer cache_peer_access
+syn keyword	squidConf	cahce_replacement_policy cache_stoplist
+syn keyword	squidConf	cache_stoplist_pattern cache_store_log cache_swap
+syn keyword	squidConf	cache_swap_high cache_swap_log cache_swap_low
+syn keyword	squidConf	client_db client_lifetime client_netmask
+syn keyword	squidConf	connect_timeout coredump_dir dead_peer_timeout
+syn keyword	squidConf	debug_options delay_access delay_class
+syn keyword	squidConf	delay_initial_bucket_level delay_parameters
+syn keyword	squidConf	delay_pools deny_info dns_children dns_defnames
+syn keyword	squidConf	dns_nameservers dns_testnames emulate_httpd_log
+syn keyword	squidConf	err_html_text fake_user_agent firewall_ip
+syn keyword	squidConf	forwarded_for forward_snmpd_port fqdncache_size
 syn keyword	squidConf	ftpget_options ftpget_program ftp_list_width
-syn keyword	squidConf	ftp_user half_closed_clients
-syn keyword	squidConf	hierarchy_stoplist htcp_port http_access
-syn keyword	squidConf	http_anonymizer httpd_accel httpd_accel_host
-syn keyword	squidConf	httpd_accel_port httpd_accel_uses_host_header
-syn keyword	squidConf	httpd_accel_with_proxy http_port
-syn keyword	squidConf	http_reply_access icp_access icp_hit_stale
-syn keyword	squidConf	icp_port icp_query_timeout ident_lookup
-syn keyword	squidConf	ident_lookup_access ident_timeout
-syn keyword	squidConf	incoming_http_average incoming_icp_average
-syn keyword	squidConf	inside_firewall ipcache_high ipcache_low
-syn keyword	squidConf	ipcache_size local_domain local_ip
+syn keyword	squidConf	ftp_passive ftp_user half_closed_clients
+syn keyword	squidConf	header_access header_replace hierarchy_stoplist
+syn keyword	squidConf	high_response_time_warning high_page_fault_warning
+syn keyword	squidConf	htcp_port http_access http_anonymizer httpd_accel
+syn keyword	squidConf	httpd_accel_host httpd_accel_port
+syn keyword	squidConf	httpd_accel_uses_host_header
+syn keyword	squidConf	httpd_accel_with_proxy http_port http_reply_access
+syn keyword	squidConf	icp_access icp_hit_stale icp_port
+syn keyword	squidConf	icp_query_timeout ident_lookup ident_lookup_access
+syn keyword	squidConf	ident_timeout incoming_http_average
+syn keyword	squidConf	incoming_icp_average inside_firewall ipcache_high
+syn keyword	squidConf	ipcache_low ipcache_size local_domain local_ip
 syn keyword	squidConf	logfile_rotate log_fqdn log_icp_queries
 syn keyword	squidConf	log_mime_hdrs maximum_object_size
 syn keyword	squidConf	maximum_single_addr_tries mcast_groups
 syn keyword	squidConf	mcast_icp_query_timeout mcast_miss_addr
-syn keyword	squidConf	mcast_miss_encode_key mcast_miss_port
-syn keyword	squidConf	memory_pools mime_table min_http_poll_cnt
-syn keyword	squidConf	min_icp_poll_cnt minimum_direct_hops
-syn keyword	squidConf	minimum_retry_timeout miss_access
-syn keyword	squidConf	negative_dns_ttl negative_ttl
-syn keyword	squidConf	neighbor_timeout neighbor_type_domain
+syn keyword	squidConf	mcast_miss_encode_key mcast_miss_port memory_pools
+syn keyword	squidConf	memory_pools_limit memory_replacement_policy
+syn keyword	squidConf	mime_table min_http_poll_cnt min_icp_poll_cnt
+syn keyword	squidConf	minimum_direct_hops minimum_object_size
+syn keyword	squidConf	minimum_retry_timeout miss_access negative_dns_ttl
+syn keyword	squidConf	negative_ttl neighbor_timeout neighbor_type_domain
 syn keyword	squidConf	netdb_high netdb_low netdb_ping_period
-syn keyword	squidConf	netdb_ping_rate no_cache passthrough_proxy
-syn keyword	squidConf	pconn_timeout pid_filename pinger_program
-syn keyword	squidConf	positive_dns_ttl prefer_direct proxy_auth
-syn keyword	squidConf	proxy_auth_realm query_icmp quick_abort
+syn keyword	squidConf	netdb_ping_rate never_direct no_cache
+syn keyword	squidConf	passthrough_proxy pconn_timeout pid_filename
+syn keyword	squidConf	pinger_program positive_dns_ttl prefer_direct
+syn keyword	squidConf	proxy_auth proxy_auth_realm query_icmp quick_abort
 syn keyword	squidConf	quick_abort quick_abort_max quick_abort_min
-syn keyword	squidConf	quick_abort_pct range_offset_limit
-syn keyword	squidConf	read_timeout redirect_children
-syn keyword	squidConf	redirect_program
+syn keyword	squidConf	quick_abort_pct range_offset_limit read_timeout
+syn keyword	squidConf	redirect_children redirect_program
 syn keyword	squidConf	redirect_rewrites_host_header reference_age
 syn keyword	squidConf	reference_age refresh_pattern reload_into_ims
-syn keyword	squidConf	request_size request_timeout
+syn keyword	squidConf	request_body_max_size request_size request_timeout
 syn keyword	squidConf	shutdown_lifetime single_parent_bypass
 syn keyword	squidConf	siteselect_timeout snmp_access
 syn keyword	squidConf	snmp_incoming_address snmp_port source_ping
@ -86,16 +86,19 @@ syn keyword	squidConf	ssl_proxy store_avg_object_size
 syn keyword	squidConf	store_objects_per_bucket strip_query_terms
 syn keyword	squidConf	swap_level1_dirs swap_level2_dirs
 syn keyword	squidConf	tcp_incoming_address tcp_outgoing_address
-syn keyword	squidConf	tcp_recv_bufsize test_reachability
-syn keyword	squidConf	udp_hit_obj udp_hit_obj_size
-syn keyword	squidConf	udp_incoming_address udp_outgoing_address
-syn keyword	squidConf	unique_hostname unlinkd_program
-syn keyword	squidConf	uri_whitespace useragent_log visible_hostname
-syn keyword	squidConf	wais_relay wais_relay_host wais_relay_port
+syn keyword	squidConf	tcp_recv_bufsize test_reachability udp_hit_obj
+syn keyword	squidConf	udp_hit_obj_size udp_incoming_address
+syn keyword	squidConf	udp_outgoing_address unique_hostname
+syn keyword	squidConf	unlinkd_program uri_whitespace useragent_log
+syn keyword	squidConf	visible_hostname wais_relay wais_relay_host
+syn keyword	squidConf	wais_relay_port

 syn keyword	squidOpt	proxy-only weight ttl no-query default
 syn keyword	squidOpt	round-robin multicast-responder
 syn keyword	squidOpt	on off all deny allow
+syn keyword	squidopt	via parent no-digest heap lru realm
+syn keyword	squidopt	children credentialsttl none disable
+syn keyword	squidopt	offline_toggle diskd q1 q2

 " Security Actions for cachemgr_passwd
 syn keyword	squidAction	shutdown info parameter server_list
@ -108,6 +111,7 @@ syn match	squidAction	"squid\.conf"
 syn keyword	squidAcl	url_regex urlpath_regex referer_regex port proto
 syn keyword	squidAcl	req_mime_type rep_mime_type
 syn keyword	squidAcl	method browser user src dst
+syn keyword	squidAcl	time dstdomain ident snmp_community

 syn match	squidNumber	"\<\d\+\>"
 syn match	squidIP		"\<\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\>"
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@ -110,7 +110,8 @@

 TARGETOS = BOTH

-# Select one of eight object code directories, depends on GUI, OLE and DEBUG.
+# Select one of eight object code directories, depends on GUI, OLE, DEBUG and
+# interfaces.
 # If you change something else, do "make clean" first!
 !if "$(GUI)" == "yes"
 OBJDIR = .\ObjG
@ -120,6 +121,18 @@ OBJDIR = .\ObjC
 !if "$(OLE)" == "yes"
 OBJDIR = $(OBJDIR)O
 !endif
+!ifdef PERL
+OBJDIR = $(OBJDIR)L
+!endif
+!ifdef PYTHON
+OBJDIR = $(OBJDIR)Y
+!endif
+!ifdef TCL
+OBJDIR = $(OBJDIR)T
+!endif
+!ifdef RUBY
+OBJDIR = $(OBJDIR)R
+!endif
 !ifdef MZSCHEME
 OBJDIR = $(OBJDIR)Z
 !endif
--- a/src/eval.c
+++ b/src/eval.c
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@ -5349,13 +5349,13 @@ find_help_tags(arg, num_matches, matches, keep_lang)
    int		i;
    static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
 			       "/*", "/\\*", "\"*", "/\\(\\)",
-			       "?", ":?", "?<CR>", "g?", "g?g?", "g??",
+			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
 			       "/\\?", "/\\z(\\)", "\\=", ":s\\=",
 			       "[count]", "[quotex]", "[range]",
 			       "[pattern]", "\\|", "\\%$"};
    static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
 			       "/star", "/\\\\star", "quotestar", "/\\\\(\\\\)",
-			       "?", ":?", "?<CR>", "g?", "g?g?", "g??",
+			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
 			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
 			       "\\[count]", "\\[quotex]", "\\[range]",
 			       "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@ -8139,6 +8139,7 @@ theend:

 #if ((defined(FEAT_SESSION) || defined(FEAT_EVAL)) && defined(vim_mkdir)) \
 	|| defined(PROTO)
+/*ARGSUSED*/
    int
 vim_mkdir_emsg(name, prot)
    char_u	*name;
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@ -2997,10 +2997,10 @@ nextwild(xp, type, options)
 	    v = OK;
 	if (v == OK)
 	{
-	    vim_strncpy(&ccline.cmdbuff[ccline.cmdpos + difflen],
+	    mch_memmove(&ccline.cmdbuff[ccline.cmdpos + difflen],
 		    &ccline.cmdbuff[ccline.cmdpos],
-		    ccline.cmdlen - ccline.cmdpos + 1);
-	    STRNCPY(&ccline.cmdbuff[i], p2, STRLEN(p2));
+		    (size_t)(ccline.cmdlen - ccline.cmdpos + 1));
+	    mch_memmove(&ccline.cmdbuff[i], p2, STRLEN(p2));
 	    ccline.cmdlen += difflen;
 	    ccline.cmdpos += difflen;
 	}
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@ -556,7 +556,6 @@ _OnWindowPosChanged(

    static int
 _DuringSizing(
-    HWND hwnd,
    UINT fwSide,
    LPRECT lprc)
 {
@ -681,7 +680,7 @@ _WndProc(
 #endif

    case WM_SIZING:	/* HANDLE_MSG doesn't seem to handle this one */
-	return _DuringSizing(hwnd, (UINT)wParam, (LPRECT)lParam);
+	return _DuringSizing((UINT)wParam, (LPRECT)lParam);

    case WM_MOUSEWHEEL:
 	_OnMouseWheel(hwnd, HIWORD(wParam));
@ -842,12 +841,14 @@ gui_mch_set_parent(char *title)
    }
 }

+#ifndef FEAT_OLE
    static void
 ole_error(char *arg)
 {
    EMSG2(_("E243: Argument not supported: \"-%s\"; Use the OLE version."),
 									 arg);
 }
+#endif

 /*
 * Parse the GUI related command-line arguments.  Any arguments used are
@ -1260,6 +1261,7 @@ get_work_area(RECT *spi_rect)
 /*
 * Set the size of the window to the given width and height in pixels.
 */
+/*ARGSUSED*/
    void
 gui_mch_set_shellsize(int width, int height,
 	int min_width, int min_height, int base_width, int base_height)
@ -2045,7 +2047,7 @@ gui_mch_draw_string(
    {
 	int			x;
 	int			offset;
-	const static int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };
+	static const int	val[8] = {1, 0, 0, 0, 1, 2, 2, 2 };

 	y = FILL_Y(row + 1) - 1;
 	for (x = FILL_X(col); x < FILL_X(col + len); ++x)
@ -2451,6 +2453,7 @@ gui_mch_menu_grey(
 * pressed, return that button's ID - IDCANCEL (2), which is the button's
 * number.
 */
+/*ARGSUSED*/
    static LRESULT CALLBACK
 dialog_callback(
    HWND hwnd,
@ -4037,6 +4040,7 @@ delete_tooltip(beval)
    DestroyWindow(beval->balloon);
 }

+/*ARGSUSED*/
    static VOID CALLBACK
 BevalTimerProc(hwnd, uMsg, idEvent, dwTime)
    HWND    hwnd;
@ -4078,6 +4082,7 @@ BevalTimerProc(hwnd, uMsg, idEvent, dwTime)
    }
 }

+/*ARGSUSED*/
    void
 gui_mch_disable_beval_area(beval)
    BalloonEval	*beval;
@ -4087,6 +4092,7 @@ gui_mch_disable_beval_area(beval)
    // TRACE0("gui_mch_disable_beval_area }}}");
 }

+/*ARGSUSED*/
    void
 gui_mch_enable_beval_area(beval)
    BalloonEval	*beval;
@ -4162,6 +4168,7 @@ gui_mch_create_beval_area(target, mesg, mesgCB, clientData)
    return beval;
 }

+/*ARGSUSED*/
    static void
 Handle_WM_Notify(hwnd, pnmh)
    HWND hwnd;
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@ -314,7 +314,7 @@ static LOGFONT norm_logfont;
 static LRESULT _OnImeNotify(HWND hWnd, DWORD dwCommand, DWORD dwData);
 #endif

-#ifdef DEBUG
+#ifdef DEBUG_PRINT_ERROR
 /*
 * Print out the last Windows error message
 */
@ -330,7 +330,7 @@ print_windows_error(void)
    TRACE1("Error: %s\n", lpMsgBuf);
    LocalFree(lpMsgBuf);
 }
-#endif /* DEBUG */
+#endif

 /*
 * Cursor blink functions.
@ -445,6 +445,7 @@ gui_mch_start_blink(void)
 * Call-back routines.
 */

+/*ARGSUSED*/
    static VOID CALLBACK
 _OnTimer(
    HWND hwnd,
@ -467,6 +468,7 @@ _OnTimer(
 	s_wait_timer = 0;
 }

+/*ARGSUSED*/
    static void
 _OnDeadChar(
    HWND hwnd,
@ -555,6 +557,7 @@ char_to_string(int ch, char_u *string, int slen)
 /*
 * Key hit, add it to the input buffer.
 */
+/*ARGSUSED*/
    static void
 _OnChar(
    HWND hwnd,
@ -577,6 +580,7 @@ _OnChar(
 /*
 * Alt-Key hit, add it to the input buffer.
 */
+/*ARGSUSED*/
    static void
 _OnSysChar(
    HWND hwnd,
@ -656,6 +660,7 @@ _OnMouseEvent(
    gui_send_mouse_event(button, x, y, repeated_click, vim_modifiers);
 }

+/*ARGSUSED*/
    static void
 _OnMouseButtonDown(
    HWND hwnd,
@ -756,6 +761,7 @@ _OnMouseButtonDown(
    }
 }

+/*ARGSUSED*/
    static void
 _OnMouseMoveOrRelease(
    HWND hwnd,
@ -832,6 +838,7 @@ gui_mswin_find_menu(
    return pMenu;
 }

+/*ARGSUSED*/
    static void
 _OnMenu(
    HWND	hwnd,
@ -1255,6 +1262,7 @@ gui_mch_get_font(
 * Return the name of font "font" in allocated memory.
 * Don't know how to get the actual name, thus use the provided name.
 */
+/*ARGSUSED*/
    char_u *
 gui_mch_get_fontname(font, name)
    GuiFont font;
@ -1937,6 +1945,7 @@ gui_mch_enable_menu(int flag)
 #endif
 }

+/*ARGSUSED*/
    void
 gui_mch_set_menu_pos(
    int	    x,
@ -2291,6 +2300,7 @@ _OnEndSession(void)
 * Get this message when the user clicks on the cross in the top right corner
 * of a Windows95 window.
 */
+/*ARGSUSED*/
    static void
 _OnClose(
    HWND hwnd)
@ -2344,6 +2354,7 @@ _OnPaint(
    }
 }

+/*ARGSUSED*/
    static void
 _OnSize(
    HWND hwnd,
@ -2588,6 +2599,7 @@ gui_mch_insert_lines(
 }


+/*ARGSUSED*/
    void
 gui_mch_exit(int rc)
 {
@ -2657,6 +2669,7 @@ logfont2name(LOGFONT lf)
 * Initialise vim to use the font with the given name.
 * Return FAIL if the font could not be loaded, OK otherwise.
 */
+/*ARGSUSED*/
    int
 gui_mch_init_font(char_u *font_name, int fontset)
 {
@ -2761,6 +2774,7 @@ gui_mch_newfont()
 /*
 * Set the window title
 */
+/*ARGSUSED*/
    void
 gui_mch_settitle(
    char_u  *title,
@ -3162,6 +3176,7 @@ gui_mch_browse(
 }
 #endif /* FEAT_BROWSE */

+/*ARGSUSED*/
    static void
 _OnDropFiles(
    HWND hwnd,
@ -3229,6 +3244,7 @@ _OnDropFiles(
 #endif
 }

+/*ARGSUSED*/
    static int
 _OnScroll(
    HWND hwnd,
@ -3361,6 +3377,7 @@ _OnScroll(
 * Return pointer to buffer in "tofree".
 * Returns zero when out of memory.
 */
+/*ARGSUSED*/
    int
 get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree)
 {
@ -3473,7 +3490,7 @@ get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree)
 		}
 	    }

-	    if (pnew != NUL)
+	    if (pnew != NULL)
 		*pnew++ = NUL;
 	    while (*p == ' ' || *p == '\t')
 		++p;		    /* advance until a non-space */
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@ -1226,11 +1226,13 @@ GetWin32Error()
    return msg;
 }
 #endif
+
 /*
 * PRIVATE: cs_insert_filelist
 *
 * insert a new cscope database filename into the filelist
 */
+/*ARGSUSED*/
    static int
 cs_insert_filelist(fname, ppath, flags, sb)
    char *fname;
--- a/src/if_python.c
+++ b/src/if_python.c
@ -384,10 +384,13 @@ static int initialised = 0;

 #if PYTHON_API_VERSION < 1007 /* Python 1.4 */
 typedef PyObject PyThreadState;
-#endif /* Python 1.4 */
+#endif

-#ifndef PY_CAN_RECURSE
+#ifdef PY_CAN_RECURSE
+static PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
+#else
 static PyThreadState *saved_python_thread = NULL;
+#endif

 /*
 * Suspend a thread of the Python interpreter, other threads are allowed to
@ -396,7 +399,11 @@ static PyThreadState *saved_python_thread = NULL;
    static void
 Python_SaveThread(void)
 {
+#ifdef PY_CAN_RECURSE
+    PyGILState_Release(pygilstate);
+#else
    saved_python_thread = PyEval_SaveThread();
+#endif
 }

 /*
@ -406,10 +413,13 @@ Python_SaveThread(void)
    static void
 Python_RestoreThread(void)
 {
+#ifdef PY_CAN_RECURSE
+    pygilstate = PyGILState_Ensure();
+#else
    PyEval_RestoreThread(saved_python_thread);
    saved_python_thread = NULL;
-}
 #endif
+}

 /*
 * obtain a lock on the Vim data structures
@ -430,11 +440,17 @@ python_end()
 {
 #ifdef DYNAMIC_PYTHON
    if (hinstPython && Py_IsInitialized())
+    {
+        Python_RestoreThread();	    /* enter python */
        Py_Finalize();
+    }
    end_dynamic_python();
 #else
    if (Py_IsInitialized())
+    {
+        Python_RestoreThread();	    /* enter python */
        Py_Finalize();
+    }
 #endif
 }

@ -470,11 +486,7 @@ Python_Init(void)
 	    goto fail;

 	/* the first python thread is vim's, release the lock */
-#ifdef PY_CAN_RECURSE
-	PyEval_SaveThread();
-#else
 	Python_SaveThread();
-#endif

 	initialised = 1;
    }
@ -497,9 +509,7 @@ fail:
    static void
 DoPythonCommand(exarg_T *eap, const char *cmd)
 {
-#ifdef PY_CAN_RECURSE
-    PyGILState_STATE	pygilstate;
-#else
+#ifndef PY_CAN_RECURSE
    static int		recursive = 0;
 #endif
 #if defined(MACOS) && !defined(MACOS_X_UNIX)
@ -544,19 +554,11 @@ DoPythonCommand(exarg_T *eap, const char *cmd)
    }
 #endif

-#ifdef PY_CAN_RECURSE
-    pygilstate = PyGILState_Ensure();
-#else
    Python_RestoreThread();	    /* enter python */
-#endif

    PyRun_SimpleString((char *)(cmd));

-#ifdef PY_CAN_RECURSE
-    PyGILState_Release(pygilstate);
-#else
    Python_SaveThread();	    /* leave python */
-#endif

 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
    if (saved_locale != NULL)
--- a/src/misc1.c
+++ b/src/misc1.c
@ -3137,6 +3137,27 @@ get_number(colon)
    return n;
 }

+/*
+ * Ask the user to enter a number.
+ */
+    int
+prompt_for_number()
+{
+    int		i;
+
+    /* When using ":silent" assume that <CR> was entered. */
+    MSG_PUTS(_("Choice number (<Enter> cancels): "));
+    i = get_number(TRUE);
+    if (KeyTyped)		/* don't call wait_return() now */
+    {
+	msg_putchar('\n');
+	cmdline_row = msg_row - 1;
+	need_wait_return = FALSE;
+	msg_didany = FALSE;
+    }
+    return i;
+}
+
    void
 msgmore(n)
    long n;
--- a/src/misc2.c
+++ b/src/misc2.c
@ -1082,6 +1082,69 @@ vim_strup(p)
    }
 }

+#if defined(FEAT_EVAL) || defined(FEAT_SYN_HL) || defined(PROTO)
+/*
+ * Make string "s" all upper-case and return it in allocated memory.
+ * Handles multi-byte characters as well as possible.
+ * Returns NULL when out of memory.
+ */
+    char_u *
+strup_save(orig)
+    char_u	*orig;
+{
+    char_u	*p;
+    char_u	*res;
+
+    res = p = vim_strsave(orig);
+
+    if (res != NULL)
+	while (*p != NUL)
+	{
+# ifdef FEAT_MBYTE
+	    int		l;
+
+	    if (enc_utf8)
+	    {
+		int	c, uc;
+		int	nl;
+		char_u	*s;
+
+		c = utf_ptr2char(p);
+		uc = utf_toupper(c);
+
+		/* Reallocate string when byte count changes.  This is rare,
+		 * thus it's OK to do another malloc()/free(). */
+		l = utf_ptr2len_check(p);
+		nl = utf_char2len(uc);
+		if (nl != l)
+		{
+		    s = alloc((unsigned)STRLEN(res) + 1 + nl - l);
+		    if (s == NULL)
+			break;
+		    mch_memmove(s, res, p - res);
+		    STRCPY(s + (p - res) + nl, p + l);
+		    p = s + (p - res);
+		    vim_free(res);
+		    res = s;
+		}
+
+		utf_char2bytes(uc, p);
+		p += nl;
+	    }
+	    else if (has_mbyte && (l = (*mb_ptr2len_check)(p)) > 1)
+		p += l;		/* skip multi-byte character */
+	    else
+# endif
+	    {
+		*p = TOUPPER_LOC(*p); /* note that toupper() can be a macro */
+		p++;
+	    }
+	}
+
+    return res;
+}
+#endif
+
 /*
 * copy a space a number of times
 */
@ -1131,13 +1194,7 @@ del_trailing_spaces(ptr)
 }

 /*
- * This is here because strncpy() does not guarantee successful results when
- * the to and from strings overlap.  It is only currently called from
- * nextwild() which copies part of the command line to another part of the
- * command line.  This produced garbage when expanding files etc in the middle
- * of the command line (on my terminal, anyway) -- webb.
- * Note: strncpy() pads the remainder of the buffer with NUL bytes,
- * vim_strncpy() doesn't do that.
+ * Like strncpy(), but always terminate the result with one NUL.
 */
    void
 vim_strncpy(to, from, len)
@ -1145,29 +1202,8 @@ vim_strncpy(to, from, len)
    char_u	*from;
    int		len;
 {
-    int i;
-
-    if (to <= from)
-    {
-	while (len-- && *from)
-	    *to++ = *from++;
-	if (len >= 0)
-	    *to = *from;    /* Copy NUL */
-    }
-    else
-    {
-	for (i = 0; i < len; i++)
-	{
-	    to++;
-	    if (*from++ == NUL)
-	    {
-		i++;
-		break;
-	    }
-	}
-	for (; i > 0; i--)
-	    *--to = *--from;
-    }
+    STRNCPY(to, from, len);
+    to[len] = NUL;
 }

 /*
--- a/src/normal.c
+++ b/src/normal.c
@ -4685,6 +4685,11 @@ dozet:
 		    spell_add_word(ptr, len, nchar == 'w');
 		}
 		break;
+
+    case '?':	/* "z?": suggestions for a badly spelled word  */
+		if (!checkclearopq(cap->oap))
+		    spell_suggest();
+		break;
 #endif

    default:	clearopbeep(cap->oap);
@ -6106,7 +6111,7 @@ nv_brackets(cap)
 	setpcmark();
 	for (n = 0; n < cap->count1; ++n)
 	    if (spell_move_to(cap->cmdchar == ']' ? FORWARD : BACKWARD,
-				    cap->nchar == 's' ? TRUE : FALSE) == FAIL)
+			     cap->nchar == 's' ? TRUE : FALSE, FALSE) == FAIL)
 	    {
 		clearopbeep(cap->oap);
 		break;
--- a/src/option.c
+++ b/src/option.c
@ -5683,12 +5683,23 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 #endif

 #ifdef FEAT_SYN_HL
-    /* When 'spelllang' is set and there is a window for this buffer in which
-     * 'spell' is set load the wordlists. */
-    else if (varp == &(curbuf->b_p_spl))
+    /* When 'spelllang' or 'spellfile' is set and there is a window for this
+     * buffer in which 'spell' is set load the wordlists. */
+    else if (varp == &(curbuf->b_p_spl) || varp == &(curbuf->b_p_spf))
    {
 	win_T	    *wp;
+	int	    l;

+	if (varp == &(curbuf->b_p_spf))
+	{
+	    l = STRLEN(curbuf->b_p_spf);
+	    if (l > 0 && (l < 4 || STRCMP(curbuf->b_p_spf + l - 4,
+								".add") != 0))
+		errmsg = e_invarg;
+	}
+
+	if (errmsg == NULL)
+	{
 	    FOR_ALL_WINDOWS(wp)
 		if (wp->w_buffer == curbuf && wp->w_p_spell)
 		{
@ -5698,6 +5709,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 # endif
 		}
 	}
+    }
 #endif

 #ifdef FEAT_AUTOCMD
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@ -332,6 +332,7 @@ mch_settitle(
 *  2: Just restore icon (which we don't have)
 *  3: Restore title and icon (which we don't have)
 */
+/*ARGSUSED*/
    void
 mch_restore_title(
    int which)
@ -370,6 +371,7 @@ mch_can_restore_icon()
 * When 'shellslash' set do it the other way around.
 * Return OK or FAIL.
 */
+/*ARGSUSED*/
    int
 mch_FullName(
    char_u	*fname,
@ -525,6 +527,7 @@ vim_stat(const char *name, struct stat *stp)
 }

 #if defined(FEAT_GUI_MSWIN) || defined(PROTO)
+/*ARGSUSED*/
    void
 mch_settmode(int tmode)
 {
@ -701,6 +704,7 @@ mch_chdir(char *path)
 * Switching off termcap mode is only allowed when Columns is 80, otherwise a
 * crash may result.  It's always allowed on NT or when running the GUI.
 */
+/*ARGSUSED*/
    int
 can_end_termcap_mode(
    int give_msg)
@ -732,6 +736,7 @@ mch_char_avail()
 /*
 * set screen mode, always fails.
 */
+/*ARGSUSED*/
    int
 mch_screenmode(
    char_u *arg)
@ -1028,6 +1033,7 @@ typedef struct
 /*
 * Make vim the owner of the current selection.  Return OK upon success.
 */
+/*ARGSUSED*/
    int
 clip_mch_own_selection(VimClipboard *cbd)
 {
@ -1041,6 +1047,7 @@ clip_mch_own_selection(VimClipboard *cbd)
 /*
 * Make vim NOT the owner of the current selection.
 */
+/*ARGSUSED*/
    void
 clip_mch_lose_selection(VimClipboard *cbd)
 {
@ -1228,7 +1235,6 @@ clip_mch_request_selection(VimClipboard *cbd)
 #ifdef FEAT_MBYTE
    HGLOBAL		rawh = NULL;
 #endif
-    char_u		*hMemStr = NULL;
    int			str_size = 0;
    int			maxlen;
    size_t		n;
@ -1327,7 +1333,7 @@ clip_mch_request_selection(VimClipboard *cbd)
    {
 	if ((hMem = GetClipboardData(CF_TEXT)) != NULL)
 	{
-	    str = hMemStr = (char_u *)GlobalLock(hMem);
+	    str = (char_u *)GlobalLock(hMem);

 	    /* The length is either what our metadata says or the strlen().
 	     * But limit it to the GlobalSize() for safety. */
@ -1587,6 +1593,7 @@ clip_mch_set_selection(VimClipboard *cbd)
 /*
 * Debugging helper: expose the MCH_WRITE_DUMP stuff to other modules
 */
+/*ARGSUSED*/
    void
 DumpPutS(
    const char *psz)
@ -1736,6 +1743,7 @@ swap_me(COLORREF colorref)
    return colorref;
 }

+/*ARGSUSED*/
    static BOOL CALLBACK
 PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
@ -1798,6 +1806,7 @@ PrintDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
    return FALSE;
 }

+/*ARGSUSED*/
    static BOOL CALLBACK
 AbortProc(HDC hdcPrn, int iCode)
 {
@ -2247,6 +2256,7 @@ mch_print_begin(prt_settings_T *psettings)
    return (ret > 0);
 }

+/*ARGSUSED*/
    void
 mch_print_end(prt_settings_T *psettings)
 {
@ -2935,8 +2945,7 @@ typedef struct
    HWND	server;		/* server window */
    char_u	*reply;		/* reply string */
    int		expr_result;	/* 0 for REPLY, 1 for RESULT 2 for error */
-}
-reply_T;
+} reply_T;

 static garray_T reply_list = {0, 0, sizeof(reply_T), 5, 0};

@ -3186,6 +3195,7 @@ points_to_pixels(char_u *str, char_u **end, int vertical, int pprinter_dc)
    return pixels;
 }

+/*ARGSUSED*/
    static int CALLBACK
 font_enumproc(
    ENUMLOGFONT	    *elf,
--- a/src/os_w32exe.c
+++ b/src/os_w32exe.c
@ -38,6 +38,7 @@ void _cdecl SaveInst(HINSTANCE hInst);
 void (_cdecl *pSaveInst)(HINSTANCE);
 #endif

+/*ARGSUSED*/
    int WINAPI
 WinMain(
    HINSTANCE	hInstance,
--- a/src/os_win32.c
+++ b/src/os_win32.c
@ -300,8 +300,7 @@ dyn_libintl_init(char *libname)
    }

    /* The bind_textdomain_codeset() function is optional. */
-    (FARPROC)dyn_libintl_bind_textdomain_codeset =
-					  (FARPROC)GetProcAddress(hLibintlDLL,
+    dyn_libintl_bind_textdomain_codeset = (void *)GetProcAddress(hLibintlDLL,
 						   "bind_textdomain_codeset");
    if (dyn_libintl_bind_textdomain_codeset == NULL)
 	dyn_libintl_bind_textdomain_codeset =
@ -322,18 +321,21 @@ dyn_libintl_end()
    dyn_libintl_bind_textdomain_codeset = null_libintl_bind_textdomain_codeset;
 }

+/*ARGSUSED*/
    static char *
 null_libintl_gettext(const char *msgid)
 {
    return (char*)msgid;
 }

+/*ARGSUSED*/
    static char *
 null_libintl_bindtextdomain(const char *domainname, const char *dirname)
 {
    return NULL;
 }

+/*ARGSUSED*/
    static char *
 null_libintl_bind_textdomain_codeset(const char *domainname,
 							  const char *codeset)
@ -341,6 +343,7 @@ null_libintl_bind_textdomain_codeset(const char *domainname,
    return NULL;
 }

+/*ARGSUSED*/
    static char *
 null_libintl_textdomain(const char *domainname)
 {
@ -446,6 +449,7 @@ mch_windows95(void)
 static int old_num_windows;
 static int num_windows;

+/*ARGSUSED*/
    static BOOL CALLBACK
 win32ssynch_cb(HWND hwnd, LPARAM lparam)
 {
@ -762,6 +766,7 @@ decode_key_event(
 * For the GUI the mouse handling is in gui_w32.c.
 */
 # ifdef FEAT_GUI_W32
+/*ARGSUSED*/
    void
 mch_setmouse(int on)
 {
@ -2211,6 +2216,7 @@ mch_exit(int r)
 /*
 * Do we have an interactive window?
 */
+/*ARGSUSED*/
    int
 mch_check_win(
    int argc,
@ -3444,6 +3450,7 @@ termcap_mode_end(void)


 #ifdef FEAT_GUI_W32
+/*ARGSUSED*/
    void
 mch_write(
    char_u  *s,
@ -4099,6 +4106,7 @@ mch_write(
 /*
 * Delay for half a second.
 */
+/*ARGSUSED*/
    void
 mch_delay(
    long    msec,
@ -4716,7 +4724,7 @@ copy_infostreams(char_u *from, char_u *to)
 		/* Advance to the next stream.  We might try seeking too far,
 		 * but BackupSeek() doesn't skip over stream borders, thus
 		 * that's OK. */
-		(void)BackupSeek(sh, sid.Size.LowPart, sid.Size.u.HighPart,
+		(void)BackupSeek(sh, sid.Size.u.LowPart, sid.Size.u.HighPart,
 							  &lo, &hi, &context);
 	    }

--- a/src/proto/misc1.pro
+++ b/src/proto/misc1.pro
@ -42,6 +42,7 @@ void change_warning __ARGS((int col));
 int ask_yesno __ARGS((char_u *str, int direct));
 int get_keystroke __ARGS((void));
 int get_number __ARGS((int colon));
+int prompt_for_number __ARGS((void));
 void msgmore __ARGS((long n));
 void beep_flush __ARGS((void));
 void vim_beep __ARGS((void));
--- a/src/proto/misc2.pro
+++ b/src/proto/misc2.pro
@ -31,6 +31,7 @@ char_u *vim_strsave_escaped_ext __ARGS((char_u *string, char_u *esc_chars, int c
 char_u *vim_strsave_up __ARGS((char_u *string));
 char_u *vim_strnsave_up __ARGS((char_u *string, int len));
 void vim_strup __ARGS((char_u *p));
+char_u *strup_save __ARGS((char_u *orig));
 void copy_spaces __ARGS((char_u *ptr, size_t count));
 void copy_chars __ARGS((char_u *ptr, size_t count, int c));
 void del_trailing_spaces __ARGS((char_u *ptr));
--- a/src/proto/spell.pro
+++ b/src/proto/spell.pro
@ -1,6 +1,6 @@
 /* spell.c */
 int spell_check __ARGS((win_T *wp, char_u *ptr, int *attrp));
-int spell_move_to __ARGS((int dir, int allwords));
+int spell_move_to __ARGS((int dir, int allwords, int curline));
 char_u *did_set_spelllang __ARGS((buf_T *buf));
 void spell_reload __ARGS((void));
 void put_bytes __ARGS((FILE *fd, long_u nr, int len));
@ -8,4 +8,5 @@ void ex_mkspell __ARGS((exarg_T *eap));
 void ex_spell __ARGS((exarg_T *eap));
 void spell_add_word __ARGS((char_u *word, int len, int bad));
 void init_spell_chartab __ARGS((void));
+void spell_suggest __ARGS((void));
 /* vim: set ft=c : */
--- a/src/spell.c
+++ b/src/spell.c
--- a/src/tag.c
+++ b/src/tag.c
@ -740,17 +740,8 @@ do_tag(tag, type, count, forceit, verbose)
 	    {
 		/*
 		 * Ask to select a tag from the list.
-		 * When using ":silent" assume that <CR> was entered.
 		 */
-		MSG_PUTS(_("Enter nr of choice (<CR> to abort): "));
-		i = get_number(TRUE);
-		if (KeyTyped)		/* don't call wait_return() now */
-		{
-		    msg_putchar('\n');
-		    cmdline_row = msg_row - 1;
-		    need_wait_return = FALSE;
-		    msg_didany = FALSE;
-		}
+		i = prompt_for_number();
 		if (i <= 0 || i > num_matches || got_int)
 		{
 		    /* no valid choice: don't change anything */
--- a/src/ui.c
+++ b/src/ui.c
@ -1680,6 +1680,7 @@ read_from_input_buf(buf, maxlen)
    return (int)maxlen;
 }

+/*ARGSUSED*/
    void
 fill_input_buf(exit_on_error)
    int	exit_on_error;
--- a/src/version.h
+++ b/src/version.h
@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT	"vim70aa"
 #define VIM_VERSION_SHORT	"7.0aa"
 #define VIM_VERSION_MEDIUM	"7.0aa ALPHA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 8)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 8, compiled "
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 13)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0aa ALPHA (2005 Jun 13, compiled "