updated for version 7.0141

Filelist

@@ -377,6 +377,7 @@ SRC_MAC =	\
 		src/os_mac.pbproj/project.pbxproj \
 		src/proto/gui_mac.pro \
 		src/proto/os_mac.pro \
+		src/proto/os_mac_conv.pro \
 
 # source files for VMS (in the extra archive)
 SRC_VMS =	\
@@ -688,7 +689,10 @@ LANG_GEN = \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
+		runtime/spell/yi/README.txt \
 		runtime/spell/main.aap \
+		runtime/spell/*.vim \
+		runtime/spell/fixdup \
 
 # generic language files, binary
 LANG_GEN_BIN = \
@@ -702,6 +706,7 @@ LANG_SRC = \
 		src/po/README.txt \
 		src/po/README_mingw.txt \
 		src/po/README_mvc.txt \
+		src/po/check.vim \
 		src/po/cleanup.vim \
 		src/po/Makefile \
 		src/po/Make_cyg.mak \

runtime/autoload/ccomplete.vim

@@ -0,0 +1,101 @@
+" Vim completion script
+" Language:	C
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2005 Sep 05
+
+function! ccomplete#Complete(findstart, base)
+  if a:findstart
+    " locate the start of the word
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0
+      if line[start - 1] =~ '\w\|\.'
+	let start -= 1
+      elseif start > 1 && line[start - 2] == '-' && line[start - 1] == '>'
+	let start -= 2
+      else
+	break
+      endif
+    endwhile
+    return start
+  endif
+
+  " return list of matches
+  if a:base !~ '\.\|->'
+    " Only one part, no "." or "->": complete from tags file.
+    let diclist = taglist(a:base)
+    return map(diclist, 'v:val["name"]')
+  endif
+
+  " Find variable locally in function or file.
+  let items = split(a:base, '\.\|->')
+
+  " At the moment we only do "aa.bb", not "aa.bb.cc"
+  if len(items) > 2
+    return []
+  endif
+
+  let line = ''
+  if searchdecl(items[0]) == 0 || searchdecl(items[0], 1) == 0
+    " Found, now figure out the type.
+    " TODO: join previous line if it makes sense
+    let line = getline('.')
+    let col = col('.')
+  else
+    " Find the variable in the tags file
+    let diclist = taglist(items[0])
+    for i in range(len(diclist))
+      " For now we only recognize a variable.
+      if diclist[i]['kind'] == 'v'
+	let line = diclist[i]['cmd']
+	if line[0] == '/' && line[1] == '^'
+	  " the command is a search pattern, remove the leading /^
+	  let line = strpart(line, 2)
+	endif
+	let col = match(line, items[0])
+	break
+      endif
+    endfor
+  endif
+
+  if line == ''
+    return []
+  endif
+
+  " Is there a * before the variable name?
+  let col -= 1
+  let star = 0
+  while col > 0
+    let col -= 1
+    if line[col] == '*'
+      let star = 1
+    elseif line[col] !~ '\s'
+      break
+    endif
+  endwhile
+
+  " Use the line up to the variable name and split it in tokens.
+  let lead = strpart(line, 0, col + 1)
+  let tokens = split(lead, '\s\+\|\<')
+
+  let basetext = matchstr(a:base, '.*\.\|->')
+
+  for i in range(len(tokens) - 1)
+    if tokens[i] == 'struct'
+      let name = tokens[i + 1]
+      " Todo: Use all tags files; What about local structures?
+      exe 'vimgrep /\<struct:' . name . '\>/j tags'
+      let res = []
+      for l in getqflist()
+	let memb = matchstr(l['text'], '[^\t]*')
+	if len(items) == 1 || memb =~ '^' . items[1]
+	  call add(res, basetext . memb)
+	endif
+      endfor
+      return res
+    endif
+  endfor
+
+  return tokens
+endfunction
+

runtime/doc/Makefile

@@ -19,6 +19,7 @@ DOCS = \
 	change.txt \
 	cmdline.txt \
 	debugger.txt \
+	debug.txt \
 	develop.txt \
 	diff.txt \
 	digraph.txt \
@@ -139,6 +140,7 @@ HTMLS = \
 	autocmd.html \
 	change.html \
 	cmdline.html \
+	debug.html \
 	debugger.html \
 	develop.html \
 	diff.html \

runtime/doc/autocmd.txt

@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 21
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -155,6 +155,17 @@ argument behavior differs from that for defining and removing autocommands.
 In order to list buffer-local autocommands, use a pattern in the form <buffer>
 or <buffer=N>.  See |autocmd-buflocal|.
 
+							*:autocmd-verbose*
+When 'verbose' is non-zero, listing an autocommand will also display where it
+was last defined. Example: >
+
+    :verbose autocmd BufEnter
+    FileExplorer  BufEnter
+	*         call s:LocalBrowse(expand("<amatch>"))
+	    Last set from /usr/share/vim/vim-7.0/plugin/NetrwPlugin.vim
+<
+See |:verbose-cmd| for more information.
+
 ==============================================================================
 5. Events					*autocmd-events* *E215* *E216*
 
@@ -487,7 +498,7 @@ VimLeave			Before exiting Vim, just after writing the
 				VimLeavePre.
 				To detect an abnormal exit use |v:dying|.
 							*EncodingChanged*
-EncodingChanged			Fires off when the 'encoding' option is
+EncodingChanged			Fires off after the 'encoding' option has been
 				changed.  Useful to set up fonts, for example.
 							*InsertEnter*
 InsertEnter			When starting Insert mode.  Also for Replace

runtime/doc/change.txt

@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2005 Jun 25
+*change.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -682,8 +682,8 @@ For the definition of a pattern, see |pattern|.
 
 					*sub-replace-special* *:s\=*
 When the {string} starts with "\=" it is evaluated as an expression, see
-|sub-replace-expression|.  Otherwise these characters in {string} have a
-special meaning:
+|sub-replace-expression|.  You can use that for any special characters.
+Otherwise these characters in {string} have a special meaning:
 								*:s%*
 When {string} is equal to "%" and '/' is included with the 'cpotions' option,
 then the {string} of the previous substitute command is used. |cpo-/|
@@ -771,9 +771,12 @@ Be careful: The separation character must not appear in the expression!
 Consider using a character like "@" or ":".  There is no problem if the result
 of the expression contains the separation character.
 
-Example: >
+Examples: >
 	:s@\n@\="\r" . expand("$HOME") . "\r"@
-This replaces an end-of-line with a new line containing the value of $HOME.
+This replaces an end-of-line with a new line containing the value of $HOME. >
+
+	s/E/\="\<Char-0x20ac>"/g
+This replaces 'E' characters with an euro sign. Read more in |<Char->|.
 
 
 4.3 Search and replace					*search-replace*
@@ -1531,4 +1534,8 @@ The details about sorting depend on the library function used.  There is no
 guarantee that sorting is "stable" or obeys the current locale.  You will have
 to try it out.
 
+The sorting itself cannot be interrupted, because of using a system library
+function.  You can interrupt the preparation (for undo) and putting the sorted
+lines into the buffer.  In the last case you may end up with duplicated lines.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/debug.txt

@@ -0,0 +1,69 @@
+*debug.txt*     For Vim version 7.0aa.  Last change: 2005 Sep 01
+
+
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
+
+
+Debugging Vim						*debug-vim*
+
+This is for debugging Vim itself, when it doesn't work properly.
+
+1. Location of a crash, using gcc and gdb	|debug-gcc|
+2. Windows Bug Reporting               		|debug-win32|
+
+==============================================================================
+
+1. Location of a crash, using gcc and gdb		*debug-gcc*
+
+When Vim crashes in one of the test files, and you are using gcc for
+compilation, here is what you can do to find out exactly where Vim crashes.
+This also applies when using the MingW tools.
+
+1. Compile Vim with the "-g" option (there is a line in the Makefile for this,
+   which you can uncomment).
+
+2. Execute these commands (replace "11" with the test that fails): >
+	cd testdir
+	gdb ../vim
+	run -u unix.vim -U NONE -s dotest.in test11.in
+
+3. Check where Vim crashes, gdb should give a message for this.
+
+4. Get a stack trace from gdb with this command: >
+	where
+<  You can check out different places in the stack trace with: >
+	frame 3
+<  Replace "3" with one of the numbers in the stack trace.
+
+==============================================================================
+
+2. Windows Bug Reporting                       		*debug-win32*
+
+If the Windows version of Vim crashes in a reproducible manner,
+you can take some steps to provide a useful bug report.
+
+First, you must obtain the debugger symbols (PDB) file for your executable:
+gvim.pdb for gvim.exe, or vim.pdb for vim.exe. It should be available
+from the same place that you obtained the executable. Be sure to use
+the PDB that matches the EXE.
+
+If you built the executable yourself with the Microsoft Visual C++ compiler,
+then the PDB was built with the EXE.
+
+You can download the Microsoft Visual C++ Toolkit from
+    http://msdn.microsoft.com/visualc/vctoolkit2003/
+This contains the command-line tools, but not the Visual Studio IDE.
+
+The Debugging Tools for Windows can be downloaded from
+    http://www.microsoft.com/whdc/devtools/debugging/default.mspx
+This includes the WinDbg debugger.
+
+If you have Visual Studio, use that instead of the VC Toolkit
+and WinDbg.
+
+
+(No idea what to do if your binary was built with the Borland or Cygwin
+compilers. Sorry.)
+
+=========================================================================
+ vim:tw=78:ts=8:ft=help:norl:

runtime/doc/develop.txt

@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 13
+*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -123,7 +123,8 @@ VIM IS... MAINTAINABLE					*design-maintain*
 
 - The source code should not become a mess.  It should be reliable code.
 - Use the same layout in all files to make it easy to read |coding-style|.
-- Use comments in a useful way!
+- Use comments in a useful way!  Quoting the function name and argument names
+  is NOT useful.  Do explain what they are for.
 - Porting to another platform should be made easy, without having to change
   too much platform-independent code.
 - Use the object-oriented spirit: Put data and code together.  Minimize the
@@ -237,8 +238,8 @@ get_env_value()	Linux system function
 
 VARIOUS							*style-various*
 
-Typedef'ed names should end in "_t": >
-    typedef int some_t;
+Typedef'ed names should end in "_T": >
+    typedef int some_T;
 Define'ed names should be uppercase: >
     #define SOME_THING
 Features always start with "FEAT_": >

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 25
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1474,6 +1474,8 @@ call( {func}, {arglist} [, {dict}])
 char2nr( {expr})		Number	ASCII value of first char in {expr}
 cindent( {lnum})		Number	C indent for line {lnum}
 col( {expr})			Number	column nr of cursor or mark
+complete_add( {expr})		Number	add completion match
+complete_check()		Number  check for key typed during completion
 confirm( {msg} [, {choices} [, {default} [, {type}]]])
 				Number	number of choice picked by user
 copy( {expr})			any	make a shallow copy of {expr}
@@ -1585,6 +1587,7 @@ mode()				String	current editing mode
 nextnonblank( {lnum})		Number	line nr of non-blank line >= {lnum}
 nr2char( {expr})		String	single char with ASCII value {expr}
 prevnonblank( {lnum})		Number	line nr of non-blank line <= {lnum}
+printf( {fmt}, {expr1}...)	String  format text
 range( {expr} [, {max} [, {stride}]])
 				List	items from {expr} to {max}
 readfile({fname} [, {binary} [, {max}]])
@@ -1604,6 +1607,7 @@ repeat( {expr}, {count})	String	repeat {expr} {count} times
 resolve( {filename})		String	get filename a shortcut points to
 reverse( {list})		List	reverse {list} in-place
 search( {pattern} [, {flags}])	Number	search for {pattern}
+searchdecl({name} [, {global}]) Number  search for variable declaration
 searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]])
 				Number	search for other end of start/end pair
 server2client( {clientid}, {string})
@@ -1619,7 +1623,7 @@ simplify( {filename})		String	simplify filename as much as possible
 sort( {list} [, {func}])	List	sort {list}, using {func} to compare
 soundfold( {word})		String	sound-fold {word}
 spellbadword()			String	badly spelled word at cursor
-spellsuggest({word} [, {max}])	List	spelling suggestions
+spellsuggest( {word} [, {max}])	List	spelling suggestions
 split( {expr} [, {pat} [, {keepempty}]])
 				List	make List from {pat} separated {expr}
 strftime( {format}[, {time}])	String	time in specified format
@@ -1885,6 +1889,22 @@ col({expr})	The result is a Number, which is the byte index of the column
 				\<C-O>:echo col(".") . "\n" <Bar>
 				\let &ve = save_ve<CR>
 <
+
+complete_add({expr})				*complete_add()*
+		Add {expr} to the list of matches.  Only to be used by the
+		function specified with the 'completefunc' option.
+		Returns 0 for failure (empty string or out of memory),
+		1 when the match was added, 2 when the match was already in
+		the list.
+
+complete_check()				*complete_check()*
+		Check for a key typed while looking for completion matches.
+		This is to be used when looking for matches takes some time.
+		Returns non-zero when searching for matches is to be aborted,
+		zero otherwise.
+		Only to be used by the function specified with the
+		'completefunc' option.
+
 						*confirm()*
 confirm({msg} [, {choices} [, {default} [, {type}]]])
 		Confirm() offers the user a dialog, from which a choice can be
@@ -1994,11 +2014,12 @@ cscope_connection([{num} , {dbpath} [, {prepend}]])
 <
 cursor({lnum}, {col})					*cursor()*
 		Positions the cursor at the column {col} in the line {lnum}.
+		The first column is one.
 		Does not change the jumplist.
 		If {lnum} is greater than the number of lines in the buffer,
 		the cursor will be positioned at the last line in the buffer.
 		If {lnum} is zero, the cursor will stay in the current line.
-		If {col} is greater than the number of characters in the line,
+		If {col} is greater than the number of bytes in the line,
 		the cursor will be positioned at the last character in the
 		line.
 		If {col} is zero, the cursor will stay in the current column.
@@ -2416,29 +2437,24 @@ get({dict}, {key} [, {default}])
 
 							*getbufline()*
 getbufline({expr}, {lnum} [, {end}])
-		Return the lines starting from {lnum} to {end} in the buffer
-		{expr} as a List. If {end} is omitted, only the line {lnum}
-		is returned.
+		Return a List with the lines starting from {lnum} to {end}
+		(inclusive) in the buffer {expr}.  If {end} is omitted, a List
+		with only the line {lnum} is returned.
 
 		For the use of {expr}, see |bufname()| above.
 
-		When {lnum} is a String that doesn't start with a
-		digit, line() is called to translate the String into a Number.
-
-		{end} is used in the same way as {lnum}.
+		For {lnum} and {end} "$" can be used for the last line of the
+		buffer.  Otherwise a number must be used.
 
 		When {lnum} is smaller than 1 or bigger than the number of
 		lines in the buffer, an empty List is returned.
 
 		When {end} is greater than the number of lines in the buffer,
 		it is treated as {end} is set to the number of lines in the
-		buffer.
-
-		When non-existing line ranges are specified, an empty List is
-		returned.  When {end} is before {lnum} an empty List is
+		buffer.  When {end} is before {lnum} an empty List is
 		returned.
 
-		This function works only for loaded buffers. For unloaded and
+		This function works only for loaded buffers.  For unloaded and
 		non-existing buffers, an empty List is returned.
 
 		Example: >
@@ -3342,6 +3358,134 @@ nr2char({expr})						*nr2char()*
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
 
+printf({fmt}, {expr1} ...)				*printf()*
+		Return a String with {fmt}, where "%" items are replaced by
+		the formatted form of their respective arguments.  Example: >
+			printf("%4d: E%d %.30s", lnum, errno, msg)
+<		May result in:
+			"  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
+
+		Often used items are:
+		  %s   	string
+		  %6s	string right-aligned in 6 characters
+		  %c    single byte
+		  %d    decimal number
+		  %5d   decimal number padded with spaces to 5 characters
+		  %x    hex number
+		  %04x  hex number padded with zeros to at least 4 characters
+		  %X    hex number using upper case letters
+		  %o    octal number
+		  %%    the % character
+
+		Conversion specifications start with '%' and end with the
+		conversion type.  All other characters are copied unchanged to
+		the result.
+
+		The "%" starts a conversion specification.  The following
+		arguments appear in sequence:
+
+			%  [flags]  [field-width]  [.precision]  type
+
+	        flags
+			Zero or more of the following flags:
+
+		    #	      The value should be converted to an "alternate
+			      form".  For c, d, and s conversions, this option
+			      has no effect.  For o conversions, the precision
+			      of the number is increased to force the first
+			      character of the output string to a zero (except
+			      if a zero value is printed with an explicit
+			      precision of zero).
+			      For x and X conversions, a non-zero result has
+			      the string "0x" (or "0X" for X conversions)
+			      prepended to it.
+
+		    0 (zero)  Zero padding.  For all conversions the converted
+			      value is padded on the left with zeros rather
+			      than blanks.  If a precision is given with a
+			      numeric conversion (d, o, x, and X), the 0 flag
+			      is ignored.
+
+		    -	      A negative field width flag; the converted value
+			      is to be left adjusted on the field boundary.
+			      The converted value is padded on the right with
+			      blanks, rather than on the left with blanks or
+			      zeros.  A - overrides a 0 if both are given.
+
+		    ' ' (space)  A blank should be left before a positive
+			      number produced by a signed conversion (d).
+
+		    +	      A sign must always be placed before a number
+			      produced by a signed conversion.  A + overrides
+			      a space if both are used.
+
+		field-width
+			An optional decimal digit string specifying a minimum
+			field width.  If the converted value has fewer
+			characters than the field width, it will be padded
+			with spaces on the left (or right, if the
+			left-adjustment flag has been given) to fill out the
+			field width.
+
+		.precision
+			An optional precision, in the form of a period '.'
+			followed by an optional digit string.  If the digit
+			string is omitted, the precision is taken as zero.
+			This gives the minimum number of digits to appear for
+			d, o, x, and X conversions, or the maximum number of
+			characters to be printed from a string for s
+			conversions.
+
+		type
+			A character that specifies the type of conversion to
+			be applied, see below.
+
+		A field width or precision, or both, may be indicated by an
+		asterisk '*' instead of a digit string.  In this case, a
+		Number argument supplies the field width or precision.  A
+		negative field width is treated as a left adjustment flag
+		followed by a positive field width; a negative precision is
+		treated as though it were missing.  Example: >
+			:echo printf("%d: %.*s", nr, width, line)
+<		This limits the length of the text used from "line" to
+		"width" bytes.
+
+	        The conversion specifiers and their meanings are:
+
+		doxX    The Number argument is converted to signed decimal
+			(d), unsigned octal (o), or unsigned hexadecimal (x
+			and X) notation.  The letters "abcdef" are used for
+			x conversions; the letters "ABCDEF" are used for X
+			conversions.
+			The precision, if any, gives the minimum number of
+			digits that must appear; if the converted value
+			requires fewer digits, it is padded on the left with
+			zeros.
+			In no case does a non-existent or small field width
+			cause truncation of a numeric field; if the result of
+			a conversion is wider than the field width, the field
+			is expanded to contain the conversion result.
+
+		c	The Number argument is converted to a byte, and the
+			resulting character is written.
+
+		s	The text of the String argument is used.  If a
+			precision is specified, no more bytes than the number
+			specified are used.
+
+		%	A '%' is written.  No argument is converted.  The
+			complete conversion specification is "%%".
+
+		Each argument can be Number or String and is converted
+		automatically to fit the conversion specifier.  Any other
+		argument type results in an error message.
+
+							*E766* *E767*
+		The number of {exprN} arguments must exactly match the number
+		of "%" items.  If there are not sufficient or too many
+		arguments an error is given.  Up to 18 arguments can be used.
+
+
 prevnonblank({lnum})					*prevnonblank()*
 		Return the line number of the first line at or above {lnum}
 		that is not blank.  Example: >
@@ -3566,6 +3710,18 @@ search({pattern} [, {flags}])				*search()*
 		    :  let n = n + 1
 		    :endwhile
 <
+
+searchdecl({name} [, {global}])				*searchdecl()*
+		Search for the declaration of {name}.  Without {global} or
+		with a zero {global} argument this works like |gd|.  With a
+		non-zero {global} argument it works like |gD|.
+		Moves the cursor to the found match.
+		Returns zero for success, non-zero for failure.
+		Example: >
+			if searchdecl('myvar') == 0
+			   echo getline('.')
+			endif
+<
 							*searchpair()*
 searchpair({start}, {middle}, {end} [, {flags} [, {skip}]])
 		Search for the match of a nested start-end pair.  This can be
@@ -3841,7 +3997,7 @@ soundfold({word})
 
 							*spellbadword()*
 spellbadword()	Return the badly spelled word under or after the cursor.
-		The cursor is advanced to the start of the bad word.
+		The cursor is moved to the start of the bad word.
 		When no bad word is found in the cursor line an empty String
 		is returned and the cursor doesn't move.
 
@@ -3938,12 +4094,12 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 
 							*strlen()*
 strlen({expr})	The result is a Number, which is the length of the String
-		{expr} in bytes.  If you want to count the number of
-		multi-byte characters use something like this: >
+		{expr} in bytes.
+		If you want to count the number of multi-byte characters (not
+		counting composing characters) use something like this: >
 
 			:let len = strlen(substitute(str, ".", "x", "g"))
-
-<		Composing characters are not counted.
+<
 		If the argument is a Number it is first converted to a String.
 		For other types an error is given.
 		Also see |len()|.
@@ -4125,7 +4281,7 @@ taglist({expr})							*taglist()*
 		information about these fields.  For C code the fields
 		"struct", "class" and "enum" may appear, they give the name of
 		the entity the tag is contained in.
- 
+
 		The ex-command 'cmd' can be either an ex search pattern, a
 		line number or a line number followed by a byte number.
 
@@ -4525,7 +4681,8 @@ builtin functions.  To prevent from using the same name in different scripts
 avoid obvious, short names.  A good habit is to start the function name with
 the name of the script, e.g., "HTMLcolor()".
 
-It's also possible to use curly braces, see |curly-braces-names|.
+It's also possible to use curly braces, see |curly-braces-names|.  And the
+|autoload| facility is useful to define a function only when it's called.
 
 							*local-function*
 A function local to a script must start with "s:".  A local script function
@@ -4541,7 +4698,22 @@ instead of "s:" when the mapping is expanded outside of the script.
 			{name} can also be a Dictionary entry that is a
 			Funcref: >
 				:function dict.init
-<							*E124* *E125*
+
+:fu[nction] /{pattern}	List functions with a name matching {pattern}.
+			Example that lists all functions ending with "File": >
+				:function /File$
+<
+							*:function-verbose*
+When 'verbose' is non-zero, listing a function will also display where it was
+last defined. Example: >
+
+    :verbose function SetFileTypeSH
+	function SetFileTypeSH(name)
+	    Last set from /usr/share/vim/vim-7.0/filetype.vim
+<
+See |:verbose-cmd| for more information.
+
+ 							*E124* *E125*
 :fu[nction][!] {name}([arguments]) [range] [abort] [dict]
 			Define a new function by the name {name}.  The name
 			must be made of alphanumeric characters and '_', and
@@ -5109,8 +5281,8 @@ This would call the function "my_func_whizz(parameter)".
 			value of each item.
 			When an error is detected for a command inside the
 			loop, execution continues after the "endfor".
-			Changing {list} affects what items are used.  Make a
-			copy if this is unwanted: >
+			Changing {list} inside the loop affects what items are
+			used.  Make a copy if this is unwanted: >
 				:for item in copy(mylist)
 <			When not making a copy, Vim stores a reference to the
 			next item in the list, before executing the commands
@@ -5128,12 +5300,6 @@ This would call the function "my_func_whizz(parameter)".
 			changing.  Unlet the variable at the end of the loop
 			to allow multiple item types.
 
-:for {var} in {string}
-:endfo[r]		Like ":for" above, but use each character in {string}
-			as a list item.
-			Composing characters are used as separate characters.
-			A Number is first converted to a String.
-
 :for [{var1}, {var2}, ...] in {listlist}
 :endfo[r]
 			Like ":for" above, but each item in {listlist} must be

runtime/doc/filetype.txt

@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*filetype.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -44,15 +44,21 @@ Detail: The ":filetype on" command will load one of these files:
 	name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
 	contents of the file.
 
-To add your own file types, see |new-filetype| below.
+To add your own file types, see |new-filetype| below.  To search for help on a
+filetype prepend "ft-" and optionally append "-syntax", "-indent" or
+"-plugin".  For example: >
+	:help ft-vim-indent
+	:help ft-vim-syntax
+	:help ft-man-plugin
 
 If the file type is not detected automatically, or it finds the wrong type,
 you can either set the 'filetype' option manually, or add a modeline to your
 file.  Example, for in an IDL file use the command: >
 	:set filetype=idl
-or add this |modeline| to the file: >
-	/* vim: set filetype=idl : */
-<
+
+or add this |modeline| to the file:
+	/* vim: set filetype=idl : */ ~
+
 						*:filetype-plugin-on*
 You can enable loading the plugin files for specific file types with: >
 	:filetype plugin on
@@ -132,16 +138,16 @@ kind of file it is.  This doesn't always work.  A number of global variables
 can be used to overrule the filetype used for certain extensions:
 
 	file name	variable ~
-	*.asa		g:filetype_asa	|aspvbs-syntax| |aspperl-syntax|
-	*.asp		g:filetype_asp	|aspvbs-syntax| |aspperl-syntax|
-	*.asm		g:asmsyntax	|asm-syntax|
+	*.asa		g:filetype_asa	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	*.asp		g:filetype_asp	|ft-aspvbs-syntax| |ft-aspperl-syntax|
+	*.asm		g:asmsyntax	|ft-asm-syntax|
 	*.prg		g:filetype_prg
 	*.pl		g:filetype_pl
 	*.inc		g:filetype_inc
-	*.w		g:filetype_w	|cweb-syntax|
-	*.i		g:filetype_i	|progress-syntax|
-	*.p		g:filetype_p	|pascal-syntax|
-	*.sh		g:bash_is_sh	|sh-syntax|
+	*.w		g:filetype_w	|ft-cweb-syntax|
+	*.i		g:filetype_i	|ft-progress-syntax|
+	*.p		g:filetype_p	|ft-pascal-syntax|
+	*.sh		g:bash_is_sh	|ft-sh-syntax|
 
 							*filetype-ignore*
 To avoid that certain files are being inspected, the g:ft_ignore_pat variable
@@ -380,7 +386,7 @@ ways to change this:
 3.  Docs for the default filetype plugins.		*ftplugin-docs*
 
 
-CHANGELOG						*changelog-plugin*
+CHANGELOG						*ft-changelog-plugin*
 
 Allows for easy entrance of Changelog entries in Changelog files.  There are
 some commands, mappings, and variables worth exploring:
@@ -401,7 +407,7 @@ Local mappings:
 Global mappings:
 			NOTE: The global mappings are accessed by sourcing the
 			ftplugin/changelog.vim file first, e.g. with >
-				runtime ftplugin/man.vim
+				runtime ftplugin/changelog.vim
 <			in your |.vimrc|.
 <Leader>o		Switches to the ChangeLog buffer opened for the
 			current directory, or opens it in a new buffer if it
@@ -466,7 +472,7 @@ under it.  If not found, a new entry and item is prepended to the beginning of
 the Changelog.
 
 
-FORTRAN							*fortran-plugin*
+FORTRAN							*ft-fortran-plugin*
 
 Options:
 'expandtab'	is switched on to avoid tabs as required by the Fortran
@@ -476,10 +482,10 @@ Options:
 'formatoptions' is set to break code and comment lines and to preserve long
 		lines.  You can format comments with |gq|.
 For further discussion of fortran_have_tabs and the method used for the
-detection of source format see |fortran-syntax|.
+detection of source format see |ft-fortran-syntax|.
 
 
-MAIL							*mail-plugin*
+MAIL							*ft-mail-plugin*
 
 Options:
 'modeline'	is switched off to avoid the danger of trojan horses, and to
@@ -496,7 +502,7 @@ Local mappings:
 	to the end of the file in Normal mode.  This means "> " is inserted in
 	each line.
 
-MAN							*man-plugin* *:Man*
+MAN							*ft-man-plugin* *:Man*
 
 Displays a manual page in a nice way.  Also see the user manual
 |find-manpage|.
@@ -523,7 +529,7 @@ CTRL-]		Jump to the manual page for the word under the cursor.
 CTRL-T		Jump back to the previous manual page.
 
 
-RPM SPEC						*spec-plugin*
+RPM SPEC						*ft-spec-plugin*
 
 Since the text for this plugin is rather long it has been put in a separate
 file: |pi_spec.txt|.

runtime/doc/gui.txt

@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 21
+*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Aug 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -79,7 +79,7 @@ All this happens AFTER the normal Vim initializations, like reading your
 But the GUI window is only opened after all the initializations have been
 carried out.  If you want some commands to be executed just after opening the
 GUI window, use the |GUIEnter| autocommand event.  Example: >
-	:autocommand GUIEnter * winpos 100 50
+	:autocmd GUIEnter * winpos 100 50
 
 You can use the gvimrc files to set up your own customized menus (see |:menu|)
 and initialize other things that you may want to set up differently from the

runtime/doc/help.txt

@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 19
+*help.txt*	For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 			VIM - main help file
 									 k
@@ -97,6 +97,7 @@ General subjects ~
 |quotes.txt|	remarks from users of Vim
 |todo.txt|	known problems and desired extensions
 |develop.txt|	development of Vim
+|debug.txt|	debugging Vim itself
 |uganda.txt|	Vim distribution conditions and what to do with your money
 
 Basic editing ~

runtime/doc/if_ruby.txt

@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*if_ruby.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -159,6 +159,8 @@ Methods:
 buffer		Returns the buffer displayed in the window.
 height		Returns the height of the window.
 height = {n}	Sets the window height to {n}.
+width		Returns the width of the window.
+width = {n}	Sets the window width to {n}.
 cursor		Returns a [row, col] array for the cursor position.
 cursor = [{row}, {col}]
 		Sets the cursor position to {row} and {col}.

runtime/doc/indent.txt

@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
+*indent.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -449,7 +449,7 @@ $VIMRUNTIME/indent directory for examples.
 REMARKS ABOUT SPECIFIC INDENT FILES ~
 
 
-FORTRAN							*fortran-indent*
+FORTRAN							*ft-fortran-indent*
 
 Block if, select case, and where constructs are indented.  Comments, labelled
 statements and continuation lines are indented if the Fortran is in free
@@ -457,7 +457,7 @@ source form, whereas they are not indented if the Fortran is in fixed source
 form because of the left margin requirements.  Hence manual indent corrections
 will be necessary for labelled statements and continuation lines when fixed
 source form is being used.  For further discussion of the method used for the
-detection of source format see |fortran-syntax|.
+detection of source format see |ft-fortran-syntax|.
 
 Do loops ~
 All do loops are left unindented by default.  Do loops can be unstructured in
@@ -485,7 +485,7 @@ to get do loops indented in .f90 files and left alone in Fortran files with
 other extensions such as .for.
 
 
-PYTHON							*python-indent*
+PYTHON							*ft-python-indent*
 
 The amount of indent can be set for the following situations.  The examples
 given are de the defaults.  Note that the variables are set to an expression,
@@ -499,7 +499,7 @@ Indent for a continuation line: >
 	let g:pyindent_continue = '&sw * 2'
 
 
-VERILOG							*verilog-indent*
+VERILOG							*ft-verilog-indent*
 
 General block statements such as if, for, case, always, initial, function,
 specify and begin, etc., are indented.  The module block statements (first
@@ -534,7 +534,7 @@ In addition, you can turn the verbose mode for debug issue: >
 Make sure to do ":set cmdheight=2" first to allow the display of the message.
 
 
-VIM							*vim-indent*
+VIM							*ft-vim-indent*
 
 For indenting Vim scripts there is one variable that specifies the amount of
 indent for a continuation line, a line that starts with a backslash: >

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2005 Jul 27
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 Aug 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -150,12 +150,15 @@ commands in CTRL-X submode				*i_CTRL-X_index*
 |i_CTRL-X_CTRL-K|	CTRL-X CTRL-K	complete identifiers from dictionary
 |i_CTRL-X_CTRL-L|	CTRL-X CTRL-L	complete whole lines
 |i_CTRL-X_CTRL-N|	CTRL-X CTRL-N	next completion
+|i_CTRL-X_CTRL-O|	CTRL-X CTRL-O	occult completion
 |i_CTRL-X_CTRL-P|	CTRL-X CTRL-P	previous completion
+|i_CTRL-X_CTRL-S|	CTRL-X CTRL-S	spelling suggestions
 |i_CTRL-X_CTRL-T|	CTRL-X CTRL-T	complete identifiers from thesaurus
 |i_CTRL-X_CTRL-Y|	CTRL-X CTRL-Y	scroll down
 |i_CTRL-X_CTRL-U|	CTRL-X CTRL-U	complete with 'completefunc'
 |i_CTRL-X_CTRL-V|	CTRL-X CTRL-V	complete like in : command line
 |i_CTRL-X_CTRL-]|	CTRL-X CTRL-]	complete tags
+|i_CTRL-X_s|		CTRL-X s	spelling suggestions
 {not available when compiled without the +insert_expand feature}
 
 ==============================================================================
@@ -684,6 +687,7 @@ tag		char	      note action in Normal mode	~
 				   of the current screen line
 |g8|		g8		   print hex value of bytes used in UTF-8
 				   character under the cursor
+|g<|		g<		   display previous command output
 |g?|		g?		2  Rot13 encoding operator
 |g?g?|		g??		2  Rot13 encode current line
 |g?g?|		g?g?		2  Rot13 encode current line

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Jul 26
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -354,6 +354,8 @@ CTRL-G CTRL-J	cursor one line down, insert start column    *i_CTRL-G_CTRL-J*
 <MouseUp>	scroll three lines up			     *i_<MouseUp>*
 <S-MouseUp>	scroll a full page up			     *i_<S-MouseUp>*
 CTRL-O		execute one command, return to Insert mode   *i_CTRL-O*
+CTRL-\ CTRL-O   like CTRL-O but don't move the cursor        *i_CTRL-\_CTRL-O*
+CTRL-L		when 'insertmode' is set: go to Normal mode  *i_CTRL-L*
 CTRL-G u	break undo sequence, start new change	     *i_CTRL-G_u*
 -----------------------------------------------------------------------
 
@@ -363,7 +365,8 @@ option.
 The CTRL-O command sometimes has a side effect: If the cursor was beyond the
 end of the line, it will be put on the last character in the line.  In
 mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>
-will then always put the cursor on it).
+will then always put the cursor on it).  Or use CTRL-\ CTRL-O, but then
+beware of the cursor possibly being beyond the end of the line.
 
 The shifted cursor keys are not available on all terminals.
 
@@ -547,7 +550,7 @@ entering new data while keeping all the columns aligned.
 ==============================================================================
 7. Insert mode completion				*ins-completion*
 
-In Insert and Replace modes, there are several commands to complete part of a
+In Insert and Replace mode, there are several commands to complete part of a
 keyword or line that has been typed.  This is useful if you are using
 complicated keywords (e.g., function names with capitals and underscores).
 
@@ -565,7 +568,10 @@ Completion can be done for:
 7. file names						|i_CTRL-X_CTRL-F|
 8. definitions or macros				|i_CTRL-X_CTRL-D|
 9. Vim command-line					|i_CTRL-X_CTRL-V|
-10. keywords in 'complete'				|i_CTRL-N|
+10. User defined completion				|i_CTRL-X_CTRL-U|
+11. Occult completion					|i_CTRL-X_CTRL-O|
+12. Spelling suggestions				|i_CTRL-X_s|
+13. keywords in 'complete'				|i_CTRL-N|
 
 All these (except 2) are done in CTRL-X mode.  This is a sub-mode of Insert
 and Replace modes.  You enter CTRL-X mode by typing CTRL-X and one of the
@@ -612,12 +618,12 @@ Completing whole lines					*compl-whole-line*
 
 							*i_CTRL-X_CTRL-L*
 CTRL-X CTRL-L		Search backwards for a line that starts with the
-			same characters as in the current line before the
-			cursor.  Indent is ignored.  The found line is
+			same characters as those in the current line before
+			the cursor.  Indent is ignored.  The matching line is
 			inserted in front of the cursor.
-			The 'complete' option is used to decide in which
-			buffers a match is searched for.  But only loaded
-			buffers are used.
+			The 'complete' option is used to decide which buffers
+			are searched for a match.  Only loaded buffers are
+			used.
 	CTRL-L	or
 	CTRL-P		Search backwards for next matching line.  This line
 			replaces the previous matching line.
@@ -839,7 +845,8 @@ CTRL-X CTRL-D		Search in the current and included files for the
 Completing Vim commands					*compl-vim*
 
 Completion is context-sensitive.  It works like on the Command-line.  It
-completes an Ex command as well as its arguments.
+completes an Ex command as well as its arguments.  This is useful when writing
+a Vim script.
 
 							*i_CTRL-X_CTRL-V*
 CTRL-X CTRL-V		Guess what kind of item is in front of the cursor and
@@ -858,11 +865,11 @@ CTRL-X CTRL-V		Guess what kind of item is in front of the cursor and
 			completion, for example: >
 				:imap <Tab> <C-X><C-V>
 
-User defined completing					*compl-function*
+User defined completion					*compl-function*
 
 Completion is done by a function that can be defined by the user with the
-'completefunc' option.  See the option for how the function is called and an
-example.
+'completefunc' option.  See the 'completefunc' help for how the function
+is called and an example.
 
 							*i_CTRL-X_CTRL-U*
 CTRL-X CTRL-U		Guess what kind of item is in front of the cursor and
@@ -875,6 +882,46 @@ CTRL-X CTRL-U		Guess what kind of item is in front of the cursor and
 			previous one.
 
 
+Occult completion					*compl-occult*
+
+Completion is done by a function that can be defined by the user with the
+'occultfunc' option.  This is to be used for filetype-specific completion.
+
+See the 'completefunc' help for how the function is called and an example.
+
+							*i_CTRL-X_CTRL-O*
+CTRL-X CTRL-O		Guess what kind of item is in front of the cursor and
+			find the first match for it.
+	CTRL-O	or
+	CTRL-N		Use the next match.  This match replaces the previous
+			one.
+
+	CTRL-P		Use the previous match.  This match replaces the
+			previous one.
+
+
+Spelling suggestions					*compl-spelling*
+
+A word before or at the cursor is located and correctly spelled words are
+suggested to replace it.  If there is a badly spelled word in the line, before
+or under the cursor, the cursor is moved to after it.  Otherwise the word just
+before the cursor is used for suggestions, even though it isn't badly spelled.
+
+NOTE: CTRL-S suspends display in many Unix terminals.  Use 's' instead.  Type
+CTRL-Q to resume displaying.
+
+						*i_CTRL-X_CTRL-S* *i_CTRL-X_s*
+CTRL-X CTRL-S   or
+CTRL-X s		Locate the word in front of the cursor and find the
+			first spell suggestion for it.
+	CTRL-S	or
+	CTRL-N		Use the next suggestion.  This replaces the previous
+			one.  Note that you can't use 's' here.
+
+	CTRL-P		Use the previous suggestion.  This replaces the
+			previous one.
+
+
 Completing keywords from different sources		*compl-generic*
 
 							*i_CTRL-N*

runtime/doc/intro.txt

@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Jun 12
+*intro.txt*     For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -151,31 +151,19 @@ example and try to find out which settings or other things influence the
 appearance of the bug.  Try different machines, if possible.  Send me patches
 if you can!
 
-In case of doubt, use: >
+It will help to include information about the version of Vim you are using and
+your setup.  You can get the information with this command: >
    :so $VIMRUNTIME/bugreport.vim
 This will create a file "bugreport.txt" in the current directory, with a lot
 of information of your environment.  Before sending this out, check if it
 doesn't contain any confidential information!
 
-							*debug-vim*
-When Vim crashes in one of the test files, and you are using gcc for
-compilation, here is what you can do to find out exactly where Vim crashes:
+If Vim crashes, please try to find out where.  You can find help on this here:
+|debug.txt|.
 
-1. Compile Vim with the "-g" option (there is a line in the Makefile for this,
-   which you can uncomment).
-
-2. Execute these commands (replace "11" with the test that fails): >
-	cd testdir
-	gdb ../vim
-	run -u unix.vim -U NONE -s dotest.in test11.in
-
-3. Check where Vim crashes, gdb should give a message for this.
-
-4. Get a stack trace from gdb with this command: >
-	where
-<  You can check out different places in the stack trace with: >
-	frame 3
-<  Replace "3" with one of the numbers in the stack trace.
+In case of doubt or when you wonder if the problem has already been fixed but
+you can't find a fix for it, become a member of the vim-dev maillist and ask
+your question there. |maillist|
 
 							*year-2000* *Y2K*
 Since Vim internally doesn't use dates for editing, there is no year 2000

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 21
+*map.txt*       For Vim version 7.0aa.  Last change: 2005 Aug 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -273,6 +273,16 @@ with a space.
 Note: When using mappings for Visual mode, you can use the "'<" mark, which
 is the start of the last selected Visual area in the current buffer |'<|.
 
+							*:map-verbose*
+When 'verbose' is non-zero, listing a key map will also display where it was
+last defined.  Example: >
+
+	:verbose map <C-W>*
+	n  <C-W>*      * <C-W><C-S>*
+	        Last set from /home/abcd/.vimrc
+
+See |:verbose-cmd| for more information.
+
 							*map_backslash*
 Note that only CTRL-V is mentioned here as a special character for mappings
 and abbreviations.  When 'cpoptions' does not contain 'B', a backslash can
@@ -656,6 +666,16 @@ used in a |filetype-plugin| file.  Example for a C plugin file: >
 			mode, '!' for both.  These are the same as for
 			mappings, see |map-listing|.
 
+						*:abbreviate-verbose*
+When 'verbose' is non-zero, listing an abbreviation will also display where it
+was last defined.  Example: >
+
+	:verbose abbreviate
+	!  teh           the
+		Last set from /home/abcd/vim/abbr.vim
+
+See |:verbose-cmd| for more information.
+
 :ab[breviate] {lhs}	list the abbreviations that start with {lhs}
 			You may need to insert a CTRL-V (type it twice) to
 			avoid that a typed {lhs} is expanded, since
@@ -855,6 +875,17 @@ scripts.
 
 :com[mand] {cmd}	List the user-defined commands that start with {cmd}
 
+							*:command-verbose*
+When 'verbose' is non-zero, listing a command will also display where it was
+last defined. Example: >
+
+    :verbose command TOhtml
+	Name        Args Range Complete  Definition
+	TOhtml      0    %               :call Convert2HTML(<line1>, <line2>)
+	    Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim
+<
+See |:verbose-cmd| for more information.
+
 							*E174* *E182*
 :com[mand][!] [{attr}...] {cmd} {rep}
 			Define a user command.  The name of the command is
@@ -1056,8 +1087,7 @@ To allow commands to pass their arguments on to a user-defined function, there
 is a special form <f-args> ("function args").  This splits the command
 arguments at spaces and Tabs, quotes each argument individually, and the
 <f-args> sequence is replaced by the comma-separated list of quoted arguments.
-See the Mycmd example below.  When there is no argument, <f-args> also has no
-argument.
+See the Mycmd example below.  If no arguments are given <f-args> is removed. 
 
 Examples >
 

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 27
+*message.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -21,6 +21,14 @@ depends on the 'shortmess' option.
 
 The number of remembered messages is fixed at 20.
 
+								*g<*
+The "g<" command can be used to see the last page of previous command output.
+This is especially useful if you accidentally typed <Space> at the hit-return
+prompt.
+Note: when you stopped the output with "q" at the more prompt only up to that
+point will be displayed.
+The previous command output is cleared when another command produces output.
+
 If you are using translated messages, the first printed line tells who
 maintains the messages or the translations.  You can use this to contact the
 maintainer when you spot a mistake.
@@ -279,6 +287,19 @@ Example: >
 changes to: >
 	:w! /tmp/test
 <
+							*E768*  >
+  Swap file exists: {filename} (:silent! overrides)
+
+You are protected from overwriting a file that is being edited by Vim.  This
+happens when you use ":w! filename" and a swapfile is found.
+- If the swapfile was left over from an old crashed edit session you may want
+  to delete the swapfile.  Edit {filename} to find out information about the
+  swapfile.
+- If you want to write anyway prepend ":silent!" to the command.  For example: >
+  	:silent! w! /tmp/test
+< The special command is needed, since you already added the ! for overwriting
+  an existing file.
+
 							*E139*  >
   File is loaded in another buffer
 
@@ -728,8 +749,8 @@ and the screen is about to be redrawn:
 -> Press <Enter> or <Space> to redraw the screen and continue, without that
    key being used otherwise.
 -> Press ':' or any other Normal mode command character to start that command.
--> Press 'k', 'u' or 'b' to scroll back in the messages.  This works the same
-   way as at the |more-prompt|.  Only works when 'compatible' is off and
+-> Press 'k', 'u', 'b' or 'g' to scroll back in the messages.  This works the
+   same way as at the |more-prompt|.  Only works when 'compatible' is off and
    'more' is on.
 -> Press <C-Y> to copy (yank) a modeless selection to the clipboard register.
 -> Use a menu.  The characters defined for Cmdline-mode are used.
@@ -739,6 +760,9 @@ and the screen is about to be redrawn:
    pressing <Space>.
 {Vi: only ":" commands are interpreted}
 
+If you accidentally hit <Enter> or <Space> and you want to see the displayed
+text then use |g<|.  This only works when 'more' is set.
+
 To reduce the number of hit-enter prompts:
 - Set 'cmdheight' to 2 or higher.
 - Add flags to 'shortmess'.
@@ -760,10 +784,13 @@ Type					effect ~
      <CR> or <NL> or j or <Down>	one more line
      d					down a page (half a screen)
      <Space> or <PageDown>		down a screen
+     G					down all the way, until the hit-enter
+     					prompt
 
      <BS> or k or <Up>			one line back (*)
      u					up a page (half a screen) (*)
      b or <PageUp>			back a screen (*)
+     g					back to the start (*)
 
      q, <Esc> or CTRL-C			stop the listing
      :					stop the listing and enter a

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Jul 19
+*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Jul 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -72,13 +72,13 @@ and end position.  Generally, motions that move between lines affect lines
 characterwise).  However, there are some exceptions.
 
 						*exclusive* *inclusive*
-A character motion is either inclusive or exclusive.  When inclusive, the start
-and end position of the motion are included in the operation.  When exclusive,
-the last character towards the end of the buffer is not included.  Linewise
-motions always include the start and end position.
+A character motion is either inclusive or exclusive.  When inclusive, the
+start and end position of the motion are included in the operation.  When
+exclusive, the last character towards the end of the buffer is not included.
+Linewise motions always include the start and end position.
 
-Which motions are linewise, inclusive or exclusive is mentioned below.  There
-are however, two general exceptions:
+Which motions are linewise, inclusive or exclusive is mentioned with the
+command.  There are however, two general exceptions:
 1. If the motion is exclusive and the end of the motion is in column 1, the
    end of the motion is moved to the end of the previous line and the motion
    becomes inclusive.  Example: "}" moves to the first line after a paragraph,
@@ -247,7 +247,7 @@ f{char}			To [count]'th occurrence of {char} to the right.  The
 
 							*F*
 F{char}			To the [count]'th occurrence of {char} to the left.
-			The cursor is placed on {char} |inclusive|.
+			The cursor is placed on {char} |exclusive|.
 			{char} can be entered like with the |f| command.
 
 							*t*
@@ -259,7 +259,7 @@ t{char}			Till before [count]'th occurrence of {char} to the
 							*T*
 T{char}			Till after [count]'th occurrence of {char} to the
 			left.  The cursor is placed on the character right of
-			{char} |inclusive|.
+			{char} |exclusive|.
 			{char} can be entered like with the |f| command.
 
 							*;*

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 26
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1100,7 +1100,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the  |+linebreak|
 			feature}
 	This option lets you choose which characters might cause a line
-	break if 'linebreak' is on.
+	break if 'linebreak' is on.  Only works for ASCII and also for 8-bit
+	characters when 'encoding' is an 8-bit encoding.
 
 						*'browsedir'* *'bsdir'*
 'browsedir' 'bsdir'	string	(default: "last")
@@ -1200,9 +1201,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	these words, separated by a comma:
 	internal	Use internal case mapping functions, the current
 			locale does not change the case mapping.  This only
-			matters when 'encoding' is a Unicode encoding.  When
-			"internal" is omitted, the towupper() and towlower()
-			system library functions are used when available.
+			matters when 'encoding' is a Unicode encoding,
+			"latin1" or "iso-8859-15".  When "internal" is
+			omitted, the towupper() and towlower() system library
+			functions are used when available.
 	keepascii	For the ASCII characters (0x00 to 0x7f) use the US
 			case mapping, the current locale is not effective.
 			This probably only matters for Turkish.
@@ -1584,46 +1586,94 @@ A jump table for the options with a short description can be found at |Q_op|.
 'completefunc' 'cfu'	string	(default: empty)
 			local to buffer
 			{not in Vi}
-	This option specifies a completion function to be used for CTRL-X
-	CTRL-X.  The function will be invoked with four arguments:
-	   a:line	the text of the current line
-	   a:base	the text with which matches should match
-	   a:col        column in a:line where the cursor is, first column is
-	   		zero
-	   a:findstart  either 1 or 0
-	When the a:findstart argument is 1, the function must return the
-	column of where the completion starts.  It must be a number between
-	zero and "a:col".  This involves looking at the characters in a:line
-	before column a:col and include those characters that could be part of
-	the completed item.
-	When the a:findstart argument is 0 the function must return a string
-	with the matching words, separated by newlines.  When there are no
-	matches return an empty string.
+			{not available when compiled without the +eval
+			or +insert_expand feature}
+	This option specifies a function to be used for CTRL-X CTRL-U
+	completion. |i_CTRL-X_CTRL-U|
+
+	The function will be invoked with two arguments.  First the function
+	is called to find the start of the text to be completed.  Secondly the
+	function is called to actually find the matches.
+
+	On the first invocation the arguments are:
+	   a:findstart  1
+	   a:base	empty
+
+	The function must return the column of where the completion starts.
+	It must be a number between zero and the cursor column "col('.')".
+	This involves looking at the characters just before the cursor and
+	including those characters that could be part of the completed item.
+	The text between this column and the cursor column will be replaced
+	with the matches.  Return -1 if no completion can be done.
+
+	On the second invocation the arguments are:
+	   a:findstart  0
+	   a:base	the text with which matches should match, what was
+	   		located in the first call
+
+	The function must return a List with the matching words.  These
+	matches usually include the "a:base" text.  When there are no matches
+	return an empty List.
+
+	When searching for matches takes some time call |complete_add()| to
+	add each match to the total list.  These matches should then not
+	appear in the returned list!  Call |complete_check()| now and then to
+	allow the user to press a key while still searching for matches.  Stop
+	searching when it returns non-zero.
+
+	The function may move the cursor, it is restored afterwards.
+	This option cannot be set from a |modeline| or in the |sandbox|, for
+	security reasons.
+
 	An example that completes the names of the months: >
-		fun! CompleteMonths(line, base, col, findstart)
+		fun! CompleteMonths(findstart, base)
 		  if a:findstart
-		    " locate start column of word
-		    let start = a:col
-		    while start > 0 && a:line[start - 1] =~ '\a'
-		      let start = start - 1
+		    " locate the start of the word
+		    let line = getline('.')
+		    let start = col('.') - 1
+		    while start > 0 && line[start - 1] =~ '\a'
+		      let start -= 1
 		    endwhile
 		    return start
 		  else
 		    " find months matching with "a:base"
-		    let res = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"
-		    if a:base != ''
-		      let res = substitute(res, '\c\<\(\(' . a:base . '.\{-}\>\)\|.\{-}\>\)', '\2', 'g')
-		    endif
-		    let res = substitute(res, ' \+', "\n", 'g')
+		    let res = []
+		    for m in split("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec")
+		      if m =~ '^' . a:base
+			call add(res, m)
+		      endif
+		    endfor
 		    return res
 		  endif
 		endfun
 		set completefunc=CompleteMonths
-<	Note that a substitute() function is used to reduce the list of
-	possible values and remove the ones that don't match the base.  The
-	part before the "\|" matches the base, the part after it is used
-	when there is no match.  The "\2" in the replacement is empty if the
-	part before the "\|" does not match.
+<
+	The same, but now pretending searching for matches is slow: >
+		fun! CompleteMonths(findstart, base)
+		  if a:findstart
+		    " locate the start of the word
+		    let line = getline('.')
+		    let start = col('.') - 1
+		    while start > 0 && line[start - 1] =~ '\a'
+		      let start -= 1
+		    endwhile
+		    return start
+		  else
+		    " find months matching with "a:base"
+		    for m in split("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec")
+		      if m =~ '^' . a:base
+			call complete_add(m)
+		      endif
+		      sleep 300m	" simulate searching for next match
+		      if complete_check()
+			break
+		      endif
+		    endfor
+		    return []
+		  endif
+		endfun
+		set completefunc=CompleteMonths
+<
 
 				*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
 'confirm' 'cf'		boolean (default off)
@@ -1942,9 +1992,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 								*cpo-\*
 		\	Backslash in a [] range in a search pattern is taken
 			literally, only "\]" is special  See |/[]|
-			   'l' included: "/[ \t]"  finds <Space>, '\' and 't'
-			   'l' excluded: "/[ \t]"  finds <Space> and <Tab>
-			Also see |cpo-\|.
+			   '\' included: "/[ \-]"  finds <Space>, '\' and '-'
+			   '\' excluded: "/[ \-]"  finds <Space> and '-'
+			Also see |cpo-l|.
 								*cpo-/*
 		/	When "%" is used as the replacement string in a |:s|
 			command, use the previous replacement string. |:s%|
@@ -2168,10 +2218,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- A directory starting with "./" (or ".\" for MS-DOS et al.) means to
 	  put the swap file relative to where the edited file is.  The leading
 	  "." is replaced with the path name of the edited file.
-	- For Unix and Win32, if a directory ends in two path separators, the
-	  swap file name will be built from the complete path to the file
-	  with all path separators substituted to percent '%' signs.  This will
-	  ensure file name uniqueness in the preserve directory.
+	- For Unix and Win32, if a directory ends in two path separators "//"
+	  or "\\", the swap file name will be built from the complete path to
+	  the file with all path separators substituted to percent '%' signs.
+	  This will ensure file name uniqueness in the preserve directory.
 	- Spaces after the comma are ignored, other spaces are considered part
 	  of the directory name.  To have a space at the start of a directory
 	  name, precede it with a backslash.
@@ -2283,8 +2333,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	setting 'encoding' to one of these values instead of utf-8 only has
 	effect for encoding used for files when 'fileencoding' is empty.
 
-	 When 'encoding' is set to a Unicode encoding, and 'fileencodings' was
-	 not set yet, the default for 'fileencodings' is changed.
+	When 'encoding' is set to a Unicode encoding, and 'fileencodings' was
+	not set yet, the default for 'fileencodings' is changed.
 
 			*'endofline'* *'eol'* *'noendofline'* *'noeol'*
 'endofline' 'eol'	boolean	(default on)
@@ -3690,9 +3740,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Use CTRL-O to execute one Normal mode command |i_CTRL-O|).  When
 	  this is a mapping, it is executed as if 'insertmode' was off.
 	  Normal mode remains active until the mapping is finished.
-								*i_CTRL-L*
 	- Use CTRL-L to execute a number of Normal mode commands, then use
-	  <Esc> to get back to Insert mode.
+	  <Esc> to get back to Insert mode.  Note that CTRL-L moves the cursor
+	  left, like <Esc> does when 'insertmode' isn't set.  |i_CTRL-L|
 
 	These items change when 'insertmode' is set:
 	- when starting to edit of a file, Vim goes to Insert mode.
@@ -4242,6 +4292,45 @@ A jump table for the options with a short description can be found at |Q_op|.
 	generated from a list of items, e.g., the Buffers menu.  Changing this
 	option has no direct effect, the menu must be refreshed first.
 
+						*'mkspellmem'* *'msm'*
+'mkspellmem' 'msm'	string	(default "460000,2000,500")
+			global
+			{not in Vi}
+			{not available when compiled without the |+syntax|
+			feature}
+	Parameters for |:mkspell|.  This tunes when to start compressing the
+	word tree.  Compression can be slow when there are many words, but
+	it's needed to avoid running out of memory.  The amount of memory used
+	per word depends very much on how similar the words are, that's why
+	this tuning is complicated.
+
+	There are three numbers, separated by commas:
+		{start},{inc},{added}
+
+	For most languages the uncompressed word tree fits in memory.  {start}
+	gives the amount of memory in Kbyte that can be used before any
+	compression is done.  It should be a bit smaller than the amount of
+	memory that is available to Vim.
+
+	When going over the {start} limit the {inc} number specifies the
+	amount of memory in Kbyte that can be allocated before another
+	compression is done.  A low number means compression is done after
+	less words are added, which is slow.  A high number means more memory
+	will be allocated.
+
+	After doing compression, {added} times 1024 words can be added before
+	the {inc} limit is ignored and compression is done when any extra
+	amount of memory is needed.  A low number means there is a smaller
+	chance of hitting the {inc} limit, less memory is used but it's
+	slower.
+
+	The languages for which these numbers are important are Italian and
+	Hungarian.  The default works for when you have about 512 Mbyte.  If
+	you have 1 Gbyte you could use: >
+		:set mkspellmem=900000,3000,800
+<	If you have less than 512 Mbyte |:mkspell| may fail for some
+	languages, no matter what you set 'mkspellmem' to.
+
 				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
 'modeline' 'ml'		boolean	(Vim default: on, Vi default: off)
 			local to buffer
@@ -4505,6 +4594,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The minimum value is 1, the maximum value is 10.
 	NOTE: 'numberwidth' is reset to 8 when 'compatible' is set.
 
+						*'occultfunc'* *'ofu'*
+'occultfunc' 'ofu'	string	(default: empty)
+			local to buffer
+			{not in Vi}
+			{not available when compiled without the +eval
+			or +insert_expand feature}
+	This option specifies a function to be used for CTRL-X CTRL-O
+	completion. |i_CTRL-X_CTRL-O|
+
+	For the use of the function see 'completefunc'.
+
+
 					*'osfiletype'* *'oft'* *E366*
 'osfiletype' 'oft'	string (RISC-OS default: "Text",
 				others default: "")
@@ -5654,11 +5755,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	Pattern to locate the end of a sentence.  The following word will be
 	checked to start with a capital letter.  If not then it is highlighted
-	with SpellCap |hl-SpellCap|.
+	with SpellCap |hl-SpellCap| (unless the word is also badly spelled).
 	When this check is not wanted make this option empty.
 	Only used when 'spell' is set.
 	Be careful with special characters, see |option-backslash| about
 	including spaces and backslashes.
+	To set this option automatically depending on the language, see
+	|set-spc-auto|.
 
 						*'spellfile'* *'spf'*
 'spellfile' 'spf'	string	(default empty)
@@ -5705,6 +5808,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	region by listing them: "en_us,en_ca" supports both US and Canadian
 	English, but not words specific for Australia, New Zealand or Great
 	Britain.
+							*E757*
 	As a special case the name of a .spl file can be given as-is.  The
 	first "_xx" in the name is removed and used as the region name
 	(_xx is an underscore, two letters and followed by a non-letter).
@@ -5715,6 +5819,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	files twice.
 	How the related spell files are found is explained here: |spell-load|.
 
+	After this option has been set successfully, Vim will source the files
+	"spell/LANG.vim" in 'runtimepath'.  "LANG" is the value of 'spelllang'
+	up to the first comma, dot or underscore.  See |set-spc-auto|.
+
+
 						*'spellsuggest'* *'sps'*
 'spellsuggest' 'sps'	string	(default "best")
 			global
@@ -5740,6 +5849,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			character inserts/deletes/swaps.  Works well for
 			simple typing mistakes.
 
+	{number}	The maximum number of suggestions listed for |z?|.
+			Not used for |spellsuggest()|.  The number of
+			suggestions is never more than the value of 'lines'
+			minus two.
+
 	file:{filename} Read file {filename}, which must have two columns,
 			separated by a slash.  The first column contains the
 			bad word, the second column the suggested good word.
@@ -7187,7 +7301,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 				   *'wrapscan'* *'ws'* *'nowrapscan'* *'nows'*
 'wrapscan' 'ws'		boolean	(default on)			*E384* *E385*
 			global
-	Searches wrap around the end of the file.
+	Searches wrap around the end of the file.  Also applies to |]s| and
+	|[s|, searching for spelling mistakes.
 
 						   *'write'* *'nowrite'*
 'write'			boolean	(default on)

runtime/doc/pattern.txt

@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0aa.  Last change: 2005 May 22
+*pattern.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 18
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -943,6 +943,10 @@ x	A single character, with no special meaning, matches itself
 	"\_[^ab]" matches the end-of-line and any character but "a" and "b".
 	This makes it Vi compatible: Without the "\_" or "\n" the collection
 	does not match an end-of-line.
+								*E769*
+	When the ']' is not there Vim will not give an error message but
+	assume no collection is used.  Useful to search for '['.  However, you
+	do get E769 for internal searching.
 
 	If the sequence begins with "^", it matches any single character NOT
 	in the collection: "[^xyz]" matches anything but 'x', 'y' and 'z'.

runtime/doc/pi_netrw.txt

@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 6.3.  Last change: Oct 08, 2004
+*pi_netrw.txt*  For Vim version 7.0.  Last change: Aug 15, 2005
 
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
@@ -10,20 +10,60 @@
 ==============================================================================
 0. Contents						*netrw-contents*
 
-1.  Netrw Reference.....................................|netrw-ref|
-2.  Network-Oriented File Transfer......................|netrw-xfer|
-3.  Activation..........................................|netrw-activate|
-4.  Transparent File Transfer...........................|netrw-transparent|
-5.  Ex Commands.........................................|netrw-ex|
-6.  Variables and Options...............................|netrw-var|
-7.  Directory Browser...................................|netrw-browse|
-8.  Problems and Fixes..................................|netrw-problems|
-9.  Debugging...........................................|netrw-debug|
-10. History.............................................|netrw-history|
-11. Credits.............................................|netrw-credits|
+1.  Netrw Reference......................................|netrw-ref|
+      CONTROLLING EXTERNAL APPLICTIONS...................|netrw-externapp|
+      READING............................................|netrw-read|
+      WRITING............................................|netrw-write|
+      DIRECTORY LISTING..................................|netrw-dirlist|
+      CHANGING THE USERID AND PASSWORD...................|netrw-chgup|
+      VARIABLES..........................................|netrw-variables|
+      PATHS..............................................|netrw-path|
+2.  Network-Oriented File Transfer.......................|netrw-xfer|
+      NETRC..............................................|netrw-netrc|
+      PASSWORD...........................................|netrw-passwd|
+3.  Activation...........................................|netrw-activate|
+4.  Transparent File Transfer............................|netrw-transparent|
+5.  Ex Commands..........................................|netrw-ex|
+6.  Variables and Options................................|netrw-var|
+7.  Directory Browser....................................|netrw-browse| {{{1
+      Maps...............................................|netrw-maps|
+      Exploring..........................................|netrw-explore-cmds|
+      Quick Reference Commands Table.....................|netrw-browse-cmds|
+      Netrw Browser Variables............................|netrw-browse-var|
+      Introduction To Directory Browsing.................|netrw-browse-intro|
+      Directory Exploring Commands.......................|netrw-explore|
+      Refreshing The Listing.............................|netrw-ctrl-l|
+      Going Up...........................................|netrw--|
+      Browsing...........................................|netrw-cr|
+      Long Vs Short Listing..............................|netrw-i|
+      Making A New Directory.............................|netrw-d|
+      Deleting Files Or Directories......................|netrw-delete|
+      Renaming Files Or Directories......................|netrw-move|
+      Hiding Files Or Directories........................|g:netrw-a|
+      Edit File Or Directory Hiding List.................|netrw-h|
+      Browsing With A Horizontally Split Window..........|netrw-o|
+      Preview Window.....................................|netrw-p|
+      Selecting Sorting Style............................|netrw-s|
+      Editing The Sorting Sequence.......................|netrw-S|
+      Reversing Sorting Order............................|netrw-r|
+      Changing To A Predecessor Directory................|netrw-u|
+      Changing To A Successor Directory..................|netrw-U|
+      Browsing With A Vertically Split Window............|netrw-v|
+      Customizing Browsing With A User Function..........|netrw-x|
+      Making The Browsing Directory The Current Directory|netrw-c|
+      Bookmarking A Directory............................|netrw-b|
+      Changing To A Bookmarked Directory.................|netrw-B|
+      Listing Bookmarks And History......................|netrw-q|
+      Improving Directory Browsing.......................|netrw-list-hack| }}}1
+8.  Problems and Fixes...................................|netrw-problems|
+9.  Debugging............................................|netrw-debug|
+10. History..............................................|netrw-history|
+11. Credits..............................................|netrw-credits|
 
-The functionality mentioned here is done via using |standard-plugin|
-techniques.  This plugin is only available if
+The Netrw plugin is generally sourced automatically as it is a
+|standard-plugin|.  That said, to make use of netrw, one must
+have plugins available which can be done with the following
+two lines in your <.vimrc>:
 
 	set nocp                    " 'compatible' is not set
 	filetype plugin on          " plugins are enabled
@@ -38,62 +78,51 @@ in your <.vimrc> file: >
 ==============================================================================
 1. Netrw Reference						*netrw-ref*
 
-    OPTIONS
-	let g:netrw_ftp =0 use ftp (default)		     (uid password)
-			=1 use alternate ftp method	(user uid password)
-	  If you're having trouble with ftp, try changing the value
-	  of this variable in your <.vimrc> to change methods
+CONTROLLING EXTERNAL APPLICTIONS			*netrw-externapp*
 
-	let g:netrw_ignorenetrc= 1
-	  If you have a <.netrc> file but it doesn't work and you
-	  want it ignored, then set this variable as shown.  Its mere
-	  existence is enough to cause <.netrc> to be ignored.
+	Protocol  Variable	    Default Value
+	--------  ----------------  -------------
+	   dav:    *g:netrw_dav_cmd*  = "cadaver"
+	 fetch:  *g:netrw_fetch_cmd*  = "fetch -o"
+	   ftp:    *g:netrw_ftp_cmd*  = "ftp"
+          http:   *g:netrw_http_cmd*  = "fetch -o"    if fetch is available
+	  http:    g:netrw_http_cmd   = "wget -q -O"  If wget  is available
+	   rcp:    *g:netrw_rcp_cmd*  = "rcp"
+	 rsync:  *g:netrw_rsync_cmd*  = "rsync -a"
+	   scp:    *g:netrw_scp_cmd*  = "scp -q"
+	  sftp:   *g:netrw_sftp_cmd*  = "sftp"
 
-	Controlling External Applications
-
-	 Protocol  Variable	     Default Value
-	 --------  ----------------  -------------
-	    dav:    g:netrw_dav_cmd  = "cadaver"
-	  fetch:  g:netrw_fetch_cmd  = "fetch -o"
-	    ftp:    g:netrw_ftp_cmd  = "ftp"
-           http:   g:netrw_http_cmd  = "fetch -o"    if fetch is available
-	   http:   g:netrw_http_cmd  = "wget -q -O"  If wget  is available
-	    rcp:    g:netrw_rcp_cmd  = "rcp"
-	  rsync:  g:netrw_rsync_cmd  = "rsync -a"
-	    scp:    g:netrw_scp_cmd  = "scp -q"
-	   sftp:   g:netrw_sftp_cmd  = "sftp"
-
-    READING					*netrw-read* *netrw-nread*
+READING						*netrw-read* *netrw-nread*
 	:Nread ?					give help
 	:Nread "machine:path"				uses rcp
-	:Nread "machine path"				uses ftp   with <.netrc>
+	:Nread "machine path"				uses ftp w/ <.netrc>
 	:Nread "machine id password path"		uses ftp
 	:Nread "dav://machine[:port]/path"		uses cadaver
 	:Nread "fetch://[user@]machine/path"		uses fetch
-	:Nread "ftp://[user@]machine[[:#]port]/path"	uses ftp   autodetects <.netrc>
+	:Nread "ftp://[user@]machine[[:#]port]/path"	uses ftp w/ <.netrc>
 	:Nread "http://[user@]machine/path"		uses http  uses wget
 	:Nread "rcp://[user@]machine/path"		uses rcp
 	:Nread "rsync://[user@]machine[:port]/path"	uses rsync
 	:Nread "scp://[user@]machine[[:#]port]/path"	uses scp
 	:Nread "sftp://[user@]machine/path"		uses sftp
 
-    WRITING					*netrw-write* *netrw-nwrite*
+WRITING						*netrw-write* *netrw-nwrite*
 	:Nwrite ?    					give help
 	:Nwrite "machine:path"				uses rcp
-	:Nwrite "machine path"				uses ftp   with <.netrc>
+	:Nwrite "machine path"				uses ftp w/ <.netrc>
 	:Nwrite "machine id password path"		uses ftp
 	:Nwrite "dav://machine[:port]/path"		uses cadaver
-	:Nwrite "ftp://[user@]machine[[:#]port]/path"	uses ftp   autodetects <.netrc>
+	:Nwrite "ftp://[user@]machine[[:#]port]/path"	uses ftp w/ <.netrc>
 	:Nwrite "rcp://[user@]machine/path"		uses rcp
 	:Nwrite "rsync://[user@]machine[:port]/path"	uses rsync
 	:Nwrite "scp://[user@]machine[[:#]port]/path"	uses scp
 	:Nwrite "sftp://[user@]machine/path"		uses sftp
 	http: not supported!
 
-    DIRECTORY LISTING
+DIRECTORY LISTING					*netrw-dirlist*
 	:Nread [protocol]://[user]@hostname/path/
 
-    USER AND PASSWORD CHANGING
+ CHANGING USERID AND PASSWORD				*netrw-chgup*
 	Attempts to use ftp will prompt you for a user-id and a password.
 	These will be saved in g:netrw_uid and g:netrw_passwd Subsequent uses
 	of ftp will re-use those.  If you need to use a different user id
@@ -104,49 +133,61 @@ in your <.vimrc> file: >
 	:call NetUserPass("uid")		-- prompts for password
 	:call NetUserPass("uid","password")	-- sets global uid and password
 
-    VARIABLES						*netrw-variables*
-	b:netrw_lastfile last file Network-read/written retained on
-			  a per-buffer basis		(supports plain :Nw )
-	s:netrw_line	  during Nw/NetWrite, holds current line   number
-	s:netrw_col	  during Nw/NetWrite, holds current column number
-			  s:netrw_line and s:netrw_col are used to
-			  restore the cursor position on writes
-	g:netrw_ftp	  if it doesn't exist, use default ftp
-			  =0 use default ftp		       (uid password)
-			  =1 use alternate ftp method	  (user uid password)
-	g:netrw_ftpmode   ="binary"				    (default)
-			  ="ascii"
-	g:netrw_uid	  (ftp) user-id,      retained on a per-session basis
-	g:netrw_passwd	  (ftp) password,     retained on a per-session basis
-	g:netrw_win95ftp  =1 if using Win95, will remove four trailing blank
-	                     lines that o/s's ftp "provides" on transfers
-			  =0 force normal ftp behavior (no trailing line
-			     removal)
-	g:netrw_cygwin	  =1 assume scp under windows is from cygwin
-	                     Also permits network browsing to use
-			     ls with time and size sorting
-							 (default if windows)
-			  =0 assume Windows' scp accepts windows-style paths
-			     Network browsing uses dir instead of ls
-			  This option is ignored if you're using unix
-	g:netrw_use_nt_rcp=0 don't use the rcp of WinNT, Win2000 and WinXP
-			  =1 use WinNT's rcp in binary mode         (default)
+VARIABLES						*netrw-variables*
+ *b:netrw_lastfile*	last file Network-read/written retained on a per-buffer
+			basis		(supports plain :Nw )
 
-    PATHS							*netrw-path*
+ *s:netrw_line*		during :Nw/NetWrite, holds current line number
+ *s:netrw_col*		during :Nw/NetWrite, holds current column number
+			s:netrw_line and s:netrw_col are used to
+			restore the cursor position on writes
 
-	Paths to files are generally user-directory relative for most protocols.
-	It is possible that some protocol will make paths relative to some
-	associated directory, however.
+ *g:netrw_ftp*		if it doesn't exist, use default ftp
+			=0 use default ftp		       (uid password)
+			=1 use alternate ftp method	  (user uid password)
+			If you're having trouble with ftp, try changing the
+			value of this variable to see if the alternate ftp
+			method works for your setup.
 
-		example:  vim scp://user@host/somefile
-		example:  vim scp://user@host/subdir1/subdir2/somefile
-	
-	where "somefile" is the "user"'s home directory.  If you wish to get a
-	file using root-relative paths, use the full path:
+ *g:netrw_ftpmode*	="binary"				    (default)
+			="ascii"
 
-		example:  vim scp://user@host//somefile
-		example:  vim scp://user@host//subdir1/subdir2/somefile
+ *g:netrw_ignorenetrc*	=0 (default)
+ 			=1 If you have a <.netrc> file but it doesn't work and
+			   you want it ignored, then set this variable as shown.
 
+ *g:netrw_uid*		(ftp) user-id,      retained on a per-session basis
+ *g:netrw_passwd*	(ftp) password,     retained on a per-session basis
+
+ *g:netrw_win95ftp*	=1 if using Win95, will remove four trailing blank
+			   lines that o/s's ftp "provides" on transfers
+			=0 force normal ftp behavior (no trailing line removal)
+
+ *g:netrw_cygwin*	=1 assume scp under windows is from cygwin. Also
+			   permits network browsing to use ls with time and
+			   size sorting (default if windows)
+			=0 assume Windows' scp accepts windows-style paths
+			   Network browsing uses dir instead of ls
+			This option is ignored if you're using unix
+
+ *g:netrw_use_nt_rcp*	=0 don't use the rcp of WinNT, Win2000 and WinXP
+			=1 use WinNT's rcp in binary mode         (default)
+
+PATHS								*netrw-path*
+
+Paths to files are generally user-directory relative for most protocols.
+It is possible that some protocol will make paths relative to some
+associated directory, however.
+>
+	example:  vim scp://user@host/somefile
+	example:  vim scp://user@host/subdir1/subdir2/somefile
+<
+where "somefile" is the "user"'s home directory.  If you wish to get a
+file using root-relative paths, use the full path:
+>
+	example:  vim scp://user@host//somefile
+	example:  vim scp://user@host//subdir1/subdir2/somefile
+<
 
 ==============================================================================
 2. Network-Oriented File Transfer				*netrw-xfer*
@@ -177,16 +218,16 @@ by setting a variable (ex. scp uses the variable g:netrw_scp_cmd,
 which is defaulted to "scp -q").
 
 Ftp, an old protocol, seems to be blessed by numerous implementations.
-Unfortunately, some implementations are noisy (i.e., add junk to the end
+Unfortunately, some implementations are noisy (ie., add junk to the end
 of the file).  Thus, concerned users may decide to write a NetReadFixup()
 function that will clean up after reading with their ftp.  Some Unix systems
-(i.e., FreeBSD) provide a utility called "fetch" which uses the ftp protocol
+(ie., FreeBSD) provide a utility called "fetch" which uses the ftp protocol
 but is not noisy and more convenient, actually, for <netrw.vim> to use.
 Consequently, if "fetch" is executable, it will be used to do reads for
 ftp://... (and http://...) .  See |netrw-var| for more about this.
 
 For rcp, scp, sftp, and http, one may use network-oriented file transfers
-transparently; i.e.
+transparently; ie.
 >
 	vim rcp://[user@]machine/path
 	vim scp://[user@]machine/path
@@ -198,7 +239,7 @@ that file.  Your ftp must be able to use the <.netrc> file on its own, however.
 	vim ftp://[user@]machine[[:#]portnumber]/path
 <
 However, ftp will often need to query the user for the userid and password.
-The latter will be done "silently"; i.e. asterisks will show up instead of
+The latter will be done "silently"; ie. asterisks will show up instead of
 the actually-typed-in password.  Netrw will retain the userid and password
 for subsequent read/writes from the most recent transfer so subsequent
 transfers (read/write) to or from that machine will take place without
@@ -350,6 +391,9 @@ additional commands available.
 		effectively remove the user-id and password by using ""
 		strings.
 
+:NetrwSettings  This command is desribed in |netrw-settings| -- used to
+                display netrw settings and change netrw behavior
+
 
 ==============================================================================
 6. Variables and Options       			*netrw-options* *netrw-var*
@@ -482,7 +526,7 @@ To handle the SSL certificate dialog for untrusted servers, one may pull
 down the certificate and place it into /usr/ssl/cert.pem.  This operation
 renders the server treatment as "trusted".
 
-							 	*netrw-fixup*
+					 	*netrw-fixup* *netreadfixup*
 If your ftp for whatever reason generates unwanted lines (such as AUTH
 messages) you may write a NetReadFixup(tmpfile) function:
 >
@@ -521,30 +565,41 @@ from <netrw.vim> itself:
 
 ==============================================================================
 7. Directory Browser	*netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
-     ?..........Help....................................|netrw-help|
-     <cr>.......Browsing................................|netrw-cr|
-     <del>......Deleting Files or Directories...........|netrw-delete|
-     -..........Going Up................................|netrw--|
-     a..........Hiding Files or Directories.............|netrw-a|
-     b..........Bookmarking a Directory.................|netrw-b|
-     B..........Changing to a Bookmarked Directory......|netrw-B|
-     c..........Make Browsing Directory The Current Dir.|netrw-c|
-     d..........Make A New Directory....................|netrw-d|
-     D..........Deleting Files or Directories...........|netrw-D|
-     <c-h>......Edit File/Directory Hiding List.........|netrw-h|
-     i..........Long Listing............................|netrw-i|
-     <c-l>......Refreshing the Listing..................|netrw-ctrl-l|
-     o..........Browsing with a Horizontal Split........|netrw-o|
-     p..........Preview Window..........................|netrw-p|
-     q..........Listing Bookmarks and History...........|netrw-q|
-     r..........Reversing Sorting Order.................|netrw-r|
-     R..........Renaming Files or Directories...........|netrw-R|
-     s..........Selecting Sorting Style.................|netrw-s|
-     S..........Editing the Sorting Sequence............|netrw-S|
-     u..........Changing to a Predecessor Directory.....|netrw-u|
-     U..........Changing to a Successor Directory.......|netrw-U|
-     v..........Browsing with a Vertical Split..........|netrw-v|
-     x..........Customizing Browsing....................|netrw-x|
+
+MAPS   								*netrw-maps*
+     ?................Help.......................................|netrw-help|
+     <cr>.............Browsing...................................|netrw-cr|
+     <del>............Deleting Files or Directories..............|netrw-delete|
+     -................Going Up...................................|netrw--|
+     a................Hiding Files or Directories................|netrw-a|
+     b................Bookmarking a Directory....................|netrw-b|
+     B................Changing to a Bookmarked Directory.........|netrw-B|
+     c................Make Browsing Directory The Current Dir....|netrw-c|
+     d................Make A New Directory.......................|netrw-d|
+     D................Deleting Files or Directories..............|netrw-D|
+     <c-h>............Edit File/Directory Hiding List............|netrw-h|
+     i................Long Listing...............................|netrw-i|
+     <c-l>............Refreshing the Listing.....................|netrw-ctrl-l|
+     o................Browsing with a Horizontal Split...........|netrw-o|
+     p................Preview Window.............................|netrw-p|
+     q................Listing Bookmarks and History..............|netrw-q|
+     r................Reversing Sorting Order....................|netrw-r|
+     R................Renaming Files or Directories..............|netrw-R|
+     s................Selecting Sorting Style....................|netrw-s|
+     S................Editing the Sorting Sequence...............|netrw-S|
+     u................Changing to a Predecessor Directory........|netrw-u|
+     U................Changing to a Successor Directory..........|netrw-U|
+     v................Browsing with a Vertical Split.............|netrw-v|
+     x................Customizing Browsing.......................|netrw-x|
+
+    COMMANDS						*netrw-explore-cmds*
+     :Explore[!]  [dir] Explore directory of current file........|netrw-explore|
+     :Sexplore[!] [dir] Split & Explore directory ...............|netrw-explore|
+     :Hexplore[!] [dir] Horizontal Split & Explore...............|netrw-explore|
+     :Vexplore[!] [dir] Vertical Split & Explore.................|netrw-explore|
+     :Pexplore[!] [dir] Vertical Split & Explore.................|netrw-explore|
+     :Nexplore[!] [dir] Vertical Split & Explore.................|netrw-explore|
+     :NetrwSettings.............................................|netrw-settings|
 
 QUICK REFERENCE COMMANDS TABLE     			*netrw-browse-cmds*
 >
@@ -567,6 +622,7 @@ QUICK REFERENCE COMMANDS TABLE     			*netrw-browse-cmds*
 	 <c-l>	Causes Netrw to refresh the directory listing
 	   o	Enter the file/directory under the cursor in a new browser
 	   	window.  A horizontal split is used.
+	   p	Preview the file
 	   r	Reverse sorting order
 	   s	Select sorting style: by name, time, or file size
 	   v	Enter the file/directory under the cursor in a new browser
@@ -575,57 +631,104 @@ QUICK REFERENCE COMMANDS TABLE     			*netrw-browse-cmds*
 
 NETRW BROWSER VARIABLES					*netrw-browse-var*
 >
-	---				-----------
-	Var				Explanation
-	---				-----------
-<	g:netrw_alto			change from above splitting to
-					below splitting by setting this
-					variable (see |netrw-o|)
-	g:netrw_altv			change from left splitting to
-					right splitting by setting this
-					variable (see |netrw-v|)
-	g:netrw_ftp_browse_reject	ftp can produce a number of errors
-					and warnings that can show up as
-					"directories" and "files" in the
-					listing.  This pattern is used to
-					remove such embedded messages.
-	g:netrw_keepdir			=1 (default) keep current directory
-					immune from the browsing directory.
-					=0 keep the current directory the
-					same as the browsing directory.
-					The browsing directory is contained in
-					b:netrw_curdir
-	g:netrw_list_cmd		command for listing remote directories
-	g:netrw_longlist		if =1, then long listing will be default
-	g:netrw_ftp_list_cmd		options for passing along to ftp for
-					directory listing.  Defaults:
-					 unix or g:netrw_cygwin set: : "ls -lF"
-					 otherwise                     "dir"
-	g:netrw_list_hide		comma separated list of patterns for
-					hiding files
-	g:netrw_local_mkdir		command for making a local directory
-	g:netrw_local_rmdir		remove directory command (rmdir)
-	g:netrw_local_rename		rename file/directory command
-					unix-default: rm    win32-default: ren
-	g:netrw_maxfilenamelen		=32 by default, selected so as to make
-					long listings fit on 80 column displays.
-					If your screen is wider, and you have
-					file/directory names longer than 32 bytes,
-					you may set this option to keep listings
-					columnar.
-	g:netrw_mkdir_cmd		command for making a remote directory
-	g:netrw_rm_cmd			command for removing files
-	g:netrw_rmdir_cmd		command for removing directories
-	g:netrw_rmf_cmd			command for removing softlinks
-	g:netrw_hide			if true, the hiding list is used
-	g:netrw_sort_by			sort by "name", "time", or "size"
-	g:netrw_sort_direction		sorting direction: "normal" or "reverse"
-	g:netrw_sort_sequence		when sorting by name, first sort by the
-					comma-separated pattern sequence
-	g:netrw_timefmt			specify format string to strftime() (%c)
-	g:netrw_winsize			specify initial size of new o/v windows
+   ---				-----------
+   Var				Explanation
+   ---				-----------
+< *g:netrw_alto*		change from above splitting to below splitting
+				by setting this variable (see |netrw-o|)
+				 default: =0
 
-INTRODUCTION TO DIRECTORY BROWSING			*file-explorer*
+  *g:netrw_altv*		change from left splitting to right splitting
+ 				by setting this variable (see |netrw-v|)
+				 default: =0
+
+  *g:netrw_ftp_browse_reject*	ftp can produce a number of errors and warnings
+				that can show up as "directories" and "files"
+				in the listing.  This pattern is used to
+				remove such embedded messages.  By default its
+				value is:
+				 '^total\s\+\d\+$\|
+				 ^Trying\s\+\d\+.*$\|
+				 ^KERBEROS_V\d rejected\|
+				 ^Security extensions not\|
+				 No such file\|
+				 : connect to address [0-9a-fA-F:]*
+				 : No route to host$'
+
+  *g:netrw_ssh_browse_reject*	ssh can sometimes produce unwanted lines,
+				messages, banners, and whatnot that one doesn't
+				want masquerading as "directories" and "files".
+				Use this pattern to remove such embedded
+				messages.  By default its value is:
+ 					 '^total\s\+\d\+$'
+
+  *g:netrw_keepdir*		=1 (default) keep current directory immune from
+				   the browsing directory.
+				=0 keep the current directory the same as the
+				   browsing directory.
+				The current browsing directory is contained in
+				b:netrw_curdir
+
+  *g:netrw_list_cmd*		command for listing remote directories
+				 default: (if ssh is executable)
+				          "ssh HOSTNAME ls -FLa"
+
+  *g:netrw_longlist*		if =1, then long listing will be default
+
+  *g:netrw_ftp_list_cmd*	options for passing along to ftp for directory
+				listing.  Defaults:
+				 unix or g:netrw_cygwin set: : "ls -lF"
+				 otherwise                     "dir"
+
+  *g:netrw_list_hide*		comma separated pattern list for hiding files
+				 default: ""
+
+  *g:netrw_local_mkdir*		command for making a local directory
+				 default: "ssh HOSTNAME mkdir"
+
+  *g:netrw_local_rmdir*		remove directory command (rmdir)
+				 default: "rmdir"
+
+  *g:netrw_maxfilenamelen*	=32 by default, selected so as to make long
+				    listings fit on 80 column displays.
+				If your screen is wider, and you have file
+				or directory names longer than 32 bytes,
+				you may set this option to keep listings
+				columnar.
+
+  *g:netrw_mkdir_cmd*		command for making a remote directory
+				 default: "ssh HOSTNAME mkdir"
+
+  *g:netrw_rm_cmd*		command for removing files
+				 default: "ssh HOSTNAME rm"
+
+  *g:netrw_rmdir_cmd*		command for removing directories
+				 default: "ssh HOSTNAME rmdir"
+
+  *g:netrw_rmf_cmd*		 command for removing softlinks
+				 default: "ssh HOSTNAME rm -f"
+
+  *g:netrw_hide*			if true, the hiding list is used
+				 default: =0
+
+  *g:netrw_sort_by*		sort by "name", "time", or "size"
+				 default: "name"
+
+  *g:netrw_sort_direction*	sorting direction: "normal" or "reverse"
+				 default: "normal"
+
+  *g:netrw_sort_sequence*	when sorting by name, first sort by the
+				comma-separated pattern sequence
+				 default: '[\/]$,*,\.bak$,\.o$,\.h$,
+				           \.info$,\.swp$,\.obj$'
+
+  *g:netrw_timefmt*		specify format string to strftime() (%c)
+				 default: "%c"
+
+  *g:netrw_winsize*		specify initial size of new o/v windows
+				 default: ""
+
+INTRODUCTION TO DIRECTORY BROWSING			*netrw-browse-intro*
 
 Netrw supports the browsing of directories on the local system and on remote
 hosts, including generating listing directories, entering directories, editing
@@ -647,6 +750,68 @@ trailing slash and it will be interpreted as a request to list a directory:
 If you'd like to avoid entering the password in for directory listings, scp,
 ssh interaction, etc, see |netrw-list-hack|.
 
+				*netrw-explore*  *netrw-pexplore*
+				*netrw-hexplore* *netrw-sexplore*
+DIRECTORY EXPLORING COMMANDS	*netrw-nexplore* *netrw-vexplore*
+
+     :Explore[!]   [dir]... Explore directory of current file       *:Explore*
+     :Sexplore[!]  [dir]... Split&Explore directory of current file *:Sexplore*
+     :Hexplore[!]  [dir]... Horizontal Split & Explore              *:Hexplore*
+     :Vexplore[!]  [dir]... Vertical   Split & Explore              *:Vexplore*
+
+     Used with :Explore **/pattern :
+     :Nexplore............. go to next matching file                *:Nexplore*
+     :Pexplore............. go to previous matching file            *:Pexplore*
+
+:Explore  will open the local-directory browser on the current file's
+          directory (or on directory [dir] if specified).  The window will be
+	  split only if the file has been modified, otherwise the browsing
+	  window will take over that window.  Normally the splitting is taken
+	  horizontally.
+:Explore! is like :Explore, but will use vertical splitting.
+:Sexplore will always split the window before invoking the local-directory
+          browser.  As with Explore, the splitting is normally done
+	  horizontally.
+:Sexplore! [dir] is like :Sexplore, but the splitting will be done vertically.
+:Hexplore  [dir] does an :Explore with |:belowright| horizontal splitting.
+:Hexplore! [dir] does an :Explore with |:aboveleft|  horizontal splitting.
+:Vexplore  [dir] does an :Explore with |:leftabove|  vertical splitting.
+:Vexplore! [dir] does an :Explore with |:rightbelow| vertical splitting.
+
+By default, these commands use the current file's directory.  However, one
+may explicitly provide a directory (path) to use.
+
+(Following needs v7.0 or later)			*netrw-starstar*
+When Explore, Sexplore, Hexplore, or Vexplore are used like
+>
+	:Explore **/filename_pattern
+<
+netrw will attempt to find a (sub)directory which matches the filename
+pattern.  Internally, it produces a list of files which match the pattern
+and their paths; to that extent it resembles the Unix operation:
+>
+	find $(pwd) -name "$1" -exec "echo" "{}" ";" 2> /dev/null
+<
+The directory display is updated to show the subdirectory containing a
+matching file.  One may then proceed to the next (or previous) matching files'
+directories by using Nexplore or Pexplore, respectively.  If your console or
+gui produces recognizable shift-up or shift-down sequences, then you'll likely
+find the following mappings convenient:
+
+	<s-down>  == Nexplore, and
+	<s-up>    == Pexplore.
+
+As an example, consider
+>
+	:Explore **/*.c
+	:Nexplore
+	:Nexplore
+	:Pexplore
+<
+The status line will show, on the right hand side of the status line, a
+message like "Match 3 of 20".
+
+
 REFRESHING THE LISTING					*netrw-ctrl-l*
 
 To refresh either a local or remote directory listing, press ctrl-l (<c-l>) or
@@ -659,7 +824,7 @@ GOING UP						*netrw--*
 To go up a directory, press - or his the <cr> when atop the ../ directory
 entry in the listing.
 
-Netrw will modify the command in *g:netrw_list_cmd* to perform the directory
+Netrw will modify the command in |g:netrw_list_cmd| to perform the directory
 listing operation.  By default the command is:
 
 	ssh HOSTNAME ls -FLa
@@ -677,6 +842,7 @@ Hitting the <cr> (the return key) will select the file or directory.
 Directories will themselves be listed, and files will be opened using the
 protocol given in the original read request.
 
+
 LONG VS SHORT LISTING						*netrw-i*
 
 The short listing format gives just the files' and directories' names.
@@ -694,6 +860,7 @@ new directory's name.  A bare <CR> at that point will abort the making of the
 directory.  Attempts to make a local directory that already exists (as either
 a file or a directory) will be detected, reported on, and ignored.
 
+
 DELETING FILES OR DIRECTORIES			*netrw-delete* *netrw-D*
 
 Deleting/removing files and directories involves moving the cursor to the
@@ -704,20 +871,17 @@ succeeding.  Netrw will ask for confirmation before doing the removal(s).
 You may select a range of lines with the "V" command (visual selection),
 and then pressing "D".
 
-							*g:netrw_rm_cmd*
 The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are used
 to control the attempts to remove files and directories.  The g:netrw_rm_cmd
 is used with files, and its default value is:
 
 	g:netrw_rm_cmd: ssh HOSTNAME rm
 
-							*g:netrw_rmdir_cmd*
 The g:netrw_rmdir_cmd variable is used to support the removal of directories.
 Its default value is:
 
 	g:netrw_rmdir_cmd: ssh HOSTNAME rmdir
 
-							*g:netrw_rmf_cmd*
 If removing a directory fails with g:netrw_rmdir_cmd, netrw then will attempt
 to remove it again using the g:netrw_rmf_cmd variable.  Its default value is:
 
@@ -740,15 +904,22 @@ One may rename a block of files and directories by selecting them with
 the V (|linewise-visual|).
 
 
-HIDING FILES OR DIRECTORIES		*netrw-a* *g:netrw_list_hide*
+HIDING FILES OR DIRECTORIES				*g:netrw-a* *netrw-a*
 
 Netrw's browsing facility allows one to use the hiding list in one of
 three ways: ignore it, hide files which match, and show only those files
-which match.  The g:netrw_list_hide variable holds a comma delimited list
-of patterns (ex. \.obj) which specify the hiding list. (also see |netrw-h|)
+which match.  The "a" map allows the user to cycle about these three ways.
+
+The g:netrw_list_hide variable holds a comma delimited list of patterns
+(ex. \.obj) which specify the hiding list. (also see |netrw-h|)  To
+set the hiding list, use the <c-h> map.  As an example, to hide files
+which begin with a ".", one may use the <c-h> map to set the hiding
+list to '^\..*' (or one may put  let g:netrw_list_hide= '^\..*' in
+one's <.vimrc>).  One may then use the "a" key to show all files,
+hide matching files, or to show only the matching files.
 
 
-EDIT FILE OR DIRECTORY HIDING LIST				*netrw-h*
+EDIT FILE OR DIRECTORY HIDING LIST		*netrw-h* *netrw-edithide*
 
 The "<ctrl-h>" map brings up a requestor allowing the user to change the
 file/directory hiding list.  The hiding list consists of one or more patterns
@@ -756,7 +927,7 @@ delimited by commas.  Files and/or directories satisfying these patterns will
 either be hidden (ie. not shown) or be the only ones displayed (see |netrw-a|).
 
 
-BROWSING WITH A HORIZONTALLY SPLIT WINDOW			*netrw-o*
+BROWSING WITH A HORIZONTALLY SPLIT WINDOW		*netrw-o* *netrw-horiz*
 
 Normally one enters a file or directory using the <cr>.  However, the "o" map
 allows one to open a new window to hold the new directory listing or file.  A
@@ -770,27 +941,28 @@ with the new window and cursor at the bottom, have
 
 in your <.vimrc>.
 
-PREVIEW WINDOW
+
+PREVIEW WINDOW					*netrw-p* *netrw-preview*
 
 One may use a preview window (currently only for local browsing) by using
 the "p" key when the cursor is atop the desired filename to be previewed.
 
 
-SELECTING SORTING STYLE						*netrw-s*
+SELECTING SORTING STYLE				*netrw-s* *netrw-sort*
 
 One may select the sorting style by name, time, or (file) size.  The
-"s" map allows one to circulate among the three choices; the directory
+"s" map allows one to circulate amongst the three choices; the directory
 listing will automatically be refreshed to reflect the selected style.
 
 
-EDITING THE SORTING SEQUENCE					*netrw-S*
+EDITING THE SORTING SEQUENCE		*netrw-S* *netrw-sortsequence*
 
 When "Sorted by" is name, one may specify priority via the sorting
 sequence (g:netrw_sort_sequence).  The sorting sequence typically
 prioritizes the name-listing by suffix, although any pattern will do.
 Patterns are delimited by commas.  The default sorting sequence is:
 >
-	/$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$
+	[\/]$,*,\.bak$,\.o$,\.h$,\.info$,\.swp$,\.obj$
 <
 The lone * is where all filenames not covered by one of the other
 patterns will end up.  One may change the sorting sequence by modifying
@@ -798,13 +970,13 @@ the g:netrw_sort_sequence variable (either manually or in your <.vimrc>)
 or by using the "S" map.
 
 
-REVERSING SORTING ORDER						*netrw-r*
+REVERSING SORTING ORDER			*netrw-r* *netrw-reverse*
 
 One may toggle between normal and reverse sorting order by pressing the
 "r" key.
 
 
-CHANGING TO A PREDECESSOR DIRECTORY				*netrw-u*
+CHANGING TO A PREDECESSOR DIRECTORY		*netrw-u* *netrw-updir*
 
 Every time you change to a new directory (new for the current session),
 netrw will save the directory in a recently-visited directory history
@@ -813,7 +985,7 @@ list (unless g:netrw_dirhistmax is zero; by default, its ten).  With the
 the opposite, see |netrw-U|.
 
 
-CHANGING TO A SUCCESSOR DIRECTORY				*netrw-U*
+CHANGING TO A SUCCESSOR DIRECTORY		*netrw-U* *netrw-downdir*
 
 With the "U" map, one can change to a later directory (successor).
 This map is the opposite of the "u" map. (see |netrw-u|)  Use the
@@ -835,15 +1007,23 @@ with the new window and cursor at the right, have
 in your <.vimrc>.
 
 
-CUSTOMIZING BROWSING WITH A USER FUNCTION			*netrw-x*
+CUSTOMIZING BROWSING WITH A USER FUNCTION		*netrw-x* *netrw-handler*
 
 One may "enter" a file with a special handler, thereby firing up a browser or
-other application, for example, on a file by hitting the "x" key.  Presumably
-one could write handlers that would start OpenOffice programs (oowriter), etc,
-based on the file's extension coupled with the user's hitting the "x" key atop
-the file.
+other application, for example, on a file by hitting the "x" key.  The special
+handler varies:
 
-The Netrw executor applies a user-defined function to a file, based on its
+  * for Windows 32 or 64, the url and FileProtocolHandler dlls are used.  
+  * for KDE (with kfmclient): kfmclient is used.
+  * for Gnome (with gnome-open): gnome-open is used.
+  * otherwise the NetrwFileHandler plugin is used.
+
+The file's suffix is used by these various approaches to determine an
+appropriate application to use to "handle" these files.  Such things
+as OpenOffice (*.sfx), visualization (*.jpg, *.gif, etc), and PostScript
+(*.ps, *.eps) can be handled.
+
+The NetrwFileHandler applies a user-defined function to a file, based on its
 extension.  Of course, the handler function must exist for it to be called!
 >
  Ex. mypgm.html   x ->
@@ -852,6 +1032,11 @@ extension.  Of course, the handler function must exist for it to be called!
 See the <plugin/NetrwFileHandlers.vim> for an example of how to handle an html
 file with mozilla.
 
+One may write custom NetrwFileHandlers; please look at the
+plugin/NetrwFileHandlers.vim script for examples.  If its likely to be
+generally useful, please feel free to forward a copy to me for future
+inclusion in the distribution.
+
 
 MAKING THE BROWSING DIRECTORY THE CURRENT DIRECTORY	*netrw-c* *netrw-curdir*
 
@@ -867,10 +1052,10 @@ the current directory to the current browsing directory.
 
 BOOKMARKING A DIRECTORY		*netrw-b* *netrw-bookmark* *netrw-bookmarks*
 
-One may easily "bookmark" a directory by using
+One may easily "bookmark" a directory by using >
 
 	{cnt}b
-
+<
 Any count may be used.  One may use viminfo's "!" option to retain bookmarks
 between vim sessions.  See |netrw-B| for how to return to a bookmark and
 |netrw-q| for how to list them.
@@ -886,7 +1071,7 @@ Any count may be used to reference any of the bookmarks.  See |netrw-b|
 for how to bookmark a directory and |netrw-q| for how to list them.
 
 
-LISTING BOOKMARKS AND HISTORY					*netrw-q*
+LISTING BOOKMARKS AND HISTORY			*netrw-q* *netrw-listbookmark*
 
 Pressing "q" will list the bookmarked directories and directory traversal
 history (query). (see |netrw-b|, |netrw-B|, |netrw-u|, and |netrw-U|)
@@ -905,12 +1090,22 @@ It gives a tip for setting up password-less use of ssh and scp, and discusses
 the associated security issues.
 
 
+NETRW SETTINGS						*netrw-settings*
+
+With the NetrwSettings.vim plugin, >
+	:NetrwSettings
+will bring up a window with the many variables that netrw uses for its
+settings.  You may change any of their values; when you save the file,
+the settings therein will be used.  One may also press "?" on any of
+the lines for help on what each of the variables do.
+
+
 ==============================================================================
 8. Problems and Fixes						*netrw-problems*
 
 	(This section is likely to grow as I get feedback)
 	(also see |netrw-debug|)
-
+								*netrw-p1*
 	P1. I use windows 95, and my ftp dumps four blank lines at the
 	    end of every read.
 
@@ -918,9 +1113,8 @@ the associated security issues.
 		<.vimrc> file:
 
 			let g:netrw_win95ftp= 1
-		
-		
 
+								*netrw-p2*
 	P2. I use windows, and my network browsing with ftp doesn't sort by
 	    time or size
 
@@ -938,6 +1132,7 @@ the associated security issues.
 
 			let g:netrw_cygwin= 1
 
+								*netrw-p3*
 	P3. I tried rcp://user@host/ (or protocol other than ftp) and netrw
 	    used ssh!  That wasn't what I asked for...
 
@@ -946,6 +1141,7 @@ the associated security issues.
 		When it comes time to do download a file (not just a directory
 		listing), netrw will use the given protocol to do so.
 
+								*netrw-p4*
 	P4. I would like long listings to be the default.
 
 			let g:netrw_longlist=1
@@ -953,6 +1149,7 @@ the associated security issues.
 		Check out |netrw-browse-var| for more customizations that
 		you can set.
 
+								*netrw-p5*
 	P5. My times come up oddly in local browsing
 
 		Does your system's strftime() accept the "%c" to yield dates
@@ -961,19 +1158,22 @@ the associated security issues.
 		your <.vimrc>:
 			let g:netrw_timefmt= "%X"  (where X is the option)
 
+								*netrw-p6*
 	P6. I want my current directory to track my browsing.
 	    How do I do that?
 
 	    	let g:netrw_keepdir= 0
-	
+
 
 ==============================================================================
 9. Debugging						*netrw-debug*
 
 The <netrw.vim> script is typically available as:
-
+>
 	/usr/local/share/vim/vim6x/plugin/netrw.vim
-
+< -or- >
+	/usr/local/share/vim/vim7x/plugin/netrw.vim
+<
 which is loaded automatically at startup (assuming :set nocp).
 
 	1. Get the <Decho.vim> script, available as:
@@ -984,7 +1184,7 @@ which is loaded automatically at startup (assuming :set nocp).
 		http://vim.sourceforge.net/scripts/script.php?script_id=120
 
 	   and put it into your local plugin directory.
-	
+
 	2. <Decho.vim> itself needs the <cecutil.vim> script, so you'll need
 	   to put it into your .vim/plugin, too.  You may obtain it from:
 
@@ -1017,6 +1217,69 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 10. History						*netrw-history*
 
+	v64: * Browser functions now use NetOptionSave/Restore; in particular,
+	       netrw now works around the report setting
+	     * Bugfix - browsing a "/" directory (Unix) yielded buffers 
+	       named "[Scratch]" instead of "/"
+	     * Bugfix - remote browsing with ftp was omitting the ./ and ../
+	v63: * netrw now takes advantage of autoload (and requires 7.0)
+	     * Bugfix - using r (to reverse sort) working again
+	v62: * Bugfix - spaces allowed again in directory names with
+	       g:netrw_keepdir=0.  In fact, I've tested netrw (again)
+	       with most ANSI punctuation marks for directory names.
+	     * Bugfix - NetrwSettings gave errors when g:netrw_silent
+	       had not be set.
+	v61: * document upgrade -- netrw variable-based settings all should
+	       have tags.  Supports NetrwSettings command.
+	     * several important variables are window-oriented.  Netrw has
+	       to transfer these across a window split.  See s:BufWinVars()
+	       and s:UseBufWinVars().
+	v60: * when using the i map to switch between long and short listings,
+	       netrw will now keep cursor on same line
+	     * "Match # of #" now uses status line
+	     * :Explore **/*.c  will now work from a non-netrw-browser window
+	     * :Explore **/patterns can now be run in separate browser windows
+	     * active banner (hit <cr> will cause various things to happen)
+	v59: * bugfix -- another keepalt work-around installed (for vim6.3)
+	     * "Match # of #" for Explore **/pattern matches
+	v58: * Explore and relatives can now handle **/somefilepattern (v7)
+	     * Nexplore and Pexplore introduced (v7).  shift-down and shift-up
+	       cursor keys will invoke Nexplore and Pexplore, respectively.
+	     * bug fixed with o and v
+	     * autochdir only worked around for vim when it has been
+	       compiled with either |+netbeans_intg| or |+sun_workshop|
+	     * Under Windows, all directories and files were being preceded
+	       with a "/" when local browsing.  Fixed.
+	     * When: syntax highlighting is off, laststatus=2, and remote
+	       browsing is used, sometimes the laststatus highlighting
+	       bleeds into the entire display.  Work around - do an extra
+	       redraw in that case.
+	     * Bugfix: when g:netrw_keepdir=0, due to re-use of buffers,
+	       netrw didn't change the directory when it should've
+	     * Bugfix: D and R commands work again
+	v57: * Explore and relatives can now handle RO files
+	     * reverse sort restored with vim7's sort command
+	     * g:netrw_keepdir now being used to keep the current directory
+	       unchanged as intended (sense change)
+	     * vim 6.3 still supported
+	v56: * LocalBrowse now saves autochdir setting, unsets it, and
+	       restores it before returning.
+	     * using vim's rename() instead of system + local_rename variable
+	     * avoids changing directory when g:netrw_keepdir is false
+	v55: * -bar used with :Explore :Sexplore etc to allow multiple
+	       commands to be separated by |s
+	     * browser listings now use the "nowrap" option
+	     * browser: some unuseful error messages now suppressed
+	v54: * For backwards compatibility, Explore and Sexplore have been
+	       implemented.  In addition, Hexplore and Vexplore commands
+	       are available, too.
+	     * <amatch> used instead of <afile> in the transparency
+	       support (BufReadCmd, FileReadCmd, FileWriteCmd)
+	     * ***netrw*** prepended to various error messages netrw may emit
+	     * g:netrw_port used instead of b:netrw_port for scp
+	     * any leading [:#] is removed from port numbers
+	v53: * backslashes as well as slashes placed in various patterns
+	       (ex. g:netrw_sort_sequence) to better support Windows
 	v52: * nonumber'ing now set for browsing buffers
 	     * when the hiding list hid all files, error messages ensued. Fixed
 	     * when browsing, swf is set, but directory is not set, when netrw
@@ -1120,4 +1383,4 @@ which is loaded automatically at startup (assuming :set nocp).
 	Doug Claar		-- modifications to test for success with ftp operation
 
 ==============================================================================
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:ft=help:norl:fdm=marker

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 27
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -631,15 +631,13 @@ Basic items
 	%%		the single '%' character
 	%s		search text (finds a string)
 
-The "%f" conversion depends on the current 'isfname' setting.  "~/" is
+The "%f" conversion may depend on the current 'isfname' setting.  "~/" is
 expanded to the home directory and environment variables are expanded.
 
-The "%f" and "%m" conversions have to detect the end of the string.  They
-should be followed by a character that cannot be in the string.  Everything
-up to that character is included in the string.  But when the next character
-is a '%' or a backslash, "%f" will look for any 'isfname' character and "%m"
-finds anything.  If the "%f" or "%m" is at the end, everything up to the end
-of the line is included.
+The "%f" and "%m" conversions have to detect the end of the string.  This
+normally happens by matching following characters and items.  When nohting is
+following the rest of the line is matched.  If "%f" is followed by a '%' or a
+backslash, it will look for a sequence of 'isfname' characters.
 
 On MS-DOS, MS-Windows and OS/2 a leading "C:" will be included in "%f", even
 when using "%f:".  This means that a file name which is a single alphabetical

runtime/doc/quickref.txt

@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 27
+*quickref.txt*  For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -756,6 +756,7 @@ Short explanation of each option:		*option-list*
 |'maxmempattern'| |'mmp'|    maximum memory (in Kbyte) used for pattern search
 |'maxmemtot'|	  |'mmt'|    maximum memory (in Kbyte) used for all buffers
 |'menuitems'|	  |'mis'|    maximum number of items in a menu
+|'mkspellmem'|    |'msm'|    memory used before |:mkspell| compresses the tree
 |'modeline'|	  |'ml'|     recognize modelines at start or end of file
 |'modelines'|	  |'mls'|    number of lines checked for modelines
 |'modifiable'|	  |'ma'|     changes to the text are not possible
@@ -771,6 +772,7 @@ Short explanation of each option:		*option-list*
 |'nrformats'|	  |'nf'|     number formats recognized for CTRL-A command
 |'number'|	  |'nu'|     print the line number in front of each line
 |'numberwidth'|	  |'nuw'|    number of columns used for the line number
+|'occultfunc'|    |'ofu'|    function for filetype-specific completion
 |'osfiletype'|	  |'oft'|    operating system-specific filetype information
 |'paragraphs'|	  |'para'|   nroff macros that separate paragraphs
 |'paste'|		     allow pasting text

runtime/doc/spell.txt

@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 21
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -43,6 +43,7 @@ To search for the next misspelled word:
 							*]s* *E756*
 ]s			Move to next misspelled word after the cursor.
 			A count before the command can be used to repeat.
+			'wrapscan' applies.
 
 							*[s*
 [s			Like "]s" but search backwards, find the misspelled
@@ -63,13 +64,19 @@ To add words to your own word list:				*E764*
 
 							*zg*
 zg			Add word under the cursor as a good word to the first
-			name in 'spellfile'.  In Visual mode the selected
-			characters are added as a word (including white
-			space!).  If the word is explicitly marked as bad word
-			in another spell file the result is unpredictable.
-			A count may precede the command to indicate the entry
-			in 'spellfile' to be used.  A count of two uses the
-			second entry.
+			name in 'spellfile'.  A count may precede the command
+			to indicate the entry in 'spellfile' to be used.  A
+			count of two uses the second entry.
+
+			In Visual mode the selected characters are added as a
+			word (including white space!).
+			When the cursor is on text that is marked as badly
+			spelled then the marked text is used.
+			Otherwise the word under the cursor, separated by
+			non-word characters, is used.
+
+			If the word is explicitly marked as bad word in
+			another spell file the result is unpredictable.
 
 							*zG*
 zG			Like "zg" but add the word to the internal word list
@@ -124,34 +131,46 @@ z?			For the word under/after the cursor suggest correctly
 			e.g., when the word after it is bad.
 			The results are sorted on similarity to the word
 			under/after the cursor.
-			This may take a long time.  Hit CTRL-C when you are
+			This may take a long time.  Hit CTRL-C when you get
 			bored.
-			This does not work when there is a line break halfway
-			a bad word (e.g., "the the").
-			You can enter the number of your choice or press
-			<Enter> if you don't want to replace.  You can also
-			use the mouse to click on your choice (only works if
-			the mouse can be used in Normal mode and when there
-			are no line wraps).  Click on the first (header) line
-			to cancel.
-			If 'verbose' is non-zero a score will be displayed to
-			indicate the likeliness to the badly spelled word (the
-			higher the score the more different).
+
+			If the command is used without a count the
+			alternatives are listed and you can enter the number
+			of your choice or press <Enter> if you don't want to
+			replace.  You can also use the mouse to click on your
+			choice (only works if the mouse can be used in Normal
+			mode and when there are no line wraps).  Click on the
+			first line (the header) to cancel.
+
+			If a count is used that suggestion is used, without
+			prompting.  For example, "1z?" always takes the first
+			suggestion.
+
+			If 'verbose' is non-zero a score will be displayed
+			with the suggestions to indicate the likeliness to the
+			badly spelled word (the higher the score the more
+			different).
 			When a word was replaced the redo command "." will
 			repeat the word replacement.  This works like "ciw",
-			the good word and <Esc>.
+			the good word and <Esc>.  This does NOT work for Thai
+			and other languages without spaces between words.
 
 					*:spellr* *:spellrepall* *E752* *E753*
 :spellr[epall]		Repeat the replacement done by |z?| for all matches
 			with the replaced word in the current window.
 
+In Insert mode, when the cursor is after a badly spelled word, you can use
+CTRL-X s to find suggestions.  This works like Insert mode completion.  Use
+CTRL-N to use the next suggestion, CTRL-P to go back. |i_CTRL-X_s|
+
 The 'spellsuggest' option influences how the list of suggestions is generated
 and sorted.  See |'spellsuggest'|.
 
 The 'spellcapcheck' option is used to check the first word of a sentence
 starts with a capital.  This doesn't work for the first word in the file.
 When there is a line break right after a sentence the highlighting of the next
-line may be postponed.  Use |CTRL-L| when needed.
+line may be postponed.  Use |CTRL-L| when needed.  Also see |set-spc-auto| for
+how it can be set automatically when 'spelllang' is set.
 
 ==============================================================================
 2. Remarks on spell checking				*spell-remarks*
@@ -190,6 +209,31 @@ regions.  You can change that by manually editing the 'spellfile'.  See
 'spellfile' are only used when all entries in "spelllang" specify the same
 region (not counting files specified by their .spl name).
 
+							*spell-german*
+Specific exception: For German these special regions are used:
+	de		all German words accepted
+	de_de		old and new spelling
+	de_19		old spelling
+	de_20		new spelling
+	de_at		Austria
+	de_ch		Switzerland
+
+							*spell-russian*
+Specific exception: For Russian these special regions are used:
+	ru		all Russian words accepted
+	ru_ru		"IE" letter spelling
+	ru_yo		"YO" letter spelling
+
+							*spell-yiddish*
+Yiddish requires using "utf-8" encoding, because of the special characters
+used.  If you are using latin1 Vim will use transliterated (romanized) Yiddish
+instead.  If you want to use transliterated Yiddish with utf-8 use "yi-tr".
+In a table:
+	'encoding'	'spelllang'
+	utf-8		yi		Yiddish
+	latin1		yi		transliterated Yiddish
+	utf-8		yi-tr		transliterated Yiddish
+
 
 SPELL FILES						*spell-load*
 
@@ -315,6 +359,42 @@ find these functions useful:
     spellsuggest()	get list of spelling suggestions
     soundfold()		get the sound-a-like version of a word
 
+
+SETTING 'spellcapcheck' AUTOMATICALLY			*set-spc-auto*
+
+After the 'spelllang' option has been set successfully, Vim will source the
+files "spell/LANG.vim" in 'runtimepath'.  "LANG" is the value of 'spelllang'
+up to the first comma, dot or underscore.  This can be used to set options
+specifically for the language, especially 'spellcapcheck'.
+
+The distribution includes a few of these files.  Use this command to see what
+they do: >
+	:next $VIMRUNTIME/spell/*.vim
+
+Note that the default scripts don't set 'spellcapcheck' if it was changed from
+the default value.  This assumes the user prefers another value then.
+
+
+DOUBLE SCORING						*spell-double-scoring*
+
+The 'spellsuggest' option can be used to select "double" scoring.  This
+mechanism is based on the principle that there are two kinds of spelling
+mistakes:
+
+1. You know how to spell the word, but mistype something.  This results in a
+   small editing distance (character swapped/omitted/inserted) and possibly a
+   word that sounds completely different.
+
+2. You don't know how to spell the word and type something that sounds right.
+   The edit distance can be big but the word is similar after sound-folding.
+
+Since scores for these two mistakes will be very different we use a list
+for each and mix them.
+
+The sound-folding is slow and people that know the language won't make the
+second kind of mistakes.  Therefore 'spellsuggest' can be set to select the
+preferred method for scoring the suggestions.
+
 ==============================================================================
 3. Generating a spell file				*spell-mkspell*
 
@@ -369,12 +449,15 @@ then Vim will try to guess.
 			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|
+			they appear are used. |spell-REP| |spell-SAL|
 
 			This command uses a lot of memory, required to find
-			the optimal word tree (Polish requires a few hundred
-			Mbyte).  The final result will be much smaller.
+			the optimal word tree (Polish, Italian and Hungarian
+			require several hundred Mbyte).  The final result will
+			be much smaller, because compression is used.  To
+			avoid running out of memory compression will be done
+			now and then.  This can be tuned with the 'mkspellmem'
+			option.
 
 			After the spell file was written and it was being used
 			in a buffer it will be reloaded automatically.
@@ -389,6 +472,12 @@ then Vim will try to guess.
 			and producing an output file in the same directory
 			that has ".{enc}.spl" appended.
 
+Vim will report the number of duplicate words.  This might be a mistake in the
+list of words.  But sometimes it is used to have different prefixes and
+suffixes for the same basic word to avoid them combining (e.g. Czech uses
+this).  If you want Vim to report all duplicate words set the 'verbose'
+option.
+
 Since you might want to change a Myspell word list for use with Vim the
 following procedure is recommended:
 
@@ -412,6 +501,25 @@ When the Myspell files are updated you can merge the differences:
 4. Rename xx_YY.new.dic to xx_YY.orig.dic and xx_YY.new.aff to xx_YY.new.aff.
 
 
+SPELL FILE VERSIONS					*E770* *E771* *E772*
+
+Spell checking is a relatively new feature in Vim, thus it's possible that the
+.spl file format will be changed to support more languages.  Vim will check
+the validity of the spell file and report anything wrong.
+
+	E771: Old spell file, needs to be updated ~
+This spell file is older than your Vim.  You need to update the .spl file.
+
+	E772: Spell file is for newer version of Vim ~
+This means the spell file was made for a later version of Vim.  You need to
+update Vim.
+
+	E770: Unsupported section in spell file ~
+This means the spell file was made for a later version of Vim and contains a
+section that is required for the spell file to work.  In this case it's
+probably a good idea to upgrade your Vim.
+
+
 SPELL FILE DUMP
 
 If for some reason you want to check what words are supported by the currently
@@ -419,7 +527,7 @@ used spelling files, use this command:
 
 							*:spelldump* *:spelld*
 :spelld[ump]		Open a new window and fill it with all currently valid
-			words.
+			words.  Compound words are not included.
 			Note: For some languages the result may be enormous,
 			causing Vim to run out of memory.
 
@@ -507,15 +615,6 @@ used to modify the basic words to get the full word list.  This significantly
 reduces the number of words, especially for a language like Polish.  This is
 called affix compression.
 
-The format for the affix and word list files is mostly identical to what
-Myspell uses (the spell checker of Mozilla and OpenOffice.org).  A description
-can be found here:
-	http://lingucomponent.openoffice.org/affix.readme ~
-Note that affixes are case sensitive, this isn't obvious from the description.
-
-Vim supports a few extras.  Hopefully Myspell will support these too some day.
-See |spell-affix-vim|.
-
 The basic word list and the affix file are combined and turned into a binary
 spell file.  All the preprocessing has been done, thus this file loads fast.
 The binary spell file format is described in the source code (src/spell.c).
@@ -525,6 +624,19 @@ The preprocessing also allows us to take the Myspell language files and modify
 them before the Vim word list is made.  The tools for this can be found in the
 "src/spell" directory.
 
+The format for the affix and word list files is based on what Myspell uses
+(the spell checker of Mozilla and OpenOffice.org).  A description can be found
+here:
+	http://lingucomponent.openoffice.org/affix.readme ~
+Note that affixes are case sensitive, this isn't obvious from the description.
+
+Vim does not use the TRY item, it is ignored.  For making suggestions the
+possible characters in the words are used.
+
+Vim supports quite a few extras.  They are described below |spell-affix-vim|.
+Attempts have been made to keep this compatible with other spell checkers, so
+that the same files can be used.
+
 
 WORD LIST FORMAT				*spell-dic-format*
 
@@ -540,12 +652,17 @@ A very short example, with line numbers:
 	8	bedel/P
 	9	kado/1
 	10	cadeau/2
+	11	TCP,IP
 
 The first line contains the number of words.  Vim ignores it, but you do get
 an error message if it's not there.  *E760*
 
 What follows is one word per line.  There should be no white space before or
-after the word.
+after the word.  After the word there is an optional slash and flags.  Most of
+these flags are letters that indicate the affixes that can be used with this
+word.  These are specified with SFX and PFX lines in the .aff file.  See the
+Myspell documentation.  Vim allows using other flag types with the FLAG item
+in the affix file |spell-FLAG|.
 
 When the word only has lower-case letters it will also match with the word
 starting with an upper-case letter.
@@ -564,17 +681,17 @@ The word with all upper-case characters will always be OK.
 	AlS		AlS ALS			als Als ALs aLs aLS
 
 The KEP affix ID can be used to specifically match a word with identical case
-only, see below |spell-affix-KEP|.
+only, see below |spell-KEP|.
 
 Note in line 5 to 7 that non-word characters are used.  You can include
 any character in a word.  When checking the text a word still only matches
 when it appears with a non-word character before and after it.  For Myspell a
 word starting with a non-word character probably won't work.
 
-After the word there is an optional slash and flags.  Most of these flags are
-letters that indicate the affixes that can be used with this word.  These are
-specified with SFX and PFX lines in the .aff file.  See the Myspell
-documentation.
+In line 12 the word "TCP/IP" is defined.  Since the slash has a special
+meaning the comma is used instead.  This is defined with the SLASH item in the
+affix file, see |spell-SLASH|.  Note that without this SLASH item the
+word will be "TCP,IP".
 
 							*spell-affix-vim*
 A flag that Vim adds and is not in Myspell is the flag defined with KEP in the
@@ -606,8 +723,8 @@ word characters (as specified with ENC).  This is because the system where
 ":mkspell" is used may not support a locale with this encoding and isalpha()
 won't work.  For example when using "cp1250" on Unix.
 
-					*E761* *E762* *spell-affix-FOL*
-					*spell-affix-LOW* *spell-affix-UPP*
+						*E761* *E762* *spell-FOL*
+						*spell-LOW* *spell-UPP*
 Three lines in the affix file are needed.  Simplistic example:
 
 	FOL  <20><><EFBFBD> ~
@@ -627,6 +744,10 @@ The "UPP" line specifies the characters with upper-case.  That is, a character
 is upper-case where it's different from the character at the same position in
 "FOL".
 
+An exception is made for the German sharp s <20>.  The upper-case version is
+"SS".  In the FOL/LOW/UPP lines it should be included, so that it's recognized
+as a word character, but use the <20> character in all three.
+
 ASCII characters should be omitted, Vim always handles these in the same way.
 When the encoding is UTF-8 no word characters need to be specified.
 
@@ -658,8 +779,31 @@ These characters are defined with MIDWORD in the .aff file:
 	MIDWORD	'- ~
 
 
+FLAG TYPES						*spell-FLAG*
+
+Flags are used to specify the affixes that can be used with a word and for
+other properties of the word.  Normally single-character flags are used.  This
+limits the number of possible flags, especially for 8-bit encodings.  The FLAG
+item can be used if more affixes are to be used.  Possible values:
+
+	FLAG long	use two-character flags
+	FLAG num	use numbers, from 1 up to 65000
+	FLAG caplong	use one-character flags without A-Z and two-character
+			flags that start with A-Z
+
+With "FLAG num" the numbers in a list of affixes need to be separated with a
+comma: "234,2143,1435".  This method is inefficient, but useful if the file is
+generated with a program.
+
+When using "caplong" the two-character flags all start with a capital: "Aa",
+"B1", "BB", etc.  This is useful to use one-character flags for the most
+common items and two-character flags for uncommon items.
+
+Note: When using utf-8 only characters up to 65000 may be used for flags.
+
+
 AFFIXES
-					    *spell-affix-PFX* *spell-affix-SFX*
+					    *spell-PFX* *spell-SFX*
 The usual PFX (prefix) and SFX (suffix) lines are supported (see the Myspell
 documentation or the Aspell manual:
 http://aspell.net/man-html/Affix-Compression.html).
@@ -671,6 +815,18 @@ Example:
 	SFX F 0 in   [^i]n      # Spion > Spionin  ~
 	SFX F 0 nen  in         # Bauerin > Bauerinnen ~
 
+Apparently Myspell allows an affix name to appear more than once.  Since this
+might also be a mistake, Vim checks for an extra "S".  The affix files for
+Myspell that use this feature apparently have this flag.  Example:
+
+	SFX a Y 1 S ~
+	SFX a 0 an . ~
+
+	SFX a Y 2 S ~
+	SFX a 0 en . ~
+	SFX a 0 on . ~
+
+							*spell-affix-rare*
 An extra item for Vim is the "rare" flag.  It must come after the other
 fields, before a comment.  When used then all words that use the affix will be
 marked as rare words.  Example:
@@ -681,7 +837,23 @@ marked as rare words.  Example:
 However, if the word also appears as a good word in another way it won't be
 marked as rare.
 
-						    *spell-affix-PFXPOSTPONE*
+							*spell-affix-nocomp*
+Another extra item for Vim is the "nocomp" flag.  It must come after the other
+fields, before a comment.  It can be either before or after "rare".  When
+present then all words that use the affix will not be part of a compound word.
+Example:
+	affix file:
+		COMPOUNDFLAG c ~
+		SFX a Y 2 ~
+		SFX a 0 s   . ~
+		SFX a 0 ize . nocomp ~
+	dictionary:
+		word/c ~
+		util/ac ~
+
+This allows for "wordutil" and "wordutils" but not "wordutilize".
+
+						    *spell-PFXPOSTPONE*
 When an affix file has very many prefixes that apply to many words it's not
 possible to build the whole word list in memory.  This applies to Hebrew (a
 list with all words is over a Gbyte).  In that case applying prefixes must be
@@ -691,11 +863,29 @@ in the .aff file:
 	PFXPOSTPONE ~
 
 Only prefixes without a chop string can be postponed, prefixes with a chop
-string will still be included in the word list.
+string will still be included in the word list.  An exception if the chop
+string is one character and equal to the last character of the added string,
+but in lower case.  Thus when the chop string is used to allow the following
+word to start with an upper case letter.
 
 
-KEEP-CASE WORDS
-							*spell-affix-KEP*
+WORDS WITH A SLASH					*spell-SLASH*
+
+The slash is used in the .dic file to separate the basic word from the affix
+letters that can be used.  Unfortunately, this means you cannot use a slash in
+a word.  Thus "TCP/IP" cannot be a word.  To work around that you can define a
+replacement character for the slash.  Example:
+
+	SLASH , ~
+
+Now you can use "TCP,IP" to add the word "TCP/IP".
+
+Of course, the letter used should itself not appear in any word!  The letter
+must be ASCII, thus a single byte.
+
+
+KEEP-CASE WORDS						*spell-KEP*
+
 In the affix file a KEP line can be used to define the affix name used for
 keep-case words.  Example:
 
@@ -704,8 +894,8 @@ keep-case words.  Example:
 See above for an example |spell-affix-vim|.
 
 
-RARE WORDS
-							*spell-affix-RAR*
+RARE WORDS						*spell-RAR*
+
 In the affix file a RAR line can be used to define the affix name used for
 rare words.  Example:
 
@@ -717,8 +907,8 @@ a typing mistake anyway.  When the same word is found as good it won't be
 highlighted as rare.
 
 
-BAD WORDS
-							*spell-affix-BAD*
+BAD WORDS						*spell-BAD*
+
 In the affix file a BAD line can be used to define the affix name used for
 bad words.  Example:
 
@@ -732,8 +922,190 @@ This can be used to exclude words that would otherwise be good.  For example
 Once a word has been marked as bad it won't be undone by encountering the same
 word as good.
 
+							*spell-NEEDAFFIX*
+The NEEDAFFIX flag is used to require that a word is used with an affix.  The
+word itself is not a good word.  Example:
 
-REPLACEMENTS						*spell-affix-REP*
+	NEEDAFFIX + ~
+
+							*spell-NEEDCOMPOUND*
+The NEEDCOMPOUND flag is used to require that a word is used as part of a
+compound word The word itself is not a good word.  Example:
+
+	NEEDCOMPOUND & ~
+
+
+COMPOUND WORDS						*spell-compound*
+
+A compound word is a longer word made by concatenating words that appear in
+the .dic file.  To specify which words may be concatenated a character is
+used.  This character is put in the list of affixes after the word.  We will
+call this character a flag here.  Obviously these flags must be different from
+any affix IDs used.
+
+							*spell-COMPOUNDFLAG*
+The Myspell compatible method uses one flag, specified with COMPOUNDFLAG.
+All words with this flag combine in any order.  This means there is no control
+over which word comes first.  Example:
+	COMPOUNDFLAG c ~
+
+							*spell-COMPOUNDFLAGS*
+A more advanced method to specify how compound words can be formed uses
+multiple items with multiple flags.  This is not compatible with Myspell 3.0.
+Let's start with an example:
+	COMPOUNDFLAGS c+ ~
+	COMPOUNDFLAGS se ~
+
+The first line defines that words with the "c" flag can be concatenated in any
+order.  The second line defines compound words that are made of one word with
+the "s" flag and one word with the "e" flag.  With this dictionary:
+	bork/c ~
+	onion/s ~
+	soup/e ~
+
+You can make these words:
+	bork
+	borkbork
+	borkborkbork
+	(etc.)
+	onion
+	soup
+	onionsoup
+
+The COMPOUNDFLAGS item may appear multiple times.  The argument is made out of
+one or more groups, where each group can be:
+	one flag			e.g., c
+	alternate flags inside []	e.g., [abc]
+Optionally this may be followed by:
+	*	the group appears zero or more times, e.g., sm*e
+	+	the group appears one or more times, e.g., c+
+
+This is similar to the regexp pattern syntax (but not the same!).  A few
+examples with the sequence of word flags they require:
+    COMPOUNDFLAGS x+	    x xx xxx etc.
+    COMPOUNDFLAGS yz	    yz
+    COMPOUNDFLAGS x+z	    xz xxz xxxz etc.
+    COMPOUNDFLAGS yx+	    yx yxx yxxx etc.
+
+    COMPOUNDFLAGS [abc]z    az bz cz
+    COMPOUNDFLAGS [abc]+z   az aaz abaz bz baz bcbz cz caz cbaz etc.
+    COMPOUNDFLAGS a[xyz]+   ax axx axyz ay ayx ayzz az azy azxy etc.
+    COMPOUNDFLAGS sm*e	    se sme smme smmme etc.
+    COMPOUNDFLAGS s[xyz]*e  se sxe sxye sxyxe sye syze sze szye szyxe  etc.
+
+A specific example: Allow a compound to be made of two words and a dash:
+	In the .aff file:
+	    COMPOUNDFLAGS sde ~
+	    NEEDAFFIX x ~
+	    COMPOUNDMAX 3 ~
+	    COMPOUNDMIN 1 ~
+	In the .dic file:
+	    start/s ~
+	    end/e ~
+	    -/xd ~
+
+This allows for the word "start-end", but not "startend".
+
+							*spell-COMPOUNDMIN*
+The minimal character length of a word used for compounding is specified with
+COMPOUNDMIN.  Example:
+	COMPOUNDMIN 5 ~
+
+When omitted there is no minimal length.  Obviously you could just leave out
+the compound flag from short words instead, this feature is present for
+compatibility with Myspell.
+
+							*spell-COMPOUNDMAX*
+The maximum number of words that can be concatenated into a compound word is
+specified with COMPOUNDMAX.  Example:
+	COMPOUNDMAX 3 ~
+
+When omitted there is no maximum.  It applies to all compound words.
+
+To set a limit for words with specific flags make sure the items in
+COMPOUNDFLAGS where they appear don't allow too many words.
+
+							*spell-COMPOUNDSYLMAX*
+The maximum number of syllables that a compound word may contain is specified
+with COMPOUNDSYLMAX.  Example:
+	COMPOUNDSYLMAX 6 ~
+
+This has no effect if there is no SYLLABLE item.  Without COMPOUNDSYLMAX there
+is no limit on the number of syllables.
+
+If both COMPOUNDMAX and COMPOUNDSYLMAX are defined, a compound word is
+accepted if it fits one of the criteria, thus is either made from up to
+COMPOUNDMAX words or contains up to COMPOUNDSYLMAX syllables.
+
+							*spell-SYLLABLE*
+The SYLLABLE item defines characters or character sequences that are used to
+count the number of syllables in a word.  Example:
+	SYLLABLE a<>e<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD>u<EFBFBD><75><EFBFBD>y/aa/au/ea/ee/ei/ie/oa/oe/oo/ou/uu/ui ~
+
+Before the first slash is the set of characters that are counted for one
+syllable, also when repeated and mixed, until the next character that is not
+in this set.  After the slash come sequences of characters that are counted
+for one syllable.  These are preferred over using characters from the set.
+With the example "ideeen" has three syllables, counted by "i", "ee" and "e".
+
+Only case-folded letters need to be included.
+
+Above another way to restrict compounding was mentioned above: adding "nocomp"
+after an affix causes all words that are made with that affix not be be used
+for compounding. |spell-affix-nocomp|
+
+
+UNLIMITED COMPOUNDING					*spell-NOBREAK*
+
+For some languages, such as Thai, there is no space in between words.  This
+looks like all words are compounded.  To specify this use the NOBREAK item in
+the affix file, without arguments:
+	NOBREAK ~
+
+Vim will try to figure out where one word ends and a next starts.  When there
+are spelling mistakes this may not be quite right.
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+NOTE: The following has not been implemented yet, because there are no word
+lists that support this.
+> 							*spell-CMP*
+> Sometimes it is necessary to change a word when concatenating it to another,
+> by removing a few letters, inserting something or both.  It can also be useful
+> to restrict concatenation to words that match a pattern.  For this purpose CMP
+> items can be used.  They look like this:
+> 	CMP {flag} {flags} {strip} {strip2} {add} {cond} {cond2}
+> 
+> 	{flag}		the flag, as used in COMPOUNDFLAGS for the lead word
+> 	{flags}		accepted flags for the following word ('.' to accept
+> 			all)
+> 	{strip}		text to remove from the end of the lead word (zero
+> 			for no stripping)
+> 	{strip2}	text to remove from the start of the following word
+> 			(zero for no stripping)
+> 	{add}		text to insert between the words (zero for no
+> 			addition)
+> 	{cond}		condition to match at the end of the lead word
+> 	{cond2}		condition to match at the start of the following word
+> 
+> This is the same as what is used for SFX and PFX items, with the extra {flags}
+> and {cond2} fields.  Example:
+> 	CMP f mrt 0 - . . ~
+> 
+> When used with the food and dish word list above, this means that a dash is
+> inserted after each food item.  Thus you get "onion-soup" and
+> "onion-tomato-salat".
+> 
+> When there are CMP items for a compound flag the concatenation is only done
+> when a CMP item matches.
+> 
+> When there are no CMP items for a compound flag, then all words will be
+> concatenated, as if there was an item:
+> 	CMP {flag} . 0 0 . .
+>
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+REPLACEMENTS						*spell-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
@@ -745,13 +1117,15 @@ used to make spelling suggestions.  The items define the "from" text and the
 	REP k ch ~
 	REP ch k ~
 
-The first line specifies the number of REP lines following.  Vim ignores it.
+The first line specifies the number of REP lines following.  Vim ignores the
+number, but it must be there.
+
 Don't include simple one-character replacements or swaps.  Vim will try these
 anyway.  You can include whole words if you want to, but you might want to use
 the "file:" item in 'spellsuggest' instead.
 
 
-SIMILAR CHARACTERS					*spell-affix-MAP*
+SIMILAR CHARACTERS					*spell-MAP*
 
 In the affix file MAP items can be used to define letters that are very much
 alike.  This is mostly used for a letter with different accents.  This is used
@@ -761,13 +1135,14 @@ to prefer suggestions with these letters substituted.  Example:
 	MAP e<><65><EFBFBD><EFBFBD> ~
 	MAP u<><75><EFBFBD><EFBFBD> ~
 
-The first line specifies the number of MAP lines following.  Vim ignores it.
+The first line specifies the number of MAP lines following.  Vim ignores the
+number, but the line must be there.
 
 Each letter must appear in only one of the MAP items.  It's a bit more
 efficient if the first letter is ASCII or at least one without accents.
 
 
-SOUND-A-LIKE						*spell-affix-SAL*
+SOUND-A-LIKE						*spell-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.
@@ -791,7 +1166,7 @@ There are a few special items:
 "1" has the same meaning as "true".  Any other value means "false".
 
 
-SIMPLE SOUNDFOLDING		*spell-affix-SOFOFROM* *spell-affix-SOFOTO*
+SIMPLE SOUNDFOLDING				*spell-SOFOFROM* *spell-SOFOTO*
 
 The SAL mechanism is complex and slow.  A simpler mechanism is mapping all
 characters to another character, mapping similar sounding characters to the

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Jul 18
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -399,7 +399,7 @@ Go back to the default to use 'number' by deleting the variable: >
    :unlet html_number_lines
 
 Closed folds are put in the HTML as they are displayed.  If you don't want
-this, use the "zR" command before invoking 2html, or use: >
+this, use the |zR| command before invoking 2html, or use: >
    :let html_ignore_folding = 1
 
 By default, HTML optimized for old browsers is generated.  If you prefer using
@@ -426,16 +426,13 @@ To go back to the automatic mechanism, delete the g:html_use_encoding
 variable: >
    :unlet html_use_encoding
 <
-Closed folds are kept as they are displayed.  If you don't want closed folds
-in the HTML use the |zR| command before converting.
-
 For diff mode a sequence of more than 3 filler lines is displayed as three
 lines with the middle line mentioning the total number of inserted lines.  If
 you prefer to see all the inserted lines use: >
     :let html_whole_filler = 1
 And to go back to displaying up to three lines again: >
     :unlet html_whole_filler
-
+<
 					    *convert-to-XML* *convert-to-XHTML*
 An alternative is to have the script generate XHTML (XML compliant HTML).  To
 do this set the "use_xhtml" variable: >
@@ -457,7 +454,7 @@ Unix shell: >
    for f in *.[ch]; do gvim -f +"syn on" +"run! syntax/2html.vim" +"wq" +"q" $f; done
 <
 
-ABEL							*abel.vim* *abel-syntax*
+ABEL						*abel.vim* *ft-abel-syntax*
 
 ABEL highlighting provides some user-defined options.  To enable them, assign
 any value to the respective variable.  Example: >
@@ -470,7 +467,7 @@ abel_obsolete_ok		obsolete keywords are statements, not errors
 abel_cpp_comments_illegal	do not interpret '//' as inline comment leader
 
 
-ADA							*ada.vim* *ada-syntax*
+ADA						*ada.vim* *ft-ada-syntax*
 
 This mode is designed for the 1995 edition of Ada ("Ada95"), which
 includes support for objected-programming, protected types, and so on.
@@ -518,7 +515,7 @@ Even on a slow (90Mhz) PC this mode works quickly, but if you find
 the performance unacceptable, turn on ada_withuse_ordinary.
 
 
-ANT						*ant.vim* *ant-syntax*
+ANT						*ant.vim* *ft-ant-syntax*
 
 The ant syntax file provides syntax highlighting for javascript and python
 by default.  Syntax highlighting for other script languages can be installed
@@ -536,7 +533,7 @@ will install syntax perl highlighting for the following ant code >
 See |mysyntaxfile-add| for installing script languages permanently.
 
 
-APACHE						*apache.vim* *apache-syntax*
+APACHE						*apache.vim* *ft-apache-syntax*
 
 The apache syntax file provides syntax highlighting depending on Apache HTTP
 server version, by default for 1.3.x.  Set "apache_version" to Apache version
@@ -546,8 +543,8 @@ server version, by default for 1.3.x.  Set "apache_version" to Apache version
 <
 
 		*asm.vim* *asmh8300.vim* *nasm.vim* *masm.vim* *asm68k*
-ASSEMBLY	*asm-syntax* *asmh8300-syntax* *nasm-syntax* *masm-syntax*
-		*asm68k-syntax* *fasm.vim*
+ASSEMBLY	*ft-asm-syntax* *ft-asmh8300-syntax* *ft-nasm-syntax*
+		*ft-masm-syntax* *ft-asm68k-syntax* *fasm.vim*
 
 Files matching "*.i" could be Progress or Assembly.  If the automatic detection
 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -601,7 +598,7 @@ nasm_ctx_outside_macro	contexts outside macro not as Error
 nasm_no_warn		potentially risky syntax not as ToDo
 
 
-ASPPERL and ASPVBS			*aspperl-syntax* *aspvbs-syntax*
+ASPPERL and ASPVBS			*ft-aspperl-syntax* *ft-aspvbs-syntax*
 
 *.asp and *.asa files could be either Perl or Visual Basic script.  Since it's
 hard to detect this you can set two global variables to tell Vim what you are
@@ -613,7 +610,7 @@ For Visual Basic use: >
 	:let g:filetype_asp = "aspvbs"
 
 
-BASIC				*basic.vim* *vb.vim* *basic-syntax* *vb-syntax*
+BASIC			*basic.vim* *vb.vim* *ft-basic-syntax* *ft-vb-syntax*
 
 Both Visual Basic and "normal" basic use the extension ".bas".	To detect
 which one should be used, Vim checks for the string "VB_Name" in the first
@@ -622,7 +619,7 @@ otherwise "vb".  Files with the ".frm" extension will always be seen as Visual
 Basic.
 
 
-C							*c.vim* *c-syntax*
+C							*c.vim* *ft-c-syntax*
 
 A few things in C highlighting are optional.  To enable them assign any value
 to the respective variable.  Example: >
@@ -689,7 +686,7 @@ an the "after" directory in 'runtimepath'.  For Unix this would be
     syn sync fromstart
     set foldmethod=syntax
 
-CH						*ch.vim* *ch-syntax*
+CH						*ch.vim* *ft-ch-syntax*
 
 C/C++ interpreter.  Ch has similar syntax highlighting to C and builds upon
 the C syntax file.  See |c.vim| for all the settings that are available for C.
@@ -699,7 +696,7 @@ of C or C++: >
 	:let ch_syntax_for_h = 1
 
 
-CHILL						*chill.vim* *chill-syntax*
+CHILL						*chill.vim* *ft-chill-syntax*
 
 Chill syntax highlighting is similar to C.  See |c.vim| for all the settings
 that are available.  Additionally there is:
@@ -709,7 +706,7 @@ chill_comment_string	like c_comment_strings
 chill_minlines		like c_minlines
 
 
-CHANGELOG				*changelog.vim* *changelog-syntax*
+CHANGELOG				*changelog.vim* *ft-changelog-syntax*
 
 ChangeLog supports highlighting spaces at the start of a line.
 If you do not like this, add following line to your .vimrc: >
@@ -725,7 +722,7 @@ Or to avoid the highlighting: >
 This works immediately.
 
 
-COBOL						*cobol.vim* *cobol-syntax*
+COBOL						*cobol.vim* *ft-cobol-syntax*
 
 COBOL highlighting has different needs for legacy code than it does for fresh
 development.  This is due to differences in what is being done (maintenance
@@ -736,7 +733,7 @@ To disable it again, use this: >
 	:unlet cobol_legacy_code
 
 
-COLD FUSION				*coldfusion.vim* *coldfusion-syntax*
+COLD FUSION			*coldfusion.vim* *ft-coldfusion-syntax*
 
 The ColdFusion has its own version of HTML comments.  To turn on ColdFusion
 comment highlighting, add the following line to your startup file: >
@@ -746,7 +743,7 @@ comment highlighting, add the following line to your startup file: >
 The ColdFusion syntax file is based on the HTML syntax file.
 
 
-CSH						*csh.vim* *csh-syntax*
+CSH						*csh.vim* *ft-csh-syntax*
 
 This covers the shell named "csh".  Note that on some systems tcsh is actually
 used.
@@ -769,7 +766,7 @@ will be classified as tcsh, UNLESS the "filetype_csh" variable exists.  If the
 variable.
 
 
-CYNLIB						*cynlib.vim* *cynlib-syntax*
+CYNLIB						*cynlib.vim* *ft-cynlib-syntax*
 
 Cynlib files are C++ files that use the Cynlib class library to enable
 hardware modelling and simulation using C++.  Typically Cynlib files have a .cc
@@ -789,7 +786,7 @@ To disable these again, use this: >
 	:unlet cynlib_cyntax_for_cpp
 <
 
-CWEB						*cweb.vim* *cweb-syntax*
+CWEB						*cweb.vim* *ft-cweb-syntax*
 
 Files matching "*.w" could be Progress or cweb.  If the automatic detection
 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -797,7 +794,7 @@ startup vimrc: >
    :let filetype_w = "cweb"
 
 
-DESKTOP					   *desktop.vim* *desktop-syntax*
+DESKTOP					   *desktop.vim* *ft-desktop-syntax*
 
 Primary goal of this syntax file is to highlight .desktop and .directory files
 according to freedesktop.org standard: http://pdx.freedesktop.org/Standards/
@@ -807,7 +804,7 @@ to standard by placing this in your vimrc file: >
 	:let enforce_freedesktop_standard = 1
 
 
-DIRCOLORS			       *dircolors.vim* *dircolors-syntax*
+DIRCOLORS			       *dircolors.vim* *ft-dircolors-syntax*
 
 The dircolors utility highlighting definition has one option.  It exists to
 provide compatibility with the Slackware GNU/Linux distributions version of
@@ -818,9 +815,9 @@ line to your startup file: >
 	let dircolors_is_slackware = 1
 
 
-DOCBOOK					*docbk.vim* *docbk-syntax* *docbook*
-DOCBOOK	XML				*docbkxml.vim* *docbkxml-syntax*
-DOCBOOK	SGML				*docbksgml.vim* *docbksgml-syntax*
+DOCBOOK					*docbk.vim* *ft-docbk-syntax* *docbook*
+DOCBOOK	XML				*docbkxml.vim* *ft-docbkxml-syntax*
+DOCBOOK	SGML				*docbksgml.vim* *ft-docbksgml-syntax*
 
 There are two types of DocBook files: SGML and XML.  To specify what type you
 are using the "b:docbk_type" variable should be set.  Vim does this for you
@@ -837,7 +834,7 @@ or: >
 	:set filetype=docbkxml
 
 
-DOSBATCH				*dosbatch.vim* *dosbatch-syntax*
+DOSBATCH				*dosbatch.vim* *ft-dosbatch-syntax*
 
 There is one option with highlighting DOS batch files.	This covers new
 extensions to the Command Interpreter introduced with Windows 2000 and
@@ -860,7 +857,7 @@ If this variable is undefined or zero, btm syntax is selected.
 
 
 
-DTD						*dtd.vim* *dtd-syntax*
+DTD						*dtd.vim* *ft-dtd-syntax*
 
 The DTD syntax highlighting is case sensitive by default.  To disable
 case-sensitive highlighting, add the following line to your startup file: >
@@ -884,7 +881,7 @@ delimiters % and ;.  This can be turned off by setting: >
 The DTD syntax file is also included by xml.vim to highlight included dtd's.
 
 
-EIFFEL						*eiffel.vim* *eiffel-syntax*
+EIFFEL					*eiffel.vim* *ft-eiffel-syntax*
 
 While Eiffel is not case-sensitive, its style guidelines are, and the
 syntax highlighting file encourages their use.  This also allows to
@@ -927,7 +924,7 @@ Finally, some vendors support hexadecimal constants.  To handle them, add >
 to your startup file.
 
 
-ERLANG						*erlang.vim* *erlang-syntax*
+ERLANG						*erlang.vim* *ft-erlang-syntax*
 
 The erlang highlighting supports Erlang (ERicsson LANGuage).
 Erlang is case sensitive and default extension is ".erl".
@@ -942,7 +939,7 @@ your .vimrc: >
 	:let erlang_characters = 1
 
 
-FORM						*form.vim* *form-syntax*
+FORM						*form.vim* *ft-form-syntax*
 
 The coloring scheme for syntax elements in the FORM file uses the default
 modes Conditional, Number, Statement, Comment, PreProc, Type, and String,
@@ -976,7 +973,7 @@ gvim display.  Here, statements are colored LightYellow instead of Yellow, and
 conditionals are LightBlue for better distinction.
 
 
-FORTRAN					*fortran.vim* *fortran-syntax*
+FORTRAN					*fortran.vim* *ft-fortran-syntax*
 
 Default highlighting and dialect ~
 Highlighting appropriate for f95 (Fortran 95) is used by default.  This choice
@@ -1117,11 +1114,11 @@ Parenthesis checking does not catch too few closing parentheses.  Hollerith
 strings are not recognized.  Some keywords may be highlighted incorrectly
 because Fortran90 has no reserved words.
 
-For further information related to fortran, see |fortran-indent| and
-|fortran-plugin|.
+For further information related to fortran, see |ft-fortran-indent| and
+|ft-fortran-plugin|.
 
 
-FVWM CONFIGURATION FILES			*fvwm.vim* *fvwm-syntax*
+FVWM CONFIGURATION FILES			*fvwm.vim* *ft-fvwm-syntax*
 
 In order for Vim to recognize Fvwm configuration files that do not match
 the patterns *fvwmrc* or *fvwm2rc* , you must put additional patterns
@@ -1145,7 +1142,7 @@ in /usr/X11/lib/X11/, you should add the line >
 to your .vimrc file.
 
 
-GSP							*gsp.vim*
+GSP						*gsp.vim* *ft-gsp-syntax*
 
 The default coloring style for GSP pages is defined by |html.vim|, and
 the coloring for java code (within java tags or inline between backticks)
@@ -1168,7 +1165,7 @@ The backticks for inline java are highlighted according to the htmlError
 group to make them easier to see.
 
 
-GROFF						*groff.vim* *groff-syntax*
+GROFF						*groff.vim* *ft-groff-syntax*
 
 The groff syntax file is a wrapper for |nroff.vim|, see the notes
 under that heading for examples of use and configuration.  The purpose
@@ -1177,7 +1174,7 @@ filetype from a |modeline| or in a personal filetype definitions file
 (see |filetype.txt|).
 
 
-HASKELL			     *haskell.vim* *lhaskell.vim* *haskell-syntax*
+HASKELL			     *haskell.vim* *lhaskell.vim* *ft-haskell-syntax*
 
 The Haskell syntax files support plain Haskell code as well as literate
 Haskell code, the latter in both Bird style and TeX style.  The Haskell
@@ -1221,7 +1218,7 @@ set before turning syntax highlighting on for the buffer or
 loading a file.
 
 
-HTML						*html.vim* *html-syntax*
+HTML						*html.vim* *ft-html-syntax*
 
 The coloring scheme for tags in the HTML file works as follows.
 
@@ -1294,7 +1291,7 @@ Now you just need to make sure that you add all regions that contain
 the preprocessor language to the cluster htmlPreproc.
 
 
-HTML/OS (by Aestiva)				*htmlos.vim* *htmlos-syntax*
+HTML/OS (by Aestiva)				*htmlos.vim* *ft-htmlos-syntax*
 
 The coloring scheme for HTML/OS works as follows:
 
@@ -1315,7 +1312,7 @@ Lastly, it should be noted that the opening and closing characters to begin a
 block of HTML/OS code can either be << or [[ and >> or ]], respectively.
 
 
-IA64				*ia64.vim* *intel-itanium* *ia64-syntax*
+IA64				*ia64.vim* *intel-itanium* *ft-ia64-syntax*
 
 Highlighting for the Intel Itanium 64 assembly language.  See |asm.vim| for
 how to recognize this filetype.
@@ -1324,7 +1321,7 @@ To have *.inc files be recognized as IA64, add this to your .vimrc file: >
 	:let g:filetype_inc = "ia64"
 
 
-INFORM						*inform.vim* *inform-syntax*
+INFORM						*inform.vim* *ft-inform-syntax*
 
 Inform highlighting includes symbols provided by the Inform Library, as
 most programs make extensive use of it.  If do not wish Library symbols
@@ -1353,7 +1350,7 @@ startup sequence: >
 	:let inform_highlight_old=1
 
 
-JAVA						*java.vim* *java-syntax*
+JAVA						*java.vim* *ft-java-syntax*
 
 The java.vim syntax highlighting file offers several options:
 
@@ -1446,7 +1443,7 @@ displayed line.  The default value is 10.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
 
-LACE						*lace.vim* *lace-syntax*
+LACE						*lace.vim* *ft-lace-syntax*
 
 Lace (Language for Assembly of Classes in Eiffel) is case insensitive, but the
 style guide lines are not.  If you prefer case insensitive highlighting, just
@@ -1454,7 +1451,7 @@ define the vim variable 'lace_case_insensitive' in your startup file: >
 	:let lace_case_insensitive=1
 
 
-LEX						*lex.vim* *lex-syntax*
+LEX						*lex.vim* *ft-lex-syntax*
 
 Lex uses brute-force synchronizing as the "^%%$" section delimiter
 gives no clue as to what section follows.  Consequently, the value for >
@@ -1463,7 +1460,7 @@ may be changed by the user if s/he is experiencing synchronization
 difficulties (such as may happen with large lex files).
 
 
-LITE						*lite.vim* *lite-syntax*
+LITE						*lite.vim* *ft-lite-syntax*
 
 There are two options for the lite syntax highlighting.
 
@@ -1477,7 +1474,7 @@ set "lite_minlines" to the value you desire.  Example: >
 	:let lite_minlines = 200
 
 
-LPC						*lpc.vim* *lpc-syntax*
+LPC						*lpc.vim* *ft-lpc-syntax*
 
 LPC stands for a simple, memory-efficient language: Lars Pensj| C.  The
 file name of LPC is usually *.c.  Recognizing these files as LPC would bother
@@ -1518,7 +1515,7 @@ uLPC has been developed to Pike, so you should use Pike syntax
 instead, and the name of your source file should be *.pike
 
 
-LUA						*lua.vim* *lua-syntax*
+LUA						*lua.vim* *ft-lua-syntax*
 
 This syntax file may be used for Lua 4.0 and Lua 5.0 (default).  If you are
 programming in Lua 4.0, use this: >
@@ -1528,7 +1525,7 @@ programming in Lua 4.0, use this: >
 If lua_version variable doesn't exist, it is set to 5.
 
 
-MAIL								*mail.vim*
+MAIL						*mail.vim* *ft-mail.vim*
 
 Vim highlights all the standard elements of an email (headers, signatures,
 quoted text and URLs / email addresses).  In keeping with standard conventions,
@@ -1546,7 +1543,7 @@ with short headers, you can change this to a smaller value: >
     :let mail_minlines = 30
 
 
-MAKE						*make.vim* *make-syntax*
+MAKE						*make.vim* *ft-make-syntax*
 
 In makefiles, commands are usually highlighted to make it easy for you to spot
 errors.  However, this may be too much coloring for you.  You can turn this
@@ -1555,7 +1552,7 @@ feature off by using: >
 	:let make_no_commands = 1
 
 
-MAPLE						*maple.vim* *maple-syntax*
+MAPLE						*maple.vim* *ft-maple-syntax*
 
 Maple V, by Waterloo Maple Inc, supports symbolic algebra.  The language
 supports many packages of functions which are selectively loaded by the user.
@@ -1580,7 +1577,7 @@ $VIMRUNTIME/syntax/syntax.vim).
   mv_finance	 mv_logic	mv_powseries
 
 
-MATHEMATICA			*mma.vim* *mma-syntax* *mathematica-syntax*
+MATHEMATICA		*mma.vim* *ft-mma-syntax* *ft-mathematica-syntax*
 
 Empty *.m files will automatically be presumed to be Matlab files unless you
 have the following in your .vimrc: >
@@ -1588,7 +1585,7 @@ have the following in your .vimrc: >
 	let filetype_m = "mma"
 
 
-MOO						*moo.vim* *moo-syntax*
+MOO						*moo.vim* *ft-moo-syntax*
 
 If you use C-style comments inside expressions and find it mangles your
 highlighting, you may want to use extended (slow!) matches for C-style
@@ -1624,7 +1621,7 @@ An example of adding sprintf() to the list of known builtin functions: >
 	:syn keyword mooKnownBuiltinFunction sprintf contained
 
 
-MSQL						*msql.vim* *msql-syntax*
+MSQL						*msql.vim* *ft-msql-syntax*
 
 There are two options for the msql syntax highlighting.
 
@@ -1638,7 +1635,7 @@ set "msql_minlines" to the value you desire.  Example: >
 	:let msql_minlines = 200
 
 
-NCF						*ncf.vim* *ncf-syntax*
+NCF						*ncf.vim* *ft-ncf-syntax*
 
 There is one option for NCF syntax highlighting.
 
@@ -1650,7 +1647,7 @@ errors, use this: >
 If you don't want to highlight these errors, leave it unset.
 
 
-NROFF						*nroff.vim* *nroff-syntax*
+NROFF						*nroff.vim* *ft-nroff-syntax*
 
 The nroff syntax file works with AT&T n/troff out of the box.  You need to
 activate the GNU groff extra features included in the syntax file before you
@@ -1721,7 +1718,7 @@ Finally, there is a |groff.vim| syntax file that can be used for enabling
 groff syntax highlighting either on a file basis or globally by default.
 
 
-OCAML						*ocaml.vim* *ocaml-syntax*
+OCAML						*ocaml.vim* *ft-ocaml-syntax*
 
 The OCaml syntax file handles files having the following prefixes: .ml,
 .mli, .mll and .mly.  By setting the following variable >
@@ -1737,7 +1734,7 @@ prevents highlighting of "end" as error, which is useful when sources
 contain very long structures that Vim does not synchronize anymore.
 
 
-PAPP						*papp.vim* *papp-syntax*
+PAPP						*papp.vim* *ft-papp-syntax*
 
 The PApp syntax file handles .papp files and, to a lesser extend, .pxml
 and .pxsl files which are all a mixture of perl/xml/html/other using xml
@@ -1755,7 +1752,7 @@ The newest version of the papp.vim syntax file can usually be found at
 http://papp.plan9.de.
 
 
-PASCAL						*pascal.vim* *pascal-syntax*
+PASCAL						*pascal.vim* *ft-pascal-syntax*
 
 Files matching "*.p" could be Progress or Pascal.  If the automatic detection
 doesn't work for you, or you don't edit Progress at all, use this in your
@@ -1809,7 +1806,7 @@ will be highlighted as Error. >
 
 
 
-PERL						*perl.vim* *perl-syntax*
+PERL						*perl.vim* *ft-perl-syntax*
 
 There are a number of possible options to the perl syntax highlighting.
 
@@ -1869,7 +1866,7 @@ If you want to fold blocks in if statements, etc. as well set the following: >
 	:let perl_fold_blocks = 1
 
 
-PHP3 and PHP4		*php.vim* *php3.vim* *php-syntax* *php3-syntax*
+PHP3 and PHP4		*php.vim* *php3.vim* *ft-php-syntax* *ft-php3-syntax*
 
 [note: previously this was called "php3", but since it now also supports php4
 it has been renamed to "php"]
@@ -1922,7 +1919,7 @@ x > 0 to sync at least x lines backwards,
 x = 0 to sync from start.
 
 
-PPWIZARD					*ppwiz.vim* *ppwiz-syntax*
+PPWIZARD					*ppwiz.vim* *ft-ppwiz-syntax*
 
 PPWizard is a preprocessor for HTML and OS/2 INF files
 
@@ -1944,7 +1941,7 @@ This syntax file has the options:
   HTML code; if 0, treat HTML code like ordinary text.
 
 
-PHTML						*phtml.vim* *phtml-syntax*
+PHTML						*phtml.vim* *ft-phtml-syntax*
 
 There are two options for the phtml syntax highlighting.
 
@@ -1958,7 +1955,7 @@ set "phtml_minlines" to the value you desire.  Example: >
 	:let phtml_minlines = 200
 
 
-POSTSCRIPT					*postscr.vim* *postscr-syntax*
+POSTSCRIPT				*postscr.vim* *ft-postscr-syntax*
 
 There are several options when it comes to highlighting PostScript.
 
@@ -2013,8 +2010,8 @@ postscr_andornot_binary as follows: >
 	:let postscr_andornot_binary=1
 <
 
-			*ptcap.vim*
-PRINTCAP + TERMCAP	*ptcap-syntax* *termcap-syntax* *printcap-syntax*
+			*ptcap.vim* *ft-printcap-syntax*
+PRINTCAP + TERMCAP	*ft-ptcap-syntax* *ft-termcap-syntax*
 
 This syntax file applies to the printcap and termcap databases.
 
@@ -2039,7 +2036,7 @@ internal variable to a larger number: >
 (The default is 20 lines.)
 
 
-PROGRESS				*progress.vim* *progress-syntax*
+PROGRESS				*progress.vim* *ft-progress-syntax*
 
 Files matching "*.w" could be Progress or cweb.  If the automatic detection
 doesn't work for you, or you don't edit cweb at all, use this in your
@@ -2051,7 +2048,7 @@ Pascal.  Use this if you don't use assembly and Pascal: >
    :let filetype_p = "progress"
 
 
-PYTHON						*python.vim* *python-syntax*
+PYTHON						*python.vim* *ft-python-syntax*
 
 There are four options to control Python syntax highlighting.
 
@@ -2072,7 +2069,7 @@ preceding three options): >
 	:let python_highlight_all = 1
 
 
-QUAKE						*quake.vim* *quake-syntax*
+QUAKE						*quake.vim* *ft-quake-syntax*
 
 The Quake syntax definition should work for most any FPS (First Person
 Shooter) based on one of the Quake engines.  However, the command names vary
@@ -2094,7 +2091,7 @@ Any combination of these three variables is legal, but might highlight more
 commands than are actually available to you by the game.
 
 
-READLINE				*readline.vim* *readline-syntax*
+READLINE				*readline.vim* *ft-readline-syntax*
 
 The readline library is primarily used by the BASH shell, which adds quite a
 few commands and options to the ones already available.  To highlight these
@@ -2106,7 +2103,7 @@ This will add highlighting for the commands that BASH (version 2.05a and
 later, and part earlier) adds.
 
 
-REXX						*rexx.vim* *rexx-syntax*
+REXX						*rexx.vim* *ft-rexx-syntax*
 
 If you notice highlighting errors while scrolling backwards, which are fixed
 when redrawing with CTRL-L, try setting the "rexx_minlines" internal variable
@@ -2117,7 +2114,7 @@ displayed line.  The default value is 10.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
 
-RUBY						*ruby.vim* *ruby-syntax*
+RUBY						*ruby.vim* *ft-ruby-syntax*
 
 There are a few options to the Ruby syntax highlighting.
 
@@ -2142,7 +2139,7 @@ This will prevent highlighting of special identifiers like "ConstantName",
 "$global_var", "@instance_var", "| iterator |", and ":symbol".
 
 
-SCHEME						*scheme.vim* *scheme-syntax*
+SCHEME						*scheme.vim* *ft-scheme-syntax*
 
 By default only R5RS keywords are highlighted and properly indented.
 
@@ -2153,7 +2150,7 @@ Also scheme.vim supports keywords of the Chicken Scheme->C compiler.  Define
 b:is_chicken or g:is_chicken, if you need them.
 
 
-SDL						*sdl.vim* *sdl-syntax*
+SDL						*sdl.vim* *ft-sdl-syntax*
 
 The SDL highlighting probably misses a few keywords, but SDL has so many
 of them it's almost impossibly to cope.
@@ -2173,7 +2170,7 @@ The indentation is probably also incomplete, but right now I am very
 satisfied with it for my own projects.
 
 
-SED						*sed.vim* *sed-syntax*
+SED						*sed.vim* *ft-sed-syntax*
 
 To make tabs stand out from regular blanks (accomplished by using Todo
 highlighting on the tabs), define "highlight_sedtabs" by putting >
@@ -2196,7 +2193,7 @@ Bugs:
   each plausible pattern delimiter).
 
 
-SGML						*sgml.vim* *sgml-syntax*
+SGML						*sgml.vim* *ft-sgml-syntax*
 
 The coloring scheme for tags in the SGML file works as follows.
 
@@ -2237,7 +2234,7 @@ vimrc file: >
 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
 
 
-SH						*sh.vim* *sh-syntax*
+SH		*sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax*
 
 This covers the "normal" Unix (Bourne) sh, bash and the Korn shell.
 
@@ -2288,7 +2285,7 @@ The default is to use the twice sh_minlines.  Set it to a smaller number to
 speed up displaying.  The disadvantage is that highlight errors may appear.
 
 
-SPEEDUP (AspenTech plant simulator)		*spup.vim* *spup-syntax*
+SPEEDUP (AspenTech plant simulator)		*spup.vim* *ft-spup-syntax*
 
 The Speedup syntax file has some options:
 
@@ -2320,8 +2317,8 @@ fast enough, you can increase minlines and/or maxlines near the end of
 the syntax file.
 
 
-SQL						*sql.vim* *sql-syntax*
-					*sqlinformix.vim* *sqlinformix-syntax*
+SQL						*sql.vim* *ft-sql-syntax*
+				*sqlinformix.vim* *ft-sqlinformix-syntax*
 
 While there is an ANSI standard for SQL, most database engines add their
 own custom extensions.  Vim currently supports the Oracle and Informix
@@ -2331,7 +2328,7 @@ If you want to use the Informix dialect, put this in your startup vimrc: >
     :let g:filetype_sql = "sqlinformix" 
 
 
-TCSH						*tcsh.vim* *tcsh-syntax*
+TCSH						*tcsh.vim* *ft-tcsh-syntax*
 
 This covers the shell named "tcsh".  It is a superset of csh.  See |csh.vim|
 for how the filetype is detected.
@@ -2353,20 +2350,32 @@ displayed line.  The default value is 15.  The disadvantage of using a larger
 number is that redrawing can become slow.
 
 
-TEX						*tex.vim* *tex-syntax*
+TEX						*tex.vim* *ft-tex-syntax*
 
+*tex-folding*
+Want Syntax Folding? ~
+
+As of version 28 of <syntax/tex.vim>, syntax-based folding of parts, chapters,
+sections, subsections, etc are supported.  Put >
+	let g:tex_fold_enabled=1
+in your <.vimrc>, and :set fdm=syntax.  I suggest doing the latter via a
+modeline at the end of your LaTeX file: >
+	% vim: fdm=syntax
+<
+*tex-runon*
 Run-on Comments/Math? ~
 
-The tex highlighting supports TeX, LaTeX, and some AmsTeX.  The
-highlighting supports three primary zones: normal, texZone, and texMathZone.
-Although a considerable effort has been made to have these zones terminate
-properly, zones delineated by $..$ and $$..$$ cannot be synchronized as
-there's no difference between start and end patterns.  Consequently, a
+The <syntax/tex.vim> highlighting supports TeX, LaTeX, and some AmsTeX.  The
+highlighting supports three primary zones/regions: normal, texZone, and
+texMathZone.  Although considerable effort has been made to have these zones
+terminate properly, zones delineated by $..$ and $$..$$ cannot be synchronized
+as there's no difference between start and end patterns.  Consequently, a
 special "TeX comment" has been provided >
 	%stopzone
 which will forcibly terminate the highlighting of either a texZone or a
 texMathZone.
 
+*tex-slow*
 Slow Syntax Highlighting? ~
 
 If you have a slow computer, you may wish to reduce the values for >
@@ -2376,6 +2385,7 @@ If you have a slow computer, you may wish to reduce the values for >
 increase them.	This primarily affects synchronizing (i.e. just what group,
 if any, is the text at the top of the screen supposed to be in?).
 
+*tex-error*
 Excessive Error Highlighting? ~
 
 The <tex.vim> supports lexical error checking of various sorts.  Thus,
@@ -2383,28 +2393,24 @@ although the error checking is ofttimes very useful, it can indicate
 errors where none actually are.  If this proves to be a problem for you,
 you may put in your <.vimrc> the following statement: >
 	let tex_no_error=1
-and all error checking by <tex.vim> will be suppressed.
+and all error checking by <syntax/tex.vim> will be suppressed.
 
+*tex-math*
 Need a new Math Group? ~
 
 If you want to include a new math group in your LaTeX, the following
 code shows you an example as to how you might do so: >
+	call TexNewMathZone(sfx,mathzone,starform)
+You'll want to provide the new math group with a unique suffix
+(currently, A-L and V-Z are taken by <syntax/tex.vim> itself).
+As an example, consider how eqnarray is set up by <syntax/tex.vim>: >
+	call TexNewMathZone("D","eqnarray",1)
+You'll need to change "mathzone" to the name of your new math group,
+and then to the call to it in .vim/after/syntax/tex.vim.
+The "starform" variable, if true, implies that your new math group
+has a starred form (ie. eqnarray*).
 
-    syn cluster texMathZones add=texMathZoneLOCAL
-    syn region texMathZoneLOCAL start="\\begin\s*{\s*LOCALMATH\s*}"
-       \ end="\\end\s*{\s*LOCALMATH\s*}" keepend
-       \ contains=@texMathZoneGroup
-    if !exists("tex_no_math")
-     syn sync match texSyncMathZoneLOCAL grouphere texMathZoneLOCAL
-       \ "\\begin\s*{\s*LOCALMATH\*\s*}"
-     syn sync match texSyncMathZoneLOCAL groupthere NONE
-       \ "\\end\s*{\s*LOCALMATH\*\s*}"
-    endif
-    hi link texMathZoneLOCAL texMath
-<
-You'll need to change LOCALMATH to the name of your new math group,
-and then to put it into .vim/after/syntax/tex.vim.
-
+*tex-style*
 Starting a New Style? ~
 
 One may use "\makeatletter" in *.tex files, thereby making the use of "@" in
@@ -2419,7 +2425,7 @@ Putting "let g:tex_stylish=1" into your <.vimrc> will make <syntax/tex.vim>
 always accept such use of @.
 
 
-TF						*tf.vim* *tf-syntax*
+TF						*tf.vim* *ft-tf-syntax*
 
 There is one option for the tf syntax highlighting.
 
@@ -2429,7 +2435,7 @@ set "tf_minlines" to the value you desire.  Example: >
 	:let tf_minlines = your choice
 
 
-VIM						*vim.vim* *vim-syntax*
+VIM						*vim.vim* *ft-vim-syntax*
 
 There is a tradeoff between more accurate syntax highlighting versus
 screen updating speed.  To improve accuracy, you may wish to increase
@@ -2453,7 +2459,7 @@ for external scripting languages (currently perl, python, ruby, and tcl).
 					 loaded.
 
 
-XF86CONFIG				*xf86conf.vim* *xf86conf-syntax*
+XF86CONFIG				*xf86conf.vim* *ft-xf86conf-syntax*
 
 The syntax of XF86Config file differs in XFree86 v3.x and v4.x.  Both
 variants are supported.  Automatic detection is used, but is far from perfect.
@@ -2468,7 +2474,7 @@ Note that spaces and underscores in option names are not supported.  Use
 highlighted.
 
 
-XML						*xml.vim* *xml-syntax*
+XML						*xml.vim* *ft-xml-syntax*
 
 Xml namespaces are highlighted by default.  This can be inhibited by
 setting a global variable: >
@@ -2486,7 +2492,7 @@ Note: syntax folding might slow down syntax highlighting significantly,
 especially for large files.
 
 
-X Pixmaps (XPM)					*xpm.vim* *xpm-syntax*
+X Pixmaps (XPM)					*xpm.vim* *ft-xpm-syntax*
 
 xpm.vim creates its syntax items dynamically based upon the contents of the
 XPM file.  Thus if you make changes e.g. in the color specification strings,
@@ -3641,6 +3647,16 @@ specified field is used, and settings are merged with previous ones.  So, the
 result is like this single command has been used: >
    :hi Comment	term=bold ctermfg=Cyan guifg=#80a0ff gui=bold
 <
+						    	*:highlight-verbose*
+When listing a highlight group and 'verbose' is non-zero, the listing will
+also tell where it was last set.  Example: >
+	:verbose hi Comment
+<	Comment        xxx term=bold ctermfg=4 guifg=Blue ~
+           Last set from /home/mool/vim/vim7/runtime/syntax/syncolor.vim ~
+
+When ":hi clear" is used then the script where this command is used will be
+mentioned for the default values. See |:verbose-cmd| for more information.
+
 					*highlight-args* *E416* *E417* *E423*
 There are three types of terminals for highlighting:
 term	a normal terminal (vt100, xterm)

runtime/doc/term.txt

@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2005 Jun 06
+*term.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -291,6 +291,7 @@ Added by Vim (there are no standard codes for these):
 	t_WS	set window size (height, width) in characters	*t_WS* *'t_WS'*
 	t_SI    start insert mode (bar cursor shape)            *t_SI* *'t_SI'*
 	t_EI    end insert mode (block cursor shape)            *t_EI* *'t_EI'*
+		|termcap-cursor-shape|
 	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
 		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
 
@@ -427,6 +428,7 @@ Example for an xterm, this changes the color of the cursor: >
     endif
 NOTE: When Vim exits the shape for Normal mode will remain.  The shape from
 before Vim started will not be restored.
+{not available when compiled without the +cursorshape feature}
 
 							*termcap-title*
 The 't_ts' and 't_fs' options are used to set the window title if the terminal

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 27
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,6 +30,8 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Try out using the free MS compiler and debugger, using Make_mvc.mak.
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
@@ -37,7 +39,7 @@ Mac unicode patch (Da Woon Jung):
 Win32: Use the free downloadable compiler 7.1.  Figure out how to do debugging
 (with Agide?) and describe it. (George Reilly)
 
-autoload:
+Autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
   script names and a help file and produces a script that can be sourced to
   install the scripts in the user's directories.
@@ -52,39 +54,88 @@ Awaiting response:
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
 -   mblen(NULL, 0) also in Vim 6.3?
--   Win32: Crash when pasting Simplified Chinese in utf-8. (rainux, 2005 June
-    20)
 
 
 PLANNED FOR VERSION 7.0:
 
--   "INTELLISENSE".  First cleanup the Insert-mode completion.
+-   Occult completion: Understands the programming language and finds matches
+    that make sense.  Esp. members of classes/structs.
+
+    It's not much different from other Insert-mode completion, use the same
+    mechanism.  Use CTRL-X CTRL-O and 'occultfunc'.  Set 'occultfunc' in the
+    filetype plugin, define the function in the autoload directory.
+    
+    Separately develop the completion logic and the UI.  When adding UI stuff
+    make it work for all completion methods.
+
+    UI:
+    - At first: use 'wildmenu' kind of thing.
+    - Nicer: Display the list of choices right under the place where they
+      would be inserted in a kind of meny (use scrollbar when there are many
+      alternatives).
+
+    Completion logic:
+	Use runtime/autoload/{filetype}complete.vim files.
+
+	For a simple name can complete like with CTRL-N.
+	    get list of IDs from the tagfile?
+	    For struct or class add "." or "->"?
+
+	After a reference to a struct or class suggest members.
+	    Recognizing "var.mem" and 'var->mem" is easy.
+	    How to get the type of "var"?
+		tags file doesn't give type of typedef!  E.g., oparg_T is
+		listed with "^} oparg_T;$"
+		mlcscope may do it, but I can't find the sources
+	    How to get the members of that type?
+		tags file has struct: and class: fields
+
+	In function arguments suggest variables of expected type.
+
+	List of completions is a Dictionary with items:
+	    complist[0]['text'] = completion text
+	    complist[0]['type'] = type of completion (e.g. function, var, arg)
+	    complist[0]['help'] = help text (e.g. function declaration)
+	    complist[0]['helpfunc'] = function that shows help text
+	    etc.
+
+	Ideas from others:
 	http://www.vim.org/scripts/script.php?script_id=747
+	    http://sourceforge.net/projects/insenvim
+		or http://insenvim.sourceforge.net
+	    Java, XML, HTML, C++, JSP, SQL, C#
+	    MS-Windows only, lots of dependencies (e.g. Perl, Internet
+		explorer), uses .dll shared libraries.
+	    For C++ uses $INCLUDE environment var.
+	    Uses Perl for C++.
+	    Uses ctags to find the info:
+		ctags -f $allTagsFile --fields=+aiKmnsSz --language-force=C++ --C++-kinds=+cefgmnpsut-dlux -u $files
+
+	    UI: popup menu with list of alternatives, icon to indicate type
+		optional popup window with info about selected alternative
+	    Unrelated settings are changed (e.g. 'mousemodel').
+
 	www.vim.org script 1213 (Java Development Environment) (Fuchuan Wang)
-	http://sourceforge.net/projects/insenvim
-	    of http://insenvim.sourceforge.net
 	IComplete: http://www.vim.org/scripts/script.php?script_id=1265
 	    and http://stud4.tuwien.ac.at/~e0125672/icomplete/
 	http://cedet.sourceforge.net/intellisense.shtml (for Emacs)
 	Ivan Villanueva has something for Java.
-	Ideas from Emads:
-	    http://www.xref-tech.com/xrefactory/more_c_completion.html
-    Can't call it Intellisense, it is a trademark by Microsoft.
-    Ideas from the Vim 7 BOF at SANE:
-    - It's not possible to have one solution for all languages.  Design an
-      interface for completion plugins.  The matches can be done in a
-      Vim-script list.
-    - For interpreted languages, use the interpreter to obtain information.
-      Should work for Java (Eclipse does this), Python, Tcl, etc.
-      Richard Emberson mentioned working on an interface to Java.
-    - Check Readline for its completion interface.
-    - Use ctags for other languages.  Writing a file could trigger running
-      ctags, merging the tags of the changed file.
-    Also see "Visual Assist" http://www.wholetomato.com/products:
-    - Put the list of choices right under the place where they would be
-      inserted.
-    - Pre-expand abbreviations, show which abbrevs would match?
-    - Completion in .NET framework SharpDevelop: http://www.icsharpcode.net
+	Emads: http://www.xref-tech.com/xrefactory/more_c_completion.html
+	Ideas from the Vim 7 BOF at SANE:
+	- It's not possible to have one solution for all languages.  Design an
+	  interface for completion plugins.  The matches can be done in a
+	  Vim-script list.
+	- For interpreted languages, use the interpreter to obtain information.
+	  Should work for Java (Eclipse does this), Python, Tcl, etc.
+	  Richard Emberson mentioned working on an interface to Java.
+	- Check Readline for its completion interface.
+	- Use ctags for other languages.  Writing a file could trigger running
+	  ctags, merging the tags of the changed file.
+	"Visual Assist" http://www.wholetomato.com/products:
+	Completion in .NET framework SharpDevelop: http://www.icsharpcode.net
+
+        - Pre-expand abbreviations, show which abbrevs would match?
+
 -   UNDO TREE: keep all states of the text, don't delete undo info.
     When making a change, instead of clearing any future undo (thus redo)
     info, make a new branch.
@@ -191,6 +242,12 @@ PLANNED FOR VERSION 7.0:
 
 Adjust src/main.aap for installing manpages like in Makefile.
 
+When editing a file with both utf-8 and latin1 text Vim always falls back to
+latin1.  Add a command to convert the latin1 characters to utf-8?
+    :unmix utf-8,latin1 filename
+Would only work when 'encoding' is utf-8.
+Also: command to search for illegal utf-8 byte sequence?
+
 Also generate the .pdb file that can be used to generate a useful crash report
 on MS-Windows. (George Reilly)
 
@@ -432,6 +489,9 @@ GTK+ GUI known bugs:
 8   GTK 2: Combining UTF-8 characters not displayed properly in menus (Mikolaj
     Machowski)  They are displayed as separate characters.  Problem in
     creating a label?
+8   GTK 2: Combining UTF-8 characters are sometimes not drawn properly.
+    Depends on the font size, "monospace 13" has the problem.  Vim seems to do
+    everything right, must be a GTK bug.  Is there a way to work around it?
 9   Can't paste a Visual selection from GTK-gvim to vim in xterm or Motif gvim
     when it is longer than 4000 characters.  Works OK from gvim to gvim and
     vim to vim.  Pasting through xterm (using the shift key) also works.
@@ -978,6 +1038,7 @@ Macintosh:
     ":w!!" for that.
     Or ask for permission to overwrite it (if file can be made writable) and
     restore file to readonly afterwards.
+    Overwriting a file for which a swap file exists is similar issue.
 7   When compiled with "xterm_clipboard", startup can be slower and might get
     error message for invalid $DISPLAY.  Try connecting to the X server in the
     background (forked), so that Vim starts up quicker?  Connect as soon as
@@ -1253,6 +1314,43 @@ User Friendlier:
 Spell checking:
 9   Work together with OpenOffice.org to update the wordlists.  (Adri Verhoef,
     Aad Nales)  Setup vim-spell maillist?
+-   Compound word is accepted if nr of words is <= COMPOUNDMAX OR nr of
+    syllables <= COMPOUNDSYLMAX.  Specify using AND in the affix file?
+-   COMPOUNDMAX -> COMPOUNDWORDMAX?
+-   Support flags on a suffix.  Used for second level affixes.  The flags may
+    also be used for compounding.  Default is an OR mechanism with the flags
+    of the word.  Adding "compset" on the affixes means the compound flags of
+    the word are not used.  Instead of "SFX a 0 add/FLAGS ." we could use "SFX
+    a 0 add . /FLAGS" (or support both).
+-   NEEDCOMPOUND also used for affix?  Or use "needcomp" after affix?
+-   Do we need a flag for the rule that when compounding is done the following
+    word doesn't have a capital after a word character, even for Onecap words?
+-   New hunspell home page: http://hunspell.sourceforge.net/
+    - Lots of code depends on LANG, that isn't right.  Enable each mechanism
+      in the affix file separately.
+    - Example with compounding dash is bad, gets in the way of setting
+      COMPOUNDMIN and COMPOUNDMAX to a reasonable value.
+    - PSEUDOROOT == NEEDAFFIX
+    - COMPOUNDROOT -> COMPOUNDED?  For a word that already is a compound word
+	    Or use COMPOUNDED2, COMPOUNDED3, etc.
+-   CIRCUMFIX: when a word uses a prefix marked with the CIRCUMFIX flag, then
+    the word must also have a suffix marked with the CIRCUMFIX flag.  It's a
+    bit primitive, since only one flag is used, which doesn't allow matching
+    specific prefixes with suffixes.
+    Alternative:
+	PSFX {flag} {pchop} {padd} {pcond} {schop} {sadd}[/flags] {scond}
+    We might not need this at all, you can use the NEEDAFFIX flag and the
+    affix which is required.
+-   When a suffix has more than one syllable, it may count as a word for
+    COMPOUNDMAX.
+-   Add flags to count extra syllables in a word.  SYLLABLEADD1 SYLLABLEADD2,
+    etc.?  Or make it possible to specify the syllable count of a word
+    directly, e.g., after another slash: /abc/3
+-   MORPHO item in affix file: ignore morphological fields after word and
+    affix.
+-   Implement multiple flags for compound words and CMP item?
+    Await comments from other spell checking authors.
+-   Also see tklspell: http://tkltrans.sourceforge.net/
 8   Charles Campbell asks for method to add "contained" groups to existing
     syntax items (to add @Spell).
     Add ":syntax contains {pattern} add=@Spell" command?  A bit like ":syn
@@ -1382,6 +1480,10 @@ Multi-byte characters:
 7   In "-- INSERT (lang) --" show the name of the keymap used instead of
     "lang". (Ilya Dogolazky)
 -   Make 'langmap' accept multi-byte characters.
+-   Make 'breakat' accept multi-byte characters.  Problem: can't use a lookup
+    table anymore (breakat_flags[]).
+    Simplistic solution: when 'formatoptions' contains "m" also break a line
+    at a multi-byte character >= 0x100.
 -   Do we need the reverse of 'keymap', like 'langmap' but with files and
     multi-byte characters?  E.g., when using a Russian keyboard.
 -   Add the possibility to enter mappings which are used whenever normal text
@@ -1589,7 +1691,6 @@ Built-in script language:
        .vim file.  Problem: distribution.
     3. Use a cache directory for each user.  How to recognize which cached
        file belongs to a sourced script?
-7   Add "m" flag to search() and searchpair() function to set the '' mark.
 7   Add argument to winwidth() to subtract the space taken by 'foldcolumn',
     signs and/or 'number'.
 8   Add functions:
@@ -1611,7 +1712,6 @@ Built-in script language:
 	mapname({idx}, mode)	return the name of the idx'th mapping.
 				Patch by Ilya Sher, 2004 Mar 4.
 				Return a list instead.
-	printf(format, arg, ..) How to prevent a crash???
 	char2hex()		convert char string to hex string.
 	attributes()		return file protection flags "drwxrwxrwx"
 	filecopy(from, to)	Copy a file
@@ -1622,7 +1722,6 @@ Built-in script language:
 	virtualmode()		add argument to obtain whether "$" was used in
 				Visual block mode.
 	getacp()		Win32: get codepage (Glenn Maynard)
-	getbufline()		get line from any buffer
 	deletebufline()		delete line in any buffer
 	appendbufline()		append line in any buffer
 	libcall()		Allow more than one argument.
@@ -1998,9 +2097,9 @@ GUI:
 7   X11: Support cursorColor resource and "-cr" argument.
 8   X11 (and others): CTRL-; is not different from ';'.  Set the modifier mask
     to include CTRL for keys where CTRL produces the same ASCII code.
-7   Add some code to handle proportional fonts?  Need to draw each character
-    separately (like xterm).  Also for when a double-width font is not exactly
-    double-width. (Maeda)
+7   Add some code to handle proportional fonts on more systems?  Need to draw
+    each character separately (like xterm).  Also for when a double-width font
+    is not exactly double-width. (Maeda)
 8   Should take font from xterm where gvim was started (if no other default).
 8   Selecting font names in X11 is difficult, make a script or something to
     select one.
@@ -2149,12 +2248,12 @@ Insert mode completion/expansion:
 9   ^X^L completion doesn't repeat correctly.  It uses the first match with
     the last added line, instead of continuing where the last match ended.
     (Webb)
-8   The code has become too complex.  Redesign it, or at least add proper
-    comments.
 8   Add option to set different behavior for Insert mode completion:
     - ignore/match case
     - different characters than 'iskeyword'
 8   Add a command to undo the completion, go back to the original text.
+7   Completion of an abbreviation: Can leave letters out, like what Instant
+    text does: www.textware.com
 8   Use the class information in the tags file to do context-sensitive
     completion.  After "foo." complete all member functions/variables of
     "foo".  Need to search backwards for the class definition of foo.
@@ -2549,16 +2648,12 @@ More advanced repeating commands:
 
 
 Mappings and Abbreviations:
-8   Let ":verbose map xx" report where the mapping was set, just like with
-    ":verbose set".
 8   When "0" is mapped (it is a movement command) this mapping should not be
     used after typing another number, e.g. "20l". (Charles Campbell)
     Is this possible without disabling the mapping of the following command?
 8   Should mapping <C-A> and <C-S-A> both work?
 7   ":abbr b byte", append "b " to an existing word still expands to "byte".
     This is Vi compatible, but can we avoid it anyway?
-8   ":verbose map" could show the script where the mapping was defined.
-    m_script_ID can be used.
 8   To make a mapping work with a prepended "x to select a register, store the
     last _typed_ register name and access it with "&.
 8   Add ":amap", like ":amenu".
@@ -2570,8 +2665,6 @@ Mappings and Abbreviations:
 8   Allow mapping of CTRL-@ (anywhere in the LHS).
 8   Give a warning when using CTRL-C in the lhs of a mapping.  It will never
     (?) work.
-7   ":verbose map" should display where a mapping was defined, like ":verbose
-    set".
 8   Add a way to save a current mapping and restore it later.  Use a function
     that returns the mapping command to restore it: mapcmd()?  mapcheck() is
     not fool proof.  How to handle ambiguous mappings?
@@ -3178,13 +3271,6 @@ Various improvements:
 6   Add ":timer" command, to set a command to be executed at a certain
     interval, or once after some time has elapsed. (Aaron)
 8   Add ":confirm" handling in open_exfile(), for when file already exists.
-8   Use confirm/dialog stuff to ask the user, when a file has changed outside
-    of Vim, if he wants to reload it.  Triggered when focus gained, after
-    shell command, when entering another buffer, etc..
-    Also do this when editing a new file, and another application creates
-    the file before doing ":w" in Vim.
-    Also check if the file protection has changed.  When checking a file into
-    RCS it is made read-only, when checking out it is made read-write.
 8   When quitting with changed files, make the dialog list the changed file
     and allow "write all", "discard all", "write some".  The last one would
     then ask "write" or "discard" for each changed file.  Patch in HierAssist

runtime/doc/uganda.txt

@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.0aa.  Last change: 2005 Feb 24
+*uganda.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -249,10 +249,11 @@ Europe:		Use a bank transfer if possible.  Your bank should have a form
 Credit Card:	You can use PayPal to send money with a Credit card.  This is
 		the most widely used Internet based payment system.  It's
 		really simple to use.  Use this link to find more info:
-			https://www.paypal.com/affil/pal=Bram%40moolenaar.net
+		    https://www.paypal.com/affil/pal=Bram%40iccf-holland.org
 		The e-mail address for sending the money to is:
-			Bram@iccf-holland.org
-		For amounts above $150 sending a cheque is preferred.
+		    Bram@iccf-holland.org
+		For amounts above 400 Euro ($500) sending a cheque is
+		preferred.
 
 Others:		Transfer to one of these accounts if possible:
 		    Postbank, account 4548774

runtime/doc/various.txt

@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0aa.  Last change: 2005 Jun 22
+*various.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -268,6 +268,8 @@ N  *+cmdline_info*	|'showcmd'| and |'ruler'|
 N  *+comments*		|'comments'| support
 N  *+cryptv*		encryption support |encryption|
 B  *+cscope*		|cscope| support
+m  *+cursorshape*	|termcap-cursor-shape| support
+m  *+debug*		Compiled for debugging.
 N  *+dialog_gui*	Support for |:confirm| with GUI dialog.
 N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
@@ -485,6 +487,15 @@ N  *+X11*		Unix only: can restore window title |X11|
 			For logging verbose messages in a file use the
 			'verbosefile' option.
 
+							*:verbose-cmd*
+When 'verbose' is non-zero, listing the value of a Vim option or a key map or
+an abbreviation or a user-defined function or a command or a highlight group
+or an autocommand will also display where it was last defined.  If it was
+defined manually then there will be no "Last set" message.  When it was
+defined while executing a function, user command or autocommand, the script in
+which it was defined is reported.
+{not available when compiled without the +eval feature}
+
 							*K*
 K			Run a program to lookup the keyword under the
 			cursor.  The name of the program is given with the

runtime/doc/version7.txt

@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 27
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Sep 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -28,6 +28,7 @@ Internal grep				|new-vimgrep|
 Scroll back in messages			|new-scroll-back|
 POSIX compatibility			|new-posix|
 Debugger support			|new-debug-support|
+Remote file explorer			|new-netrw-explore|
 Various new items			|new-items-7|
 
 IMPROVEMENTS				|improvements-7|
@@ -62,6 +63,9 @@ In a |literal-string| a single quote can be doubled to get one.
 ":echo 'a''b'" would result in "a b", but now that two quotes stand for one it
 results in "a'b".
 
+When overwriting a file with ":w! fname" there was no warning for when "fname"
+was being edited by another Vim.  Vim now gives an error message |E768|.
+
 
 Minor incompatibilities:
 
@@ -115,6 +119,14 @@ translated to <Home>, both for the keys and for mappings.  Also for <xEnd>,
 When a .gvimrc file exists then 'compatible' is off, just like when a ".vimrc"
 file exists.
 
+When making a string upper-case with "vlllU" or similar then the German sharp
+s is replaced with "SS".  This does not happen with "~" to avoid backwards
+compatibility problems and because "SS" can't be changed back to a sharp s.
+
+"gd" previously found the very first occurrence of a variable in a function,
+that could be the function argument without type.  Now it finds the position
+where the type is given.
+
 ==============================================================================
 NEW FEATURES						*new-7*
 
@@ -238,6 +250,9 @@ is especially useful for commands such as ":syntax", ":autocommand" and
 commands and highlighting is kept.  Only works when the 'more' option is set.
 Previously it only partly worked for ":clist".
 
+The |g<| command can be used to see the last page of messages after you have
+hit <Enter> at the |hit-enter-prompt|.  Then you can scroll further back.
+
 
 POSIX compatibility					*new-posix*
 -------------------
@@ -294,13 +309,29 @@ balloon functionality.  You can use it to show info for the word under the
 mouse pointer.
 
 
+Remote file explorer					*new-netrw-explore*
+--------------------
+
+The netrw plugin now also supports viewing a directory, when "scp://" is used.
+Deleting and renaming files is possible.
+
+To avoid duplicating a lot of code, the previous file explorer plugin has been
+integrated in the netrw plugin.  This means browsing local and remote files
+works the same way.
+
+":browse edit" and ":browse split" use the netrw plugin when it's available
+and a GUI dialog is not possible.
+
+The netrw plugin is maintained by Charles Campbell.
+
+
 Various new items					*new-items-7*
 -----------------
 
 Normal mode commands: ~
 
 a", a' and a`		New text objects to select quoted strings. |a'|
-i", i' and i'		(Taro Muraoka)
+i", i' and i`		(Taro Muraoka)
 
 CTRL-W <Enter>		In the quickfix window: opens a new window to show the
 			location of the error under the cursor.
@@ -308,6 +339,11 @@ CTRL-W <Enter>		In the quickfix window: opens a new window to show the
 |at| and |it| text objects select a block of text between HTML or XML tags.
 
 
+Insert mode commands: ~
+
+CTRL-\ CTRL-O		Execute a Normal mode command.  Like CTRL-O but
+			without moving the cursor.
+
 Options: ~
 
 'completefunc'		The name of a function used for user-specified Insert
@@ -376,6 +412,8 @@ New functions: ~
 |browsedir()|		dialog to select a directory
 |byteidx()| 		index of a character (Ilya Sher)
 |call()|		call a function with List as arguments
+|complete_add()|	add match for 'completefunc'
+|complete_check()|	check for key pressed, for 'completefunc'
 |copy()|		make a shallow copy of a List or Dictionary
 |count()|		count nr of times a value is in a List or Dictionary
 |deepcopy()|		make a full copy of a List or Dictionary
@@ -406,6 +444,7 @@ New functions: ~
 |max()|			maximum value in a List or Dictionary
 |min()|			minimum value in a List or Dictionary
 |mkdir()|		create a directory
+|printf()|		format text
 |readfile()|		read a file into a list of lines
 |remove()|		remove one or more items from a List or Dictionary
 |repeat()| 		repeat "expr" "count" times (Christophe Poucet)
@@ -517,9 +556,6 @@ Mac: better integration with Xcode.  Post a fake mouse-up event after the odoc
 event and the drag receive handler to work around a stall after Vim loads a
 file.  Fixed an off-by-one line number error. (Da Woon Jung)
 
-The netrw plugin now also supports viewing a directory, when "scp://" is used.
-Deleting and renaming files is possible.  (Charles Campbell)
-
 Added the t_SI and t_EI escape sequences for starting and ending Insert mode.
 To be used to set the cursor shape to a bar or a block.  No default values,
 they are not supported by termcap/terminfo.
@@ -531,6 +567,14 @@ when the buffer does not have a name or no specific name.  See
 For xterm most combinations of modifiers with function keys are recognized.
 |xterm-modifier-keys|
 
+When 'verbose' is set the output of ":highlight" will show where a highlight
+item was last set.
+When 'verbose' is set the output of the ":map", ":abbreviate", ":command",
+":function" and ":autocmd" commands will show where it was last defined.
+(Yegappan Lakshmanan)
+
+":function /pattern" lists functions matching the pattern.
+
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
 
@@ -712,6 +756,7 @@ pointer position instead of the text cursor.
 The table with encodings has been expanded with many MS-Windows codepages,
 such as cp1250 and cp737, so that these can also be used on Unix without
 prepending "8bit-".
+When an encoding name starts with "microsoft-cp" ignore the "microsoft-" part.
 
 Added the "customlist" completion argument to a user-defined command.  The
 user-defined completion function should return the completion candidates as a
@@ -724,6 +769,23 @@ Win32: Balloons can have multiple lines if common controls supports it.
 The 's' flag is added to the search() and searchpair() function to set the
 ' mark if the cursor is moved. (Yegappan Lakshmanan)
 
+For 'errorformat' it was not possible to have a file name that contains the
+character that follows after "%f".  For example, in "%f:%l:%m" the file name
+could not contain ":".  Now include the first ":" where the rest of the
+pattern matches.  In the example a ":" not followed by a line number is
+included in the file name. (suggested by Emanuele Giaquinta)
+
+For command-line completion the matches for various types of arguments are now
+sorted: user commands, variables, syntax names, etc.
+
+When no locale is set, thus using the "C" locale, Vim will work with latin1
+characters, using it's own isupper()/toupper()/etc. functions.
+
+When using an rxvt terminal emulator guess the value of 'background' using the
+COLORFGBG environment variable. (Ciaran McCreesh)
+
+Also support t_SI and t_EI on Unix with normal features. (Ciaran McCreesh)
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
@@ -755,6 +817,10 @@ functions.
 Moved unix_expandpath() to misc1.c, so that it can also be used by os_mac.c
 without copying the code.
 
+Mac: When running "make install" the runtime files are installed as for Unix.
+Avoids that too many files are copied.  When running "make" a link to the
+runtime files is created to avoid a recursive copy that takes much time.
+
 ==============================================================================
 BUG FIXES						*bug-fixes-7*
 
@@ -811,7 +877,8 @@ When converting a string with a hex or octal number the leading '-' was
 ignored.  ":echo '-05' + 0" resulted in 5 instead of -5.
 
 Using "@:" to repeat a command line didn't work when it contains control
-characters.
+characters.  Also remove "'<,'>" when in Visual mode to avoid that it appears
+twice.
 
 When using file completion for a user command, it would not expand environment
 variables like for a regular command with a file argument.
@@ -1240,4 +1307,20 @@ At the more-prompt the last character in the last line wasn't drawn.
 When deleting non-existing text while 'virtualedit' is set the '[ and '] marks
 were not set.
 
+Win32: Could not use "**/" in 'path', it had to be "**\".
+
+The search pattern "\n" did not match at the end of the last line.
+
+Searching for a pattern backwards, starting on the NUL at the end of the line
+and 'encoding' is "utf-8" would match the pattern just before it incorrectly.
+Affected searchpair('/\*', '', '\*/').
+
+For the Find/Replace dialog it was possible that not finding the text resulted
+in an error message while redrawing, which cleared the syntax highlighting
+while it was being used, resulting in a crash.  Now don't clear syntax
+highlighting, disable it with b_syn_error.
+
+Win32: Combining UTF-8 characters were drawn on the previous character.
+Could be noticed with a Thai font.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jul 13
+" Last Change:	2005 Aug 29
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -629,8 +629,8 @@ au BufNewFile,BufRead *.hex,*.h32		setf hex
 " Tilde (must be before HTML)
 au BufNewFile,BufRead *.t.html			setf tilde
 
-" HTML (.shtml and .stm for server side, .rhtml for Ruby html)
-au BufNewFile,BufRead *.html,*.htm,*.shtml,*.rhtml,*.stm  call s:FThtml()
+" HTML (.shtml and .stm for server side)
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call s:FThtml()
 
 " Distinguish between HTML and XHTML
 fun! s:FThtml()
@@ -645,6 +645,8 @@ fun! s:FThtml()
   setf html
 endfun
 
+" HTML with Ruby - eRuby
+au BufNewFile,BufRead *.rhtml			setf eruby
 
 " HTML with M4
 au BufNewFile,BufRead *.html.m4			setf htmlm4
@@ -823,7 +825,7 @@ au BufNewFile,BufRead *.m4
 au BufNewFile,BufRead *.mgp			setf mgp
 
 " Mail (for Elm, trn, mutt, rn, slrn)
-au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt-*-\w\+,mutt\w\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
+au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt\w\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
 
 " Mailcap configuration file
 au BufNewFile,BufRead .mailcap,mailcap		setf mailcap
@@ -953,8 +955,8 @@ au BufRead,BufNewFile *.mu			setf mupad
 au BufNewFile,BufRead *.mush			setf mush
 
 " Mutt setup file
-au BufNewFile,BufRead Muttrc			setf muttrc
-au BufNewFile,BufRead .muttrc*,*/.mutt/muttrc*	call s:StarSetf('muttrc')
+au BufNewFile,BufRead Mutt{ng,}rc			setf muttrc
+au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
 
 " Nano
 au BufNewFile,BufRead /etc/nanorc,.nanorc	setf nanorc
@@ -1198,7 +1200,7 @@ function! s:FTprogress_asm()
   " This function checks for an assembly comment the first ten lines.
   " If not found, assume Progress.
   let lnum = 1
-  while lnum <= 10
+  while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
     if line =~ '^\s*;' || line =~ '^\*'
       call s:FTasm()
@@ -1225,9 +1227,9 @@ function! s:FTprogress_pascal()
   " Look for either an opening comment or a program start.
   " If not found, assume Progress.
   let lnum = 1
-  while lnum <= 10
+  while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
-    if line =~ '^\s*\(program\|procedure\|function\|const\|type\|var\)\>'
+    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
 	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
       setf pascal
       return
@@ -1700,6 +1702,9 @@ au BufNewFile,BufRead /etc/updatedb.conf	setf updatedb
 " Verilog HDL
 au BufNewFile,BufRead *.v			setf verilog
 
+" Verilog-AMS HDL
+au BufNewFile,BufRead *.va,*.vams		setf verilogams
+
 " VHDL
 au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst  setf vhdl
 au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
@@ -1829,8 +1834,13 @@ au BufNewFile,BufRead *.y			call s:FTy()
 
 fun! s:FTy()
   let n = 1
-  while n < 10 && n < line("$")
-    if getline(n) =~ '^\s*\(#\|class\>\)'
+  while n < 100 && n < line("$")
+    let line = getline(n)
+    if line =~ '^\s*%'
+      setf yacc
+      return
+    endif
+    if getline(n) =~ '^\s*\(#\|class\>\)' && getline(n) !~ '^\s*#\s*include'
       setf racc
       return
     endif
@@ -1921,7 +1931,7 @@ au BufNewFile,BufRead /etc/modprobe.*		call s:StarSetf('modconf')
 au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
 
 " Mutt setup file
-au BufNewFile,BufRead muttrc*,Muttrc*		call s:StarSetf('muttrc')
+au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
 
 " Nroff macros
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')

runtime/ftplugin/c.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 22
+" Last Change:	2005 Sep 01
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,12 +15,17 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo-=C
 
-let b:undo_ftplugin = "setl fo< com< | if has('vms') | setl isk< | endif"
+let b:undo_ftplugin = "setl fo< com< ofu< | if has('vms') | setl isk< | endif"
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
 setlocal fo-=t fo+=croql
 
+" Set completion with CTRL-X CTRL-O to autoloaded function.
+if exists('&ofu')
+  setlocal ofu=ccomplete#Complete
+endif
+
 " Set 'comments' to format dashed lists in comments.
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 

runtime/ftplugin/debchangelog.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Debian Changelog
 " Maintainer:	Michael Piefel <piefel@informatik.hu-berlin.de>
-" Last Change:	23 March 2004
+" Last Change:	15 August 2005
 
 if exists("g:did_changelog_ftplugin")
   finish
@@ -30,7 +30,7 @@ function <SID>Email()
     elseif exists("$EMAIL")
 	return $EMAIL
     elseif exists("g:debianemail")
-	return g:debianfullemail
+	return g:debianemail
     else
 	return "your@email.address"
     endif

runtime/ftplugin/verilog.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Verilog HDL
 " Maintainer:	Chih-Tsun Huang <cthuang@larc.ee.nthu.edu.tw>
-" Last Change:	Wed Oct 31 16:16:19 CST 2001
+" Last Change:	Mon Sep  5 11:05:54 CST 2005
 " URL:		http://larc.ee.nthu.edu.tw/~cthuang/vim/ftplugin/verilog.vim
 
 " Only do this when not done yet for this buffer
@@ -12,6 +12,10 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
+" Undo the plugin effect
+let b:undo_ftplugin = "setlocal fo< com< tw<"
+    \ . "| unlet b:browsefilter b:match_ignorecase b:match_words"
+
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
 setlocal fo-=t fo+=croqlm1
@@ -20,7 +24,9 @@ setlocal fo-=t fo+=croqlm1
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 
 " Format comments to be up to 78 characters long
-setlocal tw=75
+if &textwidth == 0 
+  setlocal tw=78
+endif
 
 set cpo-=C
 

runtime/indent/php.vim

@@ -2,7 +2,7 @@
 " Language:	PHP
 " Author:	John Wellesz <John.wellesz (AT) teaser (DOT) fr>
 " URL:		http://www.2072productions.com/vim/indent/php.vim
-" Last Change: 2005 June 30th
+" Last Change: 2005 Aug 15
 " Version: 1.17
 "
 " For a complete change log and lots of comments in the code, download the script on

runtime/lang/menu_it_it.latin1.vim

@@ -1,7 +1,7 @@
 " Menu Translations:	Italian / Italiano
 " Maintainer:		Antonio Colombo <azc10@yahoo.com>
 "			Vlad Sandrini <sator72@libero.it>
-" Last Change:	2005 Mar 16
+" Last Change:	2005 Aug 13
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -159,6 +159,26 @@ menut &Jump\ to\ this\ tag<Tab>g^]	&Vai\ a\ questa\ Tag<Tab>g^]
 menut Jump\ &back<Tab>^T		Torna\ &indietro<Tab>^T
 menut Build\ &Tags\ File		Costruisci\ File\ &Tags\
 
+" Menu ortografia / Spelling
+menut &Spelling			&Ortografia
+
+menut &Spell\ Check\ On			Attiva\ &Controllo\ ortografico
+menut Spell\ Check\ &Off		&Disattiva\ controllo\ ortografico
+menut To\ &Next\ error<Tab>]s		Errore\ &Seguente<tab>]s
+menut To\ &Previous\ error<Tab>[s	Errore\ &Precedente<tab>[s
+menut Suggest\ &Corrections<Tab>z?	&Suggerimenti<Tab>z?
+menut &Repeat\ correction<Tab>:spellrepall	&Ripeti\ correzione<Tab>:spellrepall
+menut Set\ language\ to\ "en"		Imposta\ lingua\ a\ "en"
+menut Set\ language\ to\ "en_au"	Imposta\ lingua\ a\ "en_au"
+menut Set\ language\ to\ "en_ca"	Imposta\ lingua\ a\ "en_ca"
+menut Set\ language\ to\ "en_gb"	Imposta\ lingua\ a\ "en_gb"
+menut Set\ language\ to\ "en_nz"	Imposta\ lingua\ a\ "en_nz"
+menut Set\ language\ to\ "en_us"	Imposta\ lingua\ a\ "en_us"
+menut Set\ language\ to\ "it"		Imposta\ lingua\ a\ "it"
+menut Set\ language\ to\ "it_it"	Imposta\ lingua\ a\ "it_it"
+menut Set\ language\ to\ "it_ch"	Imposta\ lingua\ a\ "it_ch"
+menut &Find\ More\ Languages		&Trova\ altre\ lingue
+
 " Menu piegature / Fold
 if has("folding")
   menut &Folding					&Piegature
@@ -212,7 +232,7 @@ menut &Close<Tab>:cclose	&Chiudi<Tab>:cclose
 menut &Convert\ to\ HEX<Tab>:%!xxd	&Converti\ a\ Esadecimale<Tab>:%!xxd
 menut Conve&rt\ back<Tab>:%!xxd\ -r	Conve&rti\ da\ Esadecimale<Tab>:%!xxd\ -r
 
-menut &Set\ Compiler		Impo&sta\ Compilatore
+menut &SeT\ Compiler		Impo&sta\ Compilatore
 
 " Buffers / Buffer
 menut &Buffers		&Buffer

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 Jul 22
+" Last Change:	2005 Aug 16
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -198,10 +198,10 @@ an 20.405	 &Edit.-SEP2-				<Nop>
 if has("win32")  || has("win16") || has("gui_gtk") || has("gui_kde") || has("gui_motif")
   an 20.410	 &Edit.&Find\.\.\.			:promptfind<CR>
   vunmenu	 &Edit.&Find\.\.\.
-  vnoremenu	 &Edit.&Find\.\.\.			y:promptfind <C-R>"<CR>
+  vnoremenu <silent>	 &Edit.&Find\.\.\.			y:call <SID>FixFText()<CR>:promptfind <C-R>"<CR>
   an 20.420	 &Edit.Find\ and\ Rep&lace\.\.\.	:promptrepl<CR>
   vunmenu	 &Edit.Find\ and\ Rep&lace\.\.\.
-  vnoremenu	 &Edit.Find\ and\ Rep&lace\.\.\.	y:promptrepl <C-R>"<CR>
+  vnoremenu <silent>	 &Edit.Find\ and\ Rep&lace\.\.\.	y:call <SID>FixFText()<CR>:promptrepl <C-R>"<CR>
 else
   an 20.410	 &Edit.&Find<Tab>/			/
   an 20.420	 &Edit.Find\ and\ Rep&lace<Tab>:%s	:%s/
@@ -212,6 +212,11 @@ endif
 an 20.425	 &Edit.-SEP3-				<Nop>
 an 20.430	 &Edit.Settings\ &Window		:options<CR>
 
+fun! s:FixFText()
+  " Fix text in nameless register to be used with :promptfind.
+  let @" = substitute(@", "[\r\n]", '\\n', 'g')
+endfun
+
 " Edit/Global Settings
 an 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	:set hls! hls?<CR>
 an 20.440.110 &Edit.&Global\ Settings.Toggle\ &Ignore-case<Tab>:set\ ic!	:set ic! ic?<CR>
@@ -424,22 +429,30 @@ if has("spell")
   an 40.335.260 &Tools.&Spelling.Set\ language\ to\ "en_us"	:set spl=en_us spell<CR>
   an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages	:call <SID>SpellLang()<CR>
 
+  let s:undo_spellang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
   func! s:SpellLang()
-    silent! aun &Tools.&Spelling.&Find\ More\ Languages
+    for cmd in s:undo_spellang
+      exe "silent! " . cmd
+    endfor
+    let s:undo_spellang = []
+
     if &enc == "iso-8859-15"
       let enc = "latin1"
     else
       let enc = &enc
     endif
+
     let found = 0
     let s = globpath(&rtp, "spell/*." . enc . ".spl")
     if s != ""
       let n = 300
       for f in split(s, "\n")
 	let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
-	if nm != "en"
-	  exe 'an 40.335.' . n . ' &Tools.&Spelling.Set\ language\ to\ "' . nm . '" :set spl=' . nm . ' spell<CR>'
+	if nm != "en" && nm !~ '/'
 	  let found += 1
+	  let menuname = '&Tools.&Spelling.Set\ language\ to\ "' . nm . '"'
+	  exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
+	  let s:undo_spellang += ['aun ' . menuname]
 	endif
 	let n += 10
       endfor
@@ -451,6 +464,10 @@ if has("spell")
     else
       echomsg "Found " . found . " more spell files"
     endif
+    " Need to redo this when 'encoding' is changed.
+    augroup spellmenu
+    au! EncodingChanged * call <SID>SpellLang()
+    augroup END
   endfun
 
 endif

runtime/optwin.vim

@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jul 11
+" Last Change:	2005 Sep 01
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -403,6 +403,8 @@ if has("syntax")
   call <SID>OptionL("spc")
   call append("$", "spellsuggest\tmethods used to suggest corrections")
   call <SID>OptionG("sps", &sps)
+  call append("$", "mkspellmem\tamount of memory used by :mkspell before compressing")
+  call <SID>OptionG("msm", &msm)
 endif
 
 
@@ -702,6 +704,9 @@ if has("insert_expand")
   call append("$", "completefunc\tuser defined function for Insert mode completion")
   call append("$", "\t(local to buffer)")
   call <SID>OptionL("cfu")
+  call append("$", "occultfunc\tfunction for filetype-specific Insert mode completion")
+  call append("$", "\t(local to buffer)")
+  call <SID>OptionL("ofu")
   call append("$", "dictionary\tlist of dictionary files for keyword completion")
   call append("$", "\t(global or local to buffer)")
   call <SID>OptionG("dict", &dict)

runtime/plugin/NetrwFileHandlers.vim

@@ -1,30 +1,49 @@
 " NetrwFileHandlers: contains various extension-based file handlers for
 "                    netrw's browsers' x command ("eXecute launcher")
-" Author:   Charles E. Campbell, Jr.
-" Date:     Aug 31, 2004
-" Version:  3
+" Author:	Charles E. Campbell, Jr.
+" Date:		Aug 15, 2005
+" Version:	6
+" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               NetrwFileHandlers.vim is provided *as is* and comes with no
+"               warranty of any kind, either expressed or implied. In no
+"               event will the copyright holder be liable for any damages
+"               resulting from the use of this software.
+"
+" Rom 6:23 (WEB) For the wages of sin is death, but the free gift of God {{{1
+"                is eternal life in Christ Jesus our Lord.
 
 " ---------------------------------------------------------------------
-" Prevent Reloading: {{{1
-if exists("g:loaded_netrwfilehandlers") || &cp
-  finish
+" Load Once: {{{1
+if exists("g:loaded_NetrwFileHandlers") || &cp
+ finish
 endif
-let g:loaded_netrwfilehandlers= "v3"
+let s:keepcpo= &cpo
+set cpo&vim
+let g:loaded_NetrwFileHandlers= "v6"
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_html: handles html when the user hits "x" when the {{{1
 "                        cursor is atop a *.html file
 fun! NetrwFileHandler_html(pagefile)
-  let page = substitute(a:pagefile, '^', 'file://', '')
+"  call Dfunc("NetrwFileHandler_html(".a:pagefile.")")
+
+  let page= substitute(a:pagefile,'^','file://','')
 
   if executable("mozilla")
-    exe "!mozilla \"" . page . '"'
+"   call Decho("executing !mozilla ".page)
+   exe "!mozilla \"".page.'"'
   elseif executable("netscape")
-    exe "!netscape \"" . page . '"'
+"   call Decho("executing !netscape ".page)
+   exe "!netscape \"".page.'"'
   else
-    return 0
+"   call Dret("NetrwFileHandler_html 0")
+   return 0
   endif
 
+"  call Dret("NetrwFileHandler_html 1")
   return 1
 endfun
 
@@ -32,192 +51,225 @@ endfun
 " NetrwFileHandler_htm: handles html when the user hits "x" when the {{{1
 "                        cursor is atop a *.htm file
 fun! NetrwFileHandler_htm(pagefile)
-  let page = substitute(a:pagefile, '^', 'file://', '')
+"  call Dfunc("NetrwFileHandler_htm(".a:pagefile.")")
+
+  let page= substitute(a:pagefile,'^','file://','')
 
   if executable("mozilla")
-    exe "!mozilla \"" . page . '"'
+"   call Decho("executing !mozilla ".page)
+   exe "!mozilla \"".page.'"'
   elseif executable("netscape")
-    exe "!netscape \"" . page . '"'
+"   call Decho("executing !netscape ".page)
+   exe "!netscape \"".page.'"'
   else
-    return 0
+"   call Dret("NetrwFileHandler_htm 0")
+   return 0
   endif
 
+"  call Dret("NetrwFileHandler_htm 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_jpg: {{{1
 fun! NetrwFileHandler_jpg(jpgfile)
+"  call Dfunc("NetrwFileHandler_jpg(jpgfile<".a:jpgfile.">)")
+
   if executable("gimp")
-    exe "silent! !gimp -s " . a:jpgfile
+   exe "silent! !gimp -s ".a:jpgfile
   elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-    exe "!" . expand("$SystemRoot") . "/SYSTEM32/MSPAINT \"" . a:jpgfile . '"'
+"   call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'"))
+   exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:jpgfile.'"'
   else
-    return 0
+"   call Dret("NetrwFileHandler_jpg 0")
+   return 0
   endif
 
+"  call Dret("NetrwFileHandler_jpg 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_gif: {{{1
 fun! NetrwFileHandler_gif(giffile)
+"  call Dfunc("NetrwFileHandler_gif(giffile<".a:giffile.">)")
+
   if executable("gimp")
-   exe "silent! !gimp -s " . a:giffile
-  elseif executable(expand("$SystemRoot") . "/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !" . expand("$SystemRoot") . "/SYSTEM32/MSPAINT \"" . a:giffile . '"'
+   exe "silent! !gimp -s ".a:giffile
+  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:giffile.'"'
   else
+"   call Dret("NetrwFileHandler_gif 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_gif 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_png: {{{1
 fun! NetrwFileHandler_png(pngfile)
+"  call Dfunc("NetrwFileHandler_png(pngfile<".a:pngfile.">)")
+
   if executable("gimp")
-   exe "silent! !gimp -s " . a:pngfile
-  elseif executable(expand("$SystemRoot") . "/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !" . expand("$SystemRoot") . "/SYSTEM32/MSPAINT \"" . a:pngfile . '"'
+   exe "silent! !gimp -s ".a:pngfile
+  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pngfile.'"'
   else
+"   call Dret("NetrwFileHandler_png 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_png 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_pnm: {{{1
 fun! NetrwFileHandler_pnm(pnmfile)
+"  call Dfunc("NetrwFileHandler_pnm(pnmfile<".a:pnmfile.">)")
+
   if executable("gimp")
-   exe "silent! !gimp -s " . a:pnmfile
-  elseif executable(expand("$SystemRoot") . "/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !" . expand("$SystemRoot") . "/SYSTEM32/MSPAINT \"" . a:pnmfile . '"'
+   exe "silent! !gimp -s ".a:pnmfile
+  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:pnmfile.'"'
   else
+"   call Dret("NetrwFileHandler_pnm 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_pnm 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_bmp: visualize bmp files {{{1
 fun! NetrwFileHandler_bmp(bmpfile)
+"  call Dfunc("NetrwFileHandler_bmp(bmpfile<".a:bmpfile.">)")
+
   if executable("gimp")
-   exe "silent! !gimp -s " . a:bmpfile
+   exe "silent! !gimp -s ".a:bmpfile
   elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
-   exe "silent! !" . expand("$SystemRoot") . "/SYSTEM32/MSPAINT \"" . a:bmpfile . '"'
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:bmpfile.'"'
   else
+"   call Dret("NetrwFileHandler_bmp 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_bmp 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_pdf: visualize pdf files {{{1
 fun! NetrwFileHandler_pdf(pdf)
-  if executable("acroread")
-   exe 'silent! !acroread "' . a:pdf . '"'
-  elseif executable("gs")
-   exe 'silent! !gs "' . a:pdf . '"'
-  else
-   return 0
-  endif
-
-  return 1
-endfun
-
-" ---------------------------------------------------------------------
-" NetrwFileHandler_sxw: visualize sxw files {{{1
-fun! NetrwFileHandler_sxw(sxw)
+"  " call Dfunc("NetrwFileHandler_pdf(pdf<".a:pdf.">)")
   if executable("gs")
-   exe 'silent! !gs "' . a:sxw . '"'
+   exe 'silent! !gs "'.a:pdf.'"'
   else
+"   " call Dret("NetrwFileHandler_pdf 0")
    return 0
   endif
 
+"  " call Dret("NetrwFileHandler_pdf 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_doc: visualize doc files {{{1
 fun! NetrwFileHandler_doc(doc)
+"  " call Dfunc("NetrwFileHandler_doc(doc<".a:doc.">)")
+
   if executable("oowriter")
-   exe 'silent! !oowriter "' . a:doc . '"'
+   exe 'silent! !oowriter "'.a:doc.'"'
    redraw!
   else
+"   " call Dret("NetrwFileHandler_doc 0")
    return 0
   endif
 
+"  " call Dret("NetrwFileHandler_doc 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_sxw: visualize sxw files {{{1
 fun! NetrwFileHandler_sxw(sxw)
+"  " call Dfunc("NetrwFileHandler_sxw(sxw<".a:sxw.">)")
+
   if executable("oowriter")
-   exe 'silent! !oowriter "' . a:sxw . '"'
+   exe 'silent! !oowriter "'.a:sxw.'"'
    redraw!
   else
+"   " call Dret("NetrwFileHandler_sxw 0")
    return 0
   endif
 
+"  " call Dret("NetrwFileHandler_sxw 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_xls: visualize xls files {{{1
 fun! NetrwFileHandler_xls(xls)
+"  " call Dfunc("NetrwFileHandler_xls(xls<".a:xls.">)")
+
   if executable("oocalc")
-   exe 'silent! !oocalc "' . a:xls . '"'
+   exe 'silent! !oocalc "'.a:xls.'"'
    redraw!
   else
+"   " call Dret("NetrwFileHandler_xls 0")
    return 0
   endif
 
+"  " call Dret("NetrwFileHandler_xls 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_ps: handles PostScript files {{{1
 fun! NetrwFileHandler_ps(ps)
+"  call Dfunc("NetrwFileHandler_ps()")
   if executable("gs")
-   exe "silent! !gs " . a:ps
+   exe "silent! !gs ".a:ps
    redraw!
   elseif executable("ghostscript")
-   exe "silent! !ghostscript " . a:ps
+   exe "silent! !ghostscript ".a:ps
    redraw!
   elseif executable("ghostscript")
-   exe "silent! !ghostscript " . a:ps
+   exe "silent! !ghostscript ".a:ps
    redraw!
   elseif executable("gswin32")
-   exe "silent! !gswin32 \"" . a:ps . '"'
+   exe "silent! !gswin32 \"".a:ps.'"'
    redraw!
   else
+"   call Dret("NetrwFileHandler_ps 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_ps 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_eps: handles encapsulated PostScript files {{{1
 fun! NetrwFileHandler_eps(eps)
+"  call Dfunc("NetrwFileHandler_ps()")
   if executable("gs")
-   exe "silent! !gs " . a:eps
+   exe "silent! !gs ".a:eps
    redraw!
   elseif executable("ghostscript")
-   exe "silent! !ghostscript " . a:eps
+   exe "silent! !ghostscript ".a:eps
    redraw!
   elseif executable("ghostscript")
-   exe "silent! !ghostscript " . a:eps
+   exe "silent! !ghostscript ".a:eps
    redraw!
   elseif executable("gswin32")
-   exe "silent! !gswin32 \"" . a:eps . '"'
+   exe "silent! !gswin32 \"".a:eps.'"'
    redraw!
   else
+"   call Dret("NetrwFileHandler_ps 0")
    return 0
   endif
 endfun
@@ -225,29 +277,36 @@ endfun
 " ---------------------------------------------------------------------
 " NetrwFileHandler_fig: handles xfig files {{{1
 fun! NetrwFileHandler_fig(fig)
+"  call Dfunc("NetrwFileHandler_fig()")
   if executable("xfig")
-   exe "silent! !xfig " . a:fig
+   exe "silent! !xfig ".a:fig
    redraw!
   else
+"   call Dret("NetrwFileHandler_fig 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_fig 1")
   return 1
 endfun
 
 " ---------------------------------------------------------------------
 " NetrwFileHandler_obj: handles tgif's obj files {{{1
 fun! NetrwFileHandler_obj(obj)
+"  call Dfunc("NetrwFileHandler_obj()")
   if has("unix") && executable("tgif")
-   exe "silent! !tgif " . a:obj
+   exe "silent! !tgif ".a:obj
    redraw!
   else
+"   call Dret("NetrwFileHandler_obj 0")
    return 0
   endif
 
+"  call Dret("NetrwFileHandler_obj 1")
   return 1
 endfun
 
-
+let &cpo= s:keepcpo
 " ---------------------------------------------------------------------
-"  vim: fdm=marker
+"  Modelines: {{{1
+"  vim: ts=4 fdm=marker

runtime/plugin/NetrwPlugin.vim

@@ -0,0 +1,156 @@
+" netrw.vim: Handles file transfer and remote directory listing across a network
+"            PLUGIN PORTION
+" Last Change:	Aug 17, 2005
+" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version:	65a	ASTRO-ONLY
+" License:	Vim License  (see vim's :help license)
+" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
+" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               netrw.vim is provided *as is* and comes with no warranty
+"               of any kind, either expressed or implied. By using this
+"               plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+"
+"  But be doers of the Word, and not only hearers, deluding your own selves {{{1
+"  (James 1:22 RSV)
+" =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+if exists("g:loaded_netrw") || &cp
+  finish
+endif
+if v:version < 600
+ echoerr "***netrw*** doesn't support Vim version ".v:version
+ finish
+endif
+let g:loaded_netrw  = "v65a"
+if v:version < 700
+ let loaded_explorer = 1
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" ---------------------------------------------------------------------
+" Public Interface: {{{1
+
+" Local Browsing: {{{2
+augroup FileExplorer
+ au!
+ au BufEnter * call s:LocalBrowse(expand("<amatch>"))
+augroup END
+
+" Network Browsing Reading Writing: {{{2
+augroup Network
+ au!
+ if has("win32") || has("win95") || has("win64") || has("win16")
+  au BufReadCmd  file://*		exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e '.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ else
+  au BufReadCmd  file:///*		exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+  au BufReadCmd  file://localhost/*	exe "silent doau BufReadPre ".expand("<amatch>")|exe 'e /'.substitute(expand("<amatch>"),"file:/*","","")|exe "silent doau BufReadPost ".expand("<amatch>")
+ endif
+ au BufReadCmd   ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://*	exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread 0r ".expand("<amatch>")|exe "silent doau BufReadPost ".expand("<amatch>")
+ au FileReadCmd  ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://*	exe "silent doau BufReadPre ".expand("<amatch>")|exe "Nread "   .expand("<amatch>")|exe "silent doau FileReadPost ".expand("<amatch>")
+ au BufWriteCmd  ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://*    	exe "silent doau BufWritePre ".expand("<amatch>")|exe "Nwrite " .expand("<amatch>")|exe "silent doau BufWritePost ".expand("<amatch>")
+ au FileWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://*    	exe "silent doau BufWritePre ".expand("<amatch>")|exe "'[,']Nwrite " .expand("<amatch>")|exe "silent doau FileWritePost ".expand("<amatch>")
+augroup END
+
+" Commands: :Nread, :Nwrite, :NetUserPass {{{2
+com! -nargs=*		Nread		call netrw#NetSavePosn()<bar>call netrw#NetRead(<f-args>)<bar>call netrw#NetRestorePosn()
+com! -range=% -nargs=*	Nwrite		call netrw#NetSavePosn()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call netrw#NetRestorePosn()
+com! -nargs=*		NetUserPass	call NetUserPass(<f-args>)
+
+" Commands: :Explore, :Sexplore, Hexplore, Vexplore {{{2
+com! -nargs=? -bar -bang -count=0  	Explore		call netrw#Explore(<count>,0,0+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0  	Sexplore	call netrw#Explore(<count>,1,0+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0  	Hexplore	call netrw#Explore(<count>,1,2+<bang>0,<q-args>)
+com! -nargs=? -bar -bang -count=0  	Vexplore	call netrw#Explore(<count>,1,4+<bang>0,<q-args>)
+com! -nargs=? -bar -bang   		Nexplore	call netrw#Explore(-1,0,0,<q-args>)
+com! -nargs=? -bar -bang   		Pexplore	call netrw#Explore(-2,0,0,<q-args>)
+
+" Commands: NetrwSettings {{{2
+com! -nargs=0 NetrwSettings :call NetrwSettings#NetrwSettings()
+
+" ---------------------------------------------------------------------
+" LocalBrowse: {{{2
+fun! s:LocalBrowse(dirname)
+  " unfortunate interaction -- debugging calls can't be used here;
+  " the BufEnter event causes triggering when attempts to write to
+  " the DBG buffer are made.
+  if isdirectory(a:dirname)
+   call netrw#DirBrowse(a:dirname)
+  endif
+  " not a directory, ignore it
+endfun
+
+" ---------------------------------------------------------------------
+" NetrwStatusLine: {{{1
+fun! NetrwStatusLine()
+"  let g:stlmsg= "Xbufnr=".w:netrw_explore_bufnr." bufnr=".bufnr(".")." Xline#".w:netrw_explore_line." line#".line(".")
+  if !exists("w:netrw_explore_bufnr") || w:netrw_explore_bufnr != bufnr(".") || !exists("w:netrw_explore_line") || w:netrw_explore_line != line(".") || !exists("w:netrw_explore_list")
+   let &stl= s:netrw_explore_stl
+   if exists("w:netrw_explore_bufnr")|unlet w:netrw_explore_bufnr|endif
+   if exists("w:netrw_explore_line")|unlet w:netrw_explore_line|endif
+   return ""
+  else
+   return "Match ".w:netrw_explore_mtchcnt." of ".w:netrw_explore_listlen
+  endif
+endfun
+
+" ------------------------------------------------------------------------
+" NetUserPass: set username and password for subsequent ftp transfer {{{1
+"   Usage:  :call NetUserPass()			-- will prompt for userid and password
+"	    :call NetUserPass("uid")		-- will prompt for password
+"	    :call NetUserPass("uid","password") -- sets global userid and password
+fun! NetUserPass(...)
+
+ " get/set userid
+ if a:0 == 0
+"  call Dfunc("NetUserPass(a:0<".a:0.">)")
+  if !exists("g:netrw_uid") || g:netrw_uid == ""
+   " via prompt
+   let g:netrw_uid= input('Enter username: ')
+  endif
+ else	" from command line
+"  call Dfunc("NetUserPass(a:1<".a:1.">) {")
+  let g:netrw_uid= a:1
+ endif
+
+ " get password
+ if a:0 <= 1 " via prompt
+"  call Decho("a:0=".a:0." case <=1:")
+  let g:netrw_passwd= inputsecret("Enter Password: ")
+ else " from command line
+"  call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
+  let g:netrw_passwd=a:2
+ endif
+"  call Dret("NetUserPass")
+endfun
+
+" ------------------------------------------------------------------------
+" NetReadFixup: this sort of function is typically written by the user {{{1
+"               to handle extra junk that their system's ftp dumps
+"               into the transfer.  This function is provided as an
+"               example and as a fix for a Windows 95 problem: in my
+"               experience, win95's ftp always dumped four blank lines
+"               at the end of the transfer.
+if has("win95") && g:netrw_win95ftp
+ fun! NetReadFixup(method, line1, line2)
+"   call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
+   if method == 3   " ftp (no <.netrc>)
+    let fourblanklines= line2 - 3
+    silent fourblanklines.",".line2."g/^\s*/d"
+   endif
+"   call Dret("NetReadFixup")
+ endfun
+endif
+
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" ------------------------------------------------------------------------
+" Modelines: {{{1
+" vim:ts=8 fdm=marker

runtime/plugin/NetrwSettings.vim

@@ -0,0 +1,157 @@
+" NetrwSettings.vim: makes netrw settings simpler
+" Last Change:	Aug 16, 2005
+" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" Version:		3
+" Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
+"               Permission is hereby granted to use and distribute this code,
+"               with or without modifications, provided that this copyright
+"               notice is copied with it. Like anything else that's free,
+"               NetrwSettings.vim is provided *as is* and comes with no
+"               warranty of any kind, either expressed or implied. By using
+"               this plugin, you agree that in no event will the copyright
+"               holder be liable for any damages resulting from the use
+"               of this software.
+"
+" Mat 4:23 (WEB) Jesus went about in all Galilee, teaching in their {{{1
+"                synagogues, preaching the gospel of the kingdom, and healing
+"                every disease and every sickness among the people.
+" Load Once: {{{1
+if exists("g:loaded_NetrwSettings") || &cp
+  finish
+endif
+let g:loaded_NetrwSettings  = "v3"
+
+" ---------------------------------------------------------------------
+" NetrwSettings: {{{1
+fun! NetrwSettings#NetrwSettings()
+  " this call is here largely just to insure that netrw has been loaded
+  call netrw#NetSavePosn()
+
+  above wincmd s
+  enew
+  setlocal noswapfile bh=wipe
+  set ft=vim
+  file Netrw\ Settings
+
+  " these variables have the following default effects when they don't
+  " exist (ie. have not been set by the user in his/her .vimrc)
+  if !exists("g:netrw_longlist")
+   let g:netrw_longlist= 0
+   let g:netrw_list_cmd= "ssh HOSTNAME ls -FLa"
+  endif
+  if !exists("g:netrw_silent")
+   let g:netrw_silent= 0
+  endif
+  if !exists("g:netrw_use_nt_rcp")
+   let g:netrw_use_nt_rcp= 0
+  endif
+  if !exists("g:netrw_ftp")
+   let g:netrw_ftp= 0
+  endif
+  if !exists("g:netrw_ignorenetrc")
+   let g:netrw_ignorenetrc= 0
+  endif
+
+  put ='+ ---------------------------------------------'
+  put ='+ NetrwSettings:  (by Charles E. Campbell, Jr.)'
+  put ='+  Press ? with cursor atop any line for help  '
+  put ='+ ---------------------------------------------'
+  let s:netrw_settings_stop= line(".")
+
+  put =''
+  put ='+ Netrw Protocol Commands'
+  put = 'let g:netrw_dav_cmd           = '.g:netrw_dav_cmd
+  put = 'let g:netrw_fetch_cmd         = '.g:netrw_fetch_cmd
+  put = 'let g:netrw_ftp_cmd           = '.g:netrw_ftp_cmd
+  put = 'let g:netrw_http_cmd          = '.g:netrw_http_cmd
+  put = 'let g:netrw_rcp_cmd           = '.g:netrw_rcp_cmd
+  put = 'let g:netrw_rsync_cmd         = '.g:netrw_rsync_cmd
+  put = 'let g:netrw_scp_cmd           = '.g:netrw_scp_cmd
+  put = 'let g:netrw_sftp_cmd          = '.g:netrw_sftp_cmd
+  let s:netrw_protocol_stop= line(".")
+  put = ''
+
+  put ='+Netrw Transfer Control'
+  put = 'let g:netrw_cygwin            = '.g:netrw_cygwin
+  put = 'let g:netrw_ftp               = '.g:netrw_ftp
+  put = 'let g:netrw_ftpmode           = '.g:netrw_ftpmode
+  put = 'let g:netrw_ignorenetrc       = '.g:netrw_ignorenetrc
+  put = 'let g:netrw_use_nt_rcp        = '.g:netrw_use_nt_rcp
+  put = 'let g:netrw_win95ftp          = '.g:netrw_win95ftp
+  let s:netrw_xfer_stop= line(".")
+
+  put = ''
+  put ='+ Netrw Browser Control'
+  put = 'let g:netrw_alto              = '.g:netrw_alto
+  put = 'let g:netrw_altv              = '.g:netrw_altv
+  put = 'let g:netrw_dirhistmax        = '.g:netrw_dirhistmax
+  put = 'let g:netrw_ftp_browse_reject = '.g:netrw_ftp_browse_reject
+  put = 'let g:netrw_ftp_list_cmd      = '.g:netrw_ftp_list_cmd
+  put = 'let g:netrw_hide              = '.g:netrw_hide
+  put = 'let g:netrw_keepdir           = '.g:netrw_keepdir
+  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
+  put = 'let g:netrw_list_cmd          = '.g:netrw_list_cmd
+  put = 'let g:netrw_list_hide         = '.g:netrw_list_hide
+  put = 'let g:netrw_local_mkdir       = '.g:netrw_local_mkdir
+  put = 'let g:netrw_local_rmdir       = '.g:netrw_local_rmdir
+  put = 'let g:netrw_longlist          = '.g:netrw_longlist
+  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
+  put = 'let g:netrw_mkdir_cmd         = '.g:netrw_mkdir_cmd
+  put = 'let g:netrw_rename_cmd        = '.g:netrw_rename_cmd
+  put = 'let g:netrw_rm_cmd            = '.g:netrw_rm_cmd
+  put = 'let g:netrw_rmdir_cmd         = '.g:netrw_rmdir_cmd
+  put = 'let g:netrw_rmf_cmd           = '.g:netrw_rmf_cmd
+  put = 'let g:netrw_silent            = '.g:netrw_silent
+  put = 'let g:netrw_sort_by           = '.g:netrw_sort_by
+  put = 'let g:netrw_sort_direction    = '.g:netrw_sort_direction
+  put = 'let g:netrw_sort_sequence     = '.g:netrw_sort_sequence
+  put = 'let g:netrw_ssh_browse_reject = '.g:netrw_ssh_browse_reject
+  put = 'let g:netrw_timefmt           = '.g:netrw_timefmt
+  put = 'let g:netrw_winsize           = '.g:netrw_winsize
+
+  put =''
+  put ='+ For help, place cursor on line and press ?'
+
+  1d
+  silent %s/^+/"/e
+  res 99
+  silent %s/= \([^0-9].*\)$/= '\1'/e
+  silent %s/= $/= ''/e
+  1
+
+  set nomod
+
+  map <buffer> <silent> ? :call NetrwSettingHelp()<cr>
+  let tmpfile= tempname()
+  exe 'au BufWriteCmd	Netrw\ Settings	silent w! '.tmpfile.'|so '.tmpfile.'|call delete("'.tmpfile.'")|set nomod'
+endfun
+
+" ---------------------------------------------------------------------
+" NetrwSettingHelp: {{{2
+fun! NetrwSettingHelp()
+"  call Dfunc("NetrwSettingHelp()")
+  let curline = getline(".")
+  if curline =~ '='
+   let varhelp = substitute(curline,'^\s*let ','','e')
+   let varhelp = substitute(varhelp,'\s*=.*$','','e')
+"   call Decho("trying help ".varhelp)
+   try
+    exe "he ".varhelp
+   catch /^Vim\%((\a\+)\)\=:E149/
+   	echo "***sorry*** no help available for <".varhelp.">"
+   endtry
+  elseif line(".") < s:netrw_settings_stop
+   he netrw-settings
+  elseif line(".") < s:netrw_protocol_stop
+   he netrw-externapp
+  elseif line(".") < s:netrw_xfer_stop
+   he netrw-variables
+  else
+   he netrw-browse-var
+  endif
+"  call Dret("NetrwSettingHelp")
+endfun
+
+" ---------------------------------------------------------------------
+" Modelines: {{{1
+" vim:ts=8 fdm=marker

runtime/spell/README.txt

@@ -69,7 +69,7 @@ This procedure should work well:
    change too much, the OpenOffice people are not stupid.  However, you may
    want to remove obvious mistakes.  And remove single-letter words that
    aren't really words, they mess up the suggestions (English has this
-   problem).
+   problem).  You can use the "fixdup" Vim script to find duplicate words.
 
 3. Make the diff file.  "aap diff" will do this for you.  If a diff would be
    too big you might consider writing a Vim script to do systematic changes.

runtime/spell/af/af_ZA.diff

@@ -0,0 +1,36 @@
+*** af_ZA.orig.aff	Sun Aug 14 17:37:01 2005
+--- af_ZA.aff	Sun Aug 14 17:38:11 2005
+***************
+*** 23,24 ****
+--- 23,34 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'-
++ SLASH ,
++ 
+  MAP 3
+*** af_ZA.orig.dic	Sun Aug 14 17:37:01 2005
+--- af_ZA.dic	Sun Aug 14 17:38:54 2005
+***************
+*** 1861,1864 ****
+  T-skyf
+! TCP/IP
+! TCP/IP-bondel
+  TLA
+--- 1861,1864 ----
+  T-skyf
+! TCP,IP
+! TCP,IP-bondel
+  TLA
+***************
+*** 124109,124111 ****
+  vrywilliglik
+- vt
+  vuile/R
+--- 124109,124110 ----

runtime/spell/af/main.aap

@@ -0,0 +1,79 @@
+# Aap recipe for Afrikaans Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = af_ZA.aff af_ZA.dic
+
+all: $SPELLDIR/af.latin1.spl $SPELLDIR/af.utf-8.spl ../README_af.txt
+
+$SPELLDIR/af.latin1.spl : $FILES
+        :sys env LANG=af_ZA.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/af af_ZA" -c q
+
+$SPELLDIR/af.utf-8.spl : $FILES
+        :sys env LANG=af_ZA.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/af af_ZA" -c q
+
+../README_af.txt : README_af_ZA.txt
+        :copy $source $target
+
+#
+# Fetching the file from SourceForge.  The archive at OpenOffice is broken!
+#
+FILE = http://surfnet.dl.sourceforge.net/sourceforge/translate/myspell-af_ZA-20040727.zip
+
+:attr {fetch = $FILE} af_ZA.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+af_ZA.aff af_ZA.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch af_ZA.zip
+        :sys $UNZIP af_ZA.zip
+        :delete af_ZA.zip
+        @if not os.path.exists('af_ZA.orig.aff'):
+            :copy af_ZA.aff af_ZA.orig.aff
+        @if not os.path.exists('af_ZA.orig.dic'):
+            :copy af_ZA.dic af_ZA.orig.dic
+        @if os.path.exists('af_ZA.diff'):
+            :sys patch <af_ZA.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 af_ZA.orig.aff af_ZA.aff >af_ZA.diff
+        :sys {force} diff -a -C 1 af_ZA.orig.dic af_ZA.dic >>af_ZA.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch af_ZA.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../af_ZA.zip
+            :sys {force} diff ../af_ZA.orig.aff af_ZA.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy af_ZA.aff ../af_ZA.new.aff
+            :sys {force} diff ../af_ZA.orig.dic af_ZA.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy af_ZA.dic ../af_ZA.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete af_ZA.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/am/main.aap

@@ -0,0 +1,63 @@
+# Aap recipe for Amharic Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = am_ET.aff am_ET.dic
+
+all: $SPELLDIR/am.utf-8.spl ../README_am.txt
+
+$SPELLDIR/am.utf-8.spl : $FILES
+        :sys env LANG=am_ET.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/am am_ET" -c q
+
+../README_am.txt: README_am.txt
+        :copy $source $target
+
+#
+# Fetching the files from Hunspell.
+#
+HTTPDIR = http://hunspell.sourceforge.net
+TARNAME = am-demo.tar.gz
+:attr {fetch = $HTTPDIR/%file%} $TARNAME
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+am_ET.aff am_ET.dic: {buildcheck=}
+        :assertpkg tar gzip
+        :fetch $TARNAME
+        :sys gzip -d -c $TARNAME | tar xf -
+        :move am/am.aff am_ET.aff
+        :move am/am.dic am_ET.dic
+        :move am/README README_am.txt
+        :delete {recursive} am
+        :delete $TARNAME
+        @if not os.path.exists('am_ET.orig.aff'):
+            :copy am_ET.aff am_ET.orig.aff
+        @if not os.path.exists('am_ET.orig.dic'):
+            :copy am_ET.dic am_ET.orig.dic
+        @if os.path.exists('am_ET.diff'):
+            :sys patch <am_ET.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 am_ET.orig.aff am_ET.aff >am_ET.diff
+        :sys {force} diff -a -C 1 am_ET.orig.dic am_ET.dic >>am_ET.diff
+
+
+# Check for updated spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :print Sorry, not implemented yet.
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/bg/bg_BG.diff

@@ -0,0 +1,42 @@
+*** bg_BG.orig.aff	Sun Aug 14 18:12:44 2005
+--- bg_BG.aff	Sun Aug 14 18:13:12 2005
+***************
+*** 1,2 ****
+! SET microsoft-cp1251
+  TRY <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+--- 1,2 ----
+! SET cp1251
+  TRY <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+***************
+*** 1682,1684 ****
+  
+! MAP 26
+  MAP <20><><EFBFBD>a
+--- 1682,1684 ----
+  
+! MAP 25
+  MAP <20><><EFBFBD>a
+***************
+*** 1691,1695 ****
+  MAP <20><>
+! MAP <20><>
+  MAP p<>
+- MAP c<>
+  MAP x<>
+--- 1691,1694 ----
+  MAP <20><>
+! MAP c<><63>
+  MAP p<>
+  MAP x<>
+***************
+*** 1707,1709 ****
+  MAP P<>
+- MAP Y<>
+  MAP X<>
+--- 1706,1711 ----
+  MAP P<>
+  MAP X<>
++ 
++ REP 2
++ REP Y <20>
++ REP <20> Y

runtime/spell/bg/main.aap

@@ -0,0 +1,80 @@
+# Aap recipe for Bulgarian Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = bg_BG.aff bg_BG.dic
+
+all: $SPELLDIR/bg.cp1251.spl $SPELLDIR/bg.utf-8.spl ../README_bg.txt
+
+$SPELLDIR/bg.cp1251.spl : $FILES
+        :sys env LANG=bg_BG.CP1251 $VIM -u NONE -e -c "mkspell! $SPELLDIR/bg bg_BG" -c q
+
+$SPELLDIR/bg.utf-8.spl : $FILES
+        :sys env LANG=bg_BG.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/bg bg_BG" -c q
+
+../README_bg.txt: README_bg_BG.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} bg_BG.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+bg_BG.aff bg_BG.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch bg_BG.zip
+        :sys $UNZIP bg_BG.zip
+        :delete bg_BG.zip
+        :sys $VIM bg_BG.aff -e -c "set ff=unix" -c update -c q
+        :sys $VIM bg_BG.dic -e -c "set ff=unix" -c update -c q
+        :sys $VIM README_bg_BG.txt -e -c "set ff=unix" -c update -c q
+        @if not os.path.exists('bg_BG.orig.aff'):
+            :copy bg_BG.aff bg_BG.orig.aff
+        @if not os.path.exists('bg_BG.orig.dic'):
+            :copy bg_BG.dic bg_BG.orig.dic
+        @if os.path.exists('bg_BG.diff'):
+            :sys patch <bg_BG.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 bg_BG.orig.aff bg_BG.aff >bg_BG.diff
+        :sys {force} diff -a -C 1 bg_BG.orig.dic bg_BG.dic >>bg_BG.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch bg_BG.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../bg_BG.zip
+            :sys {force} diff ../bg_BG.orig.aff bg_BG.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy bg_BG.aff ../bg_BG.new.aff
+            :sys {force} diff ../bg_BG.orig.dic bg_BG.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy bg_BG.dic ../bg_BG.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete bg_BG.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/ca/ca_ES.diff

@@ -0,0 +1,76 @@
+*** ca_ES.orig.aff	Sat Aug 13 18:33:44 2005
+--- ca_ES.aff	Sat Aug 13 18:33:44 2005
+***************
+*** 44,48 ****
+  
+! # substitucions preferides
+! FIRST a/<2F> e/<2F>/<2F> <20>/<2F>/e <20>/<2F>/e i/<2F>/<2F> <20>/i/<2F> o/<2F>/<2F> <20>/<2F>/o <20>/<2F>/o u/<2F>/<2F> <20>/u/<2F> <20>/u/<2F>
+! FIRST l/l<>l l<>l/l
+  
+--- 44,65 ----
+  
+! FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! 
+! SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
+! SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
+! 
+! MIDWORD	<09>-'
+! 
+! MAP 6
+! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! MAP e<><65><EFBFBD><EFBFBD>
+! MAP i<><69><EFBFBD><EFBFBD>
+! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
+! MAP u<><75><EFBFBD><EFBFBD>
+! MAP c<>
+! 
+! REP 2
+! REP l l<>l
+! REP l<>l l
+  
+*** ca_ES.orig.dic	Sat Aug 13 18:33:44 2005
+--- ca_ES.dic	Sat Aug 13 18:33:44 2005
+***************
+*** 25312,25314 ****
+  caos/E
+- cap
+  cap-rodo/E
+--- 25312,25313 ----
+***************
+*** 35103,35105 ****
+  corrasi<73>/G
+- corre
+  corre-corrents
+--- 35102,35103 ----
+***************
+*** 99806,99808 ****
+  maj<61>scul/F
+- mal
+  mal-llevat/E
+--- 99804,99805 ----
+***************
+*** 107517,107519 ****
+  not<6F>riament
+- nou
+  nou-centes/E
+--- 107514,107515 ----
+***************
+*** 122687,122689 ****
+  rat<61>nia/E
+- rau
+  rau-rau/E
+--- 122683,122684 ----
+***************
+*** 139389,139391 ****
+  ta<74>t/E
+- te
+  te'l
+--- 139384,139385 ----
+***************
+*** 147590,147592 ****
+  vit<69>cola/E
+- viu
+  viu-viu/E
+--- 147584,147585 ----

runtime/spell/ca/main.aap

@@ -0,0 +1,81 @@
+# Aap recipe for Catelan (Spain) Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = ca_ES.aff ca_ES.dic
+
+all: $SPELLDIR/ca.latin1.spl $SPELLDIR/ca.utf-8.spl ../README_ca.txt
+
+$SPELLDIR/ca.latin1.spl : $FILES
+        :sys env LANG=ca_ES.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/ca ca_ES" -c q
+
+$SPELLDIR/ca.utf-8.spl : $FILES
+        :sys env LANG=ca_ES.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/ca ca_ES" -c q
+
+../README_ca.txt : README_ca_ES.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} ca_ES.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# Make sure the files are in Unix fileformat
+ca_ES.aff ca_ES.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch ca_ES.zip
+        :sys $UNZIP ca_ES.zip
+        :delete ca_ES.zip
+        :sys $VIM ca_ES.aff -c "set ff=unix" -c "update" -c q
+        :sys $VIM ca_ES.dic -c "set ff=unix" -c "update" -c q
+        @if not os.path.exists('ca_ES.orig.aff'):
+            :copy ca_ES.aff ca_ES.orig.aff
+        @if not os.path.exists('ca_ES.orig.dic'):
+            :copy ca_ES.dic ca_ES.orig.dic
+        @if os.path.exists('ca_ES.diff'):
+            :sys patch <ca_ES.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 ca_ES.orig.aff ca_ES.aff >ca_ES.diff
+        :sys {force} diff -a -C 1 ca_ES.orig.dic ca_ES.dic >>ca_ES.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch ca_ES.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../ca_ES.zip
+            :sys {force} diff ../ca_ES.orig.aff ca_ES.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy ca_ES.aff ../ca_ES.new.aff
+            :sys {force} diff ../ca_ES.orig.dic ca_ES.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy ca_ES.dic ../ca_ES.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete ca_ES.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/cs/cs_CZ.diff

@@ -0,0 +1,783 @@
+*** cs_CZ.orig.aff	Sat Aug 13 21:38:29 2005
+--- cs_CZ.aff	Sat Aug 13 23:29:13 2005
+***************
+*** 3,4 ****
+--- 3,8 ----
+  
++ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
+  PFX N Y 1
+***************
+*** 2118,2120 ****
+  SFX A   nout        ly         [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]rnout
+! SFX A   nout        l          [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r][^aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>rl][^aeiouy
+  SFX A   nout        l          [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r][^aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>rl]nout
+--- 2122,2124 ----
+  SFX A   nout        ly         [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]rnout
+! SFX A   nout        l          [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r][^aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>rl][^aeiouy]out
+  SFX A   nout        l          [aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>r][^aeiouy<75><79><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>rl]nout
+*** cs_CZ.orig.dic	Sat Aug 13 21:38:29 2005
+--- cs_CZ.dic	Sun Aug 14 15:33:38 2005
+***************
+*** 2944,2946 ****
+  ar/H
+- arch
+  archaick<63>/YCRN
+--- 2944,2945 ----
+***************
+*** 3098,3100 ****
+  arogantn<74>/YKRN
+- aroma
+  aroma/K
+--- 3097,3098 ----
+***************
+*** 4753,4755 ****
+  banjo/MQ
+- bank
+  banka/ZQ
+--- 4751,4752 ----
+***************
+*** 5540,5542 ****
+  Bechy<68><79>k<EFBFBD>v/Y
+- Bechyn<79>
+  Bechyn<79>/S
+--- 5537,5538 ----
+***************
+*** 5945,5947 ****
+  bermudsk<73>/YRN
+- Bermudy
+  Bermudy/ZQ
+--- 5941,5942 ----
+***************
+*** 6111,6113 ****
+  Beust<73>v/Y
+- bez
+  Bez<65>kov<6F>/Y
+--- 6106,6107 ----
+***************
+*** 7294,7296 ****
+  bl<62>na/Z
+- Blanc
+  Blanc/PV
+--- 7288,7289 ----
+***************
+*** 9456,9458 ****
+  b<>ichovit<69>/YKR
+- b<><62>m<EFBFBD>
+  b<><62>m<EFBFBD>/M
+--- 9449,9450 ----
+***************
+*** 9667,9669 ****
+  budy<64><79>nsk<73>/Y
+- bufet
+  bufet<65><74><EFBFBD>in/Y
+--- 9659,9660 ----
+***************
+*** 9677,9679 ****
+  bufferov<6F>/YRN
+- buffet
+  buffet/H
+--- 9668,9669 ----
+***************
+*** 11386,11388 ****
+  cop/H
+- copyright
+  copyright/H
+--- 11376,11377 ----
+***************
+*** 11446,11448 ****
+  cresc
+- crescendo
+  crescendo/MQ
+--- 11435,11436 ----
+***************
+*** 13810,13812 ****
+  daktylus/Q
+- d<>l
+  dalajl<6A>ma/PV
+--- 13798,13799 ----
+***************
+*** 13816,13818 ****
+  d<>l/E
+- d<>le
+  Daleck<63>/Y
+--- 13803,13804 ----
+***************
+*** 13821,13823 ****
+  d<>le/E
+- daleko
+  dalekohled/H
+--- 13807,13808 ----
+***************
+*** 14082,14084 ****
+  datla
+- datle
+  datlech
+--- 14067,14068 ----
+***************
+*** 14756,14758 ****
+  dekura<72>n<EFBFBD>/YRN
+- d<>l
+  delaborace/Z
+--- 14740,14741 ----
+***************
+*** 15301,15303 ****
+  desater<65>k<EFBFBD>v/Y
+- desatero
+  desatero/MQ
+--- 15284,15285 ----
+***************
+*** 15716,15718 ****
+  devatern<72>k/H
+- devatero
+  devatero/MQ
+--- 15698,15699 ----
+***************
+*** 16152,16154 ****
+  DIK
+- d<>k
+  dikalciumfosf<73>t/H
+--- 16133,16134 ----
+***************
+*** 16603,16605 ****
+  Di<44>v/Y
+- div
+  div<69>ck<63>/YKR
+--- 16583,16584 ----
+***************
+*** 19886,19888 ****
+  dopola
+- dopoledne
+  dopoledne/M
+--- 19865,19866 ----
+***************
+*** 19970,19972 ****
+  doprat/ATN
+- doprava
+  doprava/ZQ
+--- 19948,19949 ----
+***************
+*** 22912,22914 ****
+  d<><64>v/E
+- d<><64>ve
+  d<><64>ve<76>ko/MQ
+--- 22889,22890 ----
+***************
+*** 26369,26371 ****
+  fakoemulsifikace/Z
+- faksimile
+  faksimile/Z
+--- 26345,26346 ----
+***************
+*** 27266,27268 ****
+  fim<69>za/ZQ
+- fin<69>le
+  fin<69>le/Z
+--- 27241,27242 ----
+***************
+*** 28101,28103 ****
+  foxtrotov<6F>/Y
+- foyer
+  foyer/H
+--- 28075,28076 ----
+***************
+*** 28759,28761 ****
+  Gajd<6A>v/Y
+- Gal
+  gal
+--- 28732,28733 ----
+***************
+*** 29060,29062 ****
+  gemovat/ATN
+- gen
+  genci<63>nov<6F>/YR
+--- 29032,29033 ----
+***************
+*** 29410,29412 ****
+  glejt/H
+- glissando
+  glissando/MQ
+--- 29381,29382 ----
+***************
+*** 31247,31249 ****
+  hefebrand/H
+- Hegel
+  Hegela
+--- 31217,31218 ----
+***************
+*** 31602,31604 ****
+  Herkulem
+- Herkules
+  Herkules/D
+--- 31571,31572 ----
+***************
+*** 32258,32260 ****
+  hloub<75>t<EFBFBD>nsk<73>/Y
+- hloubi
+  hloubic<69>/Y
+--- 32226,32227 ----
+***************
+*** 32612,32614 ****
+  Hock<63>/Y
+- hod
+  Hod<6F>jice/C
+--- 32579,32580 ----
+***************
+*** 33069,33071 ****
+  homoisoflavonoid/H
+- Homola
+  Homola/PV
+--- 33035,33036 ----
+***************
+*** 34389,34391 ****
+  h<>ebelec/S
+- h<>eben
+  h<>ebenatka/ZQ
+--- 34354,34355 ----
+***************
+*** 34817,34819 ****
+  Huserk<72>v/Y
+- hus<75>
+  husice/ZQ
+--- 34781,34782 ----
+***************
+*** 36441,36443 ****
+  ch<63>upav<61>/YKRN
+- cht<68>
+  cht<68>je/XN
+--- 36404,36405 ----
+***************
+*** 38569,38571 ****
+  jajaj
+- jak
+  jak<61>koli
+--- 38531,38532 ----
+***************
+*** 39323,39325 ****
+  jedn<64>/N
+- jedni
+  jednice/ZQ
+--- 39284,39285 ----
+***************
+*** 39534,39536 ****
+  jednot<6F>denn<6E>/YR
+- jednou
+  jedno<6E><6F>elov<6F>/YRN
+--- 39494,39495 ----
+***************
+*** 39717,39719 ****
+  jemu<6D>
+- jen
+  Jena/ZQ
+--- 39676,39677 ----
+***************
+*** 39755,39757 ****
+  jen/N
+- jenom
+  jenom/N
+--- 39713,39714 ----
+***************
+*** 40149,40151 ****
+  jin<69><6E>/S
+- jinak
+  jinak/N
+--- 40106,40107 ----
+***************
+*** 41317,41319 ****
+  Kalist<73>v/Y
+- Kali<6C>
+  kal<61><6C>ek/Q
+--- 41273,41274 ----
+***************
+*** 42861,42863 ****
+  kde<64>to
+- kdo
+  kdoj<6F>jak
+--- 42816,42817 ----
+***************
+*** 44048,44050 ****
+  Kls<6C>k<EFBFBD>v/Y
+- klub
+  klubaj<61>c<EFBFBD>/YN
+--- 44002,44003 ----
+***************
+*** 44235,44237 ****
+  Kne<6E><65>v/Y
+- kn<6B>z
+  kn<6B>ze
+--- 44188,44189 ----
+***************
+*** 45007,45009 ****
+  kolik
+- kolika
+  kolikacifern<72>/YKRN
+--- 44959,44960 ----
+***************
+*** 46292,46294 ****
+  kontinuum/MQ
+- konto
+  kontokorent/H
+--- 46243,46244 ----
+***************
+*** 47152,47154 ****
+  kosmopolit<69>v/Y
+- kosmos
+  kosmos/Q
+--- 47102,47103 ----
+***************
+*** 51844,51846 ****
+  Leclanche<68>v/Y
+- le<6C>
+  l<><6C>ba/ZQ
+--- 51793,51794 ----
+***************
+*** 52449,52451 ****
+  le<6C>tiv<69>/YKRN
+- let
+  l<>tac<61>/YN
+--- 52397,52398 ----
+***************
+*** 54351,54353 ****
+  l<>j
+- luk
+  Luk<75><6B>ov<6F>/Y
+--- 54298,54299 ----
+***************
+*** 55408,55410 ****
+  Mallorca/ZQ
+- m<>lo
+  malobur<75>oasie/Z
+--- 55354,55355 ----
+***************
+*** 55574,55576 ****
+  mamut<75>v/Y
+- Man
+  m<>/N
+--- 55519,55520 ----
+***************
+*** 55852,55854 ****
+  Maputo/MQ
+- marabu
+  marabu/PV
+--- 55796,55797 ----
+***************
+*** 57254,57256 ****
+  Mendl<64>v/Y
+- m<>n<EFBFBD>
+  m<>n<EFBFBD>cenn<6E>j<EFBFBD><6A>/YRW
+--- 57197,57198 ----
+***************
+*** 58358,58360 ****
+  milen<65>/YN
+- miler<65>d
+  miler<65>d/O
+--- 58300,58301 ----
+***************
+*** 59426,59428 ****
+  moc<6F>m
+- mocip<69>n
+  mocip<69>na
+--- 59367,59368 ----
+***************
+*** 60833,60835 ****
+  Much<63>v/Y
+- m<>j
+  m<>j/Y
+--- 60773,60774 ----
+***************
+*** 62308,62310 ****
+  nadplocha/ZQ
+- nadpo<70>et
+  nadpo<70>etn<74>j<EFBFBD><6A>/YRW
+--- 62247,62248 ----
+***************
+*** 66114,66116 ****
+  nava<76>uj<75>c<EFBFBD>/YN
+- nave<76>er
+  nave<76>er/L
+--- 66052,66053 ----
+***************
+*** 66581,66583 ****
+  nebes
+- nebesa
+  nebesa/MQ
+--- 66518,66519 ----
+***************
+*** 68080,68082 ****
+  noblesn<73>/YKR
+- noc
+  nocemi
+--- 68016,68017 ----
+***************
+*** 68562,68564 ****
+  novum/MQ
+- Nov<6F>
+  Nov<6F>/Y
+--- 68497,68498 ----
+***************
+*** 73018,73020 ****
+  odpojov<6F>vat/JTN
+- odpoledne
+  odpoledne/M
+--- 72952,72953 ----
+***************
+*** 73121,73123 ****
+  odpra<72>ovat/ATN
+- odprava
+  odprava/ZQ
+--- 73054,73055 ----
+***************
+*** 76145,76147 ****
+  oosf<73>ra/ZQ
+- op
+  op<6F><70>en<65>/SN
+--- 76077,76078 ----
+***************
+*** 78040,78042 ****
+  ost<73>ihnout/ATN
+- Ost<73>ihom
+  Ost<73>ihom/K
+--- 77971,77972 ----
+***************
+*** 80117,80121 ****
+  pantheistick<63>/YCR
+- pantofel
+  pantofel/Q
+- pantofle
+  pantoflemi
+--- 80047,80049 ----
+***************
+*** 80258,80260 ****
+  par
+- p<>r
+  paraamfibolit/H
+--- 80186,80187 ----
+***************
+*** 81414,81416 ****
+  PE
+- pec
+  peca<63>/U
+--- 81341,81342 ----
+***************
+*** 82720,82722 ****
+  pianist<73>v/Y
+- piano
+  pi<70>no/MQ
+--- 82646,82647 ----
+***************
+*** 83321,83323 ****
+  pizzerie/Z
+- pizzicato
+  pizzicato/MQ
+--- 83246,83247 ----
+***************
+*** 83731,83733 ****
+  plebiscit/H
+- plebs
+  plebse
+--- 83655,83656 ----
+***************
+*** 83833,83835 ****
+  Pleskot<6F>v/Y
+- plesky
+  plesky/H
+--- 83756,83757 ----
+***************
+*** 85861,85863 ****
+  pod<6F>ad<61>n<EFBFBD>/SN
+- pod<6F>ad<61>n<EFBFBD>
+  pod<6F>ad<61>n<EFBFBD>/YKRN
+--- 85783,85784 ----
+***************
+*** 89077,89079 ****
+  pop<6F><70>vat/JN
+- pop<6F>ed<65>
+  pop<6F>ed<65>/S
+--- 88998,88999 ----
+***************
+*** 91358,91360 ****
+  pozab<61>jet/JTN
+- pozad<61>
+  pozad<61>/S
+--- 91278,91279 ----
+***************
+*** 91783,91785 ****
+  pr<70>ceschopn<70>/YKR
+- prac<61>
+  pr<70>ci
+--- 91702,91703 ----
+***************
+*** 92176,92178 ****
+  prav<61>k<EFBFBD>/YKR
+- pr<70>vem
+  pr<70>vem/N
+--- 92094,92095 ----
+***************
+*** 95377,95379 ****
+  prosp<73>vat/JTN
+- prosp<73>ch
+  prosp<73>ch<63>n<EFBFBD>/SN
+--- 95294,95295 ----
+***************
+*** 105195,105197 ****
+  p<>ldenn<6E>/YR
+- p<>ldne
+  p<>ldnech
+--- 105111,105112 ----
+***************
+*** 105216,105218 ****
+  p<>ldruh<75>/Y
+- p<>le
+  pulec/U
+--- 105131,105132 ----
+***************
+*** 106257,106259 ****
+  r<>mcov<6F>/YR
+- r<>m<EFBFBD>
+  r<>mec/S
+--- 106171,106172 ----
+***************
+*** 109304,109306 ****
+  rozd<7A>luj<75>c<EFBFBD>/YN
+- rozd<7A>l
+  rozd<7A>len<65>/SN
+--- 109217,109218 ----
+***************
+*** 113029,113031 ****
+  R<>r/H
+- Rus
+  rusal<61><6C>/Y
+--- 112941,112942 ----
+***************
+*** 113124,113126 ****
+  ru<72>tina/ZQ
+- R<>t
+  R<>ta/PV
+--- 113035,113036 ----
+***************
+*** 115104,115106 ****
+  scezovat/ATN
+- science
+  science/Z
+--- 115014,115015 ----
+***************
+*** 115723,115725 ****
+  sedmer<65>e/K
+- sedmero
+  sedmero/MQ
+--- 115632,115633 ----
+***************
+*** 116249,116251 ****
+  S<>m<EFBFBD>v/Y
+- sen
+  sena<6E>/PI
+--- 116157,116158 ----
+***************
+*** 116962,116964 ****
+  se<73>vindlovat/ATN
+- set
+  setba/ZQ
+--- 116869,116870 ----
+***************
+*** 117786,117788 ****
+  Sik<69>v/Y
+- sil
+  sil<69>ck<63>/YKRN
+--- 117692,117693 ----
+***************
+*** 121635,121637 ****
+  spatn<74>/YKR
+- spatra
+  spatra/ZQ
+--- 121540,121541 ----
+***************
+*** 121887,121889 ****
+  sp<73><70>
+- sp<73><70>e
+  sp<73><70>e/E
+--- 121791,121792 ----
+***************
+*** 122323,122325 ****
+  spolupr<70>ce/N
+- spolupr<70>ci
+  spoluprac<61>ch/N
+--- 122226,122227 ----
+***************
+*** 122890,122892 ****
+  srovnan<61>j<EFBFBD><6A>/YRW
+- srovn<76>n<EFBFBD>
+  srovn<76>n<EFBFBD>/SN
+--- 122792,122793 ----
+***************
+*** 129987,129989 ****
+  <20>unt/H
+- <20>up
+  <20>up<75>ck<63>/YKR
+--- 129888,129889 ----
+***************
+*** 130427,130429 ****
+  takovouto
+- takov<6F>
+  takov<6F>chto
+--- 130327,130328 ----
+***************
+*** 131190,131192 ****
+  tem<65>sk<73>/Y
+- ten
+  tenata/MQ
+--- 131089,131090 ----
+***************
+*** 131958,131960 ****
+  tich<63>/YKRO
+- tik
+  tikaj<61>c<EFBFBD>/YN
+--- 131856,131857 ----
+***************
+*** 132541,132543 ****
+  Tomasch<63>v/Y
+- Tom<6F><6D>
+  Tom<6F><6D>ek/PV
+--- 132438,132439 ----
+***************
+*** 133890,133892 ****
+  Trubsk<73>/Y
+- truc
+  truc/H
+--- 133786,133787 ----
+***************
+*** 134057,134059 ****
+  t<><74>st/IN
+- t<>eba
+  t<>eba/N
+--- 133952,133953 ----
+***************
+*** 135024,135026 ****
+  tvrz/Z
+- tv<74>j
+  tv<74>j/Y
+--- 134918,134919 ----
+***************
+*** 135532,135534 ****
+  <20><>esov<6F>/YR
+- <20><>et
+  <20><>etnick<63>/YRN
+--- 135425,135426 ----
+***************
+*** 139620,139622 ****
+  uzamknut<75>/SN
+- uzamknut<75>
+  uzamknut<75>/YKRN
+--- 139512,139513 ----
+***************
+*** 141624,141626 ****
+  Verdol<6F>v/Y
+- v<>ren
+  v<>ren/N
+--- 141515,141516 ----
+***************
+*** 141651,141653 ****
+  v<>r/N
+- v<>rna
+  v<>rna/N
+--- 141541,141542 ----
+***************
+*** 141663,141665 ****
+  Verne/Y
+- v<>rni
+  v<>rni/N
+--- 141552,141553 ----
+***************
+*** 141667,141669 ****
+  vernis<69><73>/Z
+- v<>rno
+  v<>rno/N
+--- 141555,141556 ----
+***************
+*** 141671,141676 ****
+  vernovka/ZQ
+- v<>rnu
+  v<>rnu/N
+  Vern<72>v/Y
+- v<>rny
+  v<>rny/N
+--- 141558,141561 ----
+***************
+*** 141924,141926 ****
+  vetknut<75>/SN
+- vetknut<75>
+  vetknut<75>/YKRN
+--- 141809,141810 ----
+***************
+*** 142117,142119 ****
+  vhlouben<65>/YKRN
+- vhloubit
+  vhloubit/ATN
+--- 142001,142002 ----
+***************
+*** 144104,144106 ****
+  Vold<6C>n<EFBFBD>v/Y
+- vole
+  volebn<62>/YR
+--- 143987,143988 ----
+***************
+*** 144409,144411 ****
+  Vot<6F>pk<70>v/Y
+- vous
+  vous<75><73>/U
+--- 144291,144292 ----
+***************
+*** 144952,144954 ****
+  vrtulov<6F>/YR
+- vrub
+  vrub/H
+--- 144833,144834 ----
+***************
+*** 144979,144981 ****
+  vr<76>vav<61>/YR
+- vrz
+  Vrz<72><7A>ek/PV
+--- 144859,144860 ----
+***************
+*** 151330,151332 ****
+  vytknut<75>/SN
+- vytknut<75>
+  vytknut<75>/YRN
+--- 151209,151210 ----
+***************
+*** 151927,151929 ****
+  vyvrhnut<75>/SN
+- vyvrhnut<75>
+  vyvrhnut<75>/YKRN
+--- 151805,151806 ----
+***************
+*** 152435,152437 ****
+  vzd<7A>l<EFBFBD>vat/JTN
+- vzdor
+  vzdor/H
+--- 152312,152313 ----
+***************
+*** 156040,156042 ****
+  zamknut<75>/SN
+- zamknut<75>
+  zamknut<75>/YKRN
+--- 155916,155917 ----
+***************
+*** 157795,157797 ****
+  zastonejte/N
+- zastoupen<65>
+  zastoupen<65>/SN
+--- 157670,157671 ----
+***************
+*** 160364,160366 ****
+  zeb<65><62>/Y
+- zebu
+  zebu/BN
+--- 160238,160239 ----
+***************
+*** 166409,166411 ****
+  <20>mu<6D>
+- <20>nec
+  <20>nec/U
+--- 166282,166283 ----

runtime/spell/cs/main.aap

@@ -0,0 +1,81 @@
+# Aap recipe for Czech Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = cs_CZ.aff cs_CZ.dic
+
+all: $SPELLDIR/cs.iso-8859-2.spl $SPELLDIR/cs.utf-8.spl \
+        $SPELLDIR/cs.cp1250.spl ../README_cs.txt
+
+$SPELLDIR/cs.iso-8859-2.spl : $FILES
+        :sys env LANG=cs_CZ.ISO8859-2 $VIM -u NONE -e -c "mkspell! $SPELLDIR/cs cs_CZ" -c q
+
+$SPELLDIR/cs.utf-8.spl : $FILES
+        :sys env LANG=cs_CZ.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/cs cs_CZ" -c q
+
+$SPELLDIR/cs.cp1250.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=cp1250" -c "mkspell! $SPELLDIR/cs cs_CZ" -c q
+
+../README_cs.txt: README_cs_CZ.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} cs_CZ.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+cs_CZ.aff cs_CZ.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch cs_CZ.zip
+        :sys $UNZIP cs_CZ.zip
+        :delete cs_CZ.zip
+        @if not os.path.exists('cs_CZ.orig.aff'):
+            :copy cs_CZ.aff cs_CZ.orig.aff
+        @if not os.path.exists('cs_CZ.orig.dic'):
+            :copy cs_CZ.dic cs_CZ.orig.dic
+        @if os.path.exists('cs_CZ.diff'):
+            :sys patch <cs_CZ.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 cs_CZ.orig.aff cs_CZ.aff >cs_CZ.diff
+        :sys {force} diff -a -C 1 cs_CZ.orig.dic cs_CZ.dic >>cs_CZ.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch cs_CZ.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../cs_CZ.zip
+            :sys {force} diff ../cs_CZ.orig.aff cs_CZ.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy cs_CZ.aff ../cs_CZ.new.aff
+            :sys {force} diff ../cs_CZ.orig.dic cs_CZ.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy cs_CZ.dic ../cs_CZ.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete cs_CZ.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/cy/cy_GB.diff

@@ -0,0 +1,9 @@
+*** cy_GB.orig.aff	Wed Aug 31 21:42:03 2005
+--- cy_GB.aff	Wed Aug 31 21:43:10 2005
+***************
+*** 81,82 ****
+--- 81,84 ----
+  
++ MIDWORD '-
++ 
+  PFX M Y 18

runtime/spell/cy/main.aap

@@ -0,0 +1,82 @@
+# Aap recipe for Welsh Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = cy_GB.aff cy_GB.dic
+
+all: $SPELLDIR/cy.iso-8859-14.spl $SPELLDIR/cy.utf-8.spl \
+         ../README_cy.txt
+
+$SPELLDIR/cy.iso-8859-14.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=iso-8859-14" 
+                -c "mkspell! $SPELLDIR/cy cy_GB" -c q
+
+$SPELLDIR/cy.utf-8.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=utf-8"
+                -c "mkspell! $SPELLDIR/cy cy_GB" -c q
+
+../README_cy.txt : README_cy_GB.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} cy_GB.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+cy_GB.aff cy_GB.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch cy_GB.zip
+        :sys $UNZIP cy_GB.zip
+        :delete cy_GB.zip
+        :sys $VIM cy_GB.aff -e -c "set ff=unix" -c update -c q
+        :sys $VIM cy_GB.dic -e -c "set ff=unix" -c update -c q
+        :sys $VIM README_cy_GB.txt -e -c "set ff=unix" -c update -c q
+        @if not os.path.exists('cy_GB.orig.aff'):
+            :copy cy_GB.aff cy_GB.orig.aff
+        @if not os.path.exists('cy_GB.orig.dic'):
+            :copy cy_GB.dic cy_GB.orig.dic
+        @if os.path.exists('cy_GB.diff'):
+            :sys patch <cy_GB.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 cy_GB.orig.aff cy_GB.aff >cy_GB.diff
+        :sys {force} diff -a -C 1 cy_GB.orig.dic cy_GB.dic >>cy_GB.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch cy_GB.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../cy_GB.zip
+            :sys {force} diff ../cy_GB.orig.aff cy_GB.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy cy_GB.aff ../cy_GB.new.aff
+            :sys {force} diff ../cy_GB.orig.dic cy_GB.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy cy_GB.dic ../cy_GB.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete cy_GB.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/da/da_DK.diff

@@ -0,0 +1,16 @@
+*** da_DK.orig.aff	Sun Aug 14 20:04:31 2005
+--- da_DK.aff	Mon Aug 15 14:03:06 2005
+***************
+*** 6,7 ****
+--- 6,16 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'-
++ 
+  # Foranstilling af u-

runtime/spell/da/main.aap

@@ -0,0 +1,79 @@
+# Aap recipe for Danish Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = da_DK.aff da_DK.dic
+
+all: $SPELLDIR/da.latin1.spl $SPELLDIR/da.utf-8.spl ../README_da.txt
+
+$SPELLDIR/da.latin1.spl : $FILES
+        :sys env LANG=da_DK.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/da da_DK" -c q
+
+$SPELLDIR/da.utf-8.spl : $FILES
+        :sys env LANG=da_DK.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/da da_DK" -c q
+
+../README_da.txt : README Copyright
+        :cat $source >! $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} da_DK.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+da_DK.aff da_DK.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch da_DK.zip
+        :sys $UNZIP da_DK.zip
+        :delete da_DK.zip
+        :delete contributors COPYING Makefile da_DK.excluded
+        @if not os.path.exists('da_DK.orig.aff'):
+            :copy da_DK.aff da_DK.orig.aff
+        @if not os.path.exists('da_DK.orig.dic'):
+            :copy da_DK.dic da_DK.orig.dic
+        @if os.path.exists('da_DK.diff'):
+            :sys patch <da_DK.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 da_DK.orig.aff da_DK.aff >da_DK.diff
+        :sys {force} diff -a -C 1 da_DK.orig.dic da_DK.dic >>da_DK.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch da_DK.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../da_DK.zip
+            :sys {force} diff ../da_DK.orig.aff da_DK.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy da_DK.aff ../da_DK.new.aff
+            :sys {force} diff ../da_DK.orig.dic da_DK.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy da_DK.dic ../da_DK.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete da_DK.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/de/de_19.diff

@@ -0,0 +1,27 @@
+*** de_19.orig.aff	Thu Aug 25 11:22:08 2005
+--- de_19.aff	Thu Aug 25 11:25:21 2005
+***************
+*** 3,4 ****
+--- 3,24 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  # (c) copyright by Bjoern Jacke <bjoern@j3e.de>

runtime/spell/de/de_20.diff

@@ -0,0 +1,28 @@
+*** de_20.orig.aff	Thu Aug 25 11:22:14 2005
+--- de_20.aff	Thu Aug 25 11:22:14 2005
+***************
+*** 2,3 ****
+--- 2,24 ----
+  TRY esianrtolcdugmphbyfvkw<6B><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ESIANRTOLCDUGMPHBYFVKW<4B><57><EFBFBD>
++ 
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  #

runtime/spell/de/de_AT.diff

@@ -0,0 +1,53 @@
+*** de_AT.orig.aff	Thu Aug 25 11:22:16 2005
+--- de_AT.aff	Thu Aug 25 11:22:16 2005
+***************
+*** 3,4 ****
+--- 3,24 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  
+*** de_AT.orig.dic	Thu Aug 25 11:22:16 2005
+--- de_AT.dic	Thu Aug 25 11:24:01 2005
+***************
+*** 18,20 ****
+  Fleischb<68>nke/N
+- Fleischbank
+  Fleischhauer/NS
+--- 18,19 ----
+***************
+*** 151,153 ****
+  zulieb
+- 77857
+  <20>bte/N
+--- 150,151 ----
+***************
+*** 18792,18794 ****
+  Geschwulstherde
+- Geselchte/N
+  Geselle/N
+--- 18790,18791 ----
+***************
+*** 20472,20474 ****
+  HTML
+- H<>fen
+  H<>ftling/EPS
+--- 20469,20470 ----

runtime/spell/de/de_CH.diff

@@ -0,0 +1,27 @@
+*** de_CH.orig.aff	Thu Aug 25 11:22:18 2005
+--- de_CH.aff	Thu Aug 25 11:22:18 2005
+***************
+*** 3,4 ****
+--- 3,24 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  

runtime/spell/de/de_DE.diff

@@ -1,14 +1,28 @@
-*** de_DE.orig.aff	Fri Feb 25 12:50:10 2005
---- de_DE.aff	Sun Jul  3 19:04:32 2005
+*** de_DE.orig.aff	Thu Aug 25 11:22:06 2005
+--- de_DE.aff	Thu Aug 25 11:22:06 2005
 ***************
 *** 2,3 ****
---- 2,10 ----
+--- 2,24 ----
   TRY esianrtolcdugmphbyfvkw<6B><77><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ESIANRTOLCDUGMPHBYFVKW<4B><57><EFBFBD>
 + 
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
 + MIDWORD	'
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
 + 
   #

runtime/spell/de/main.aap

@@ -1,82 +1,190 @@
 # Aap recipe for German Vim spell files.
+#
+# Since there is a big discussion about whether to use the old or the new
+# spelling rules, both have been included.
+#    "de": all possible words allowed
+# "de_de": old and new German spelling
+# "de_19": old German spelling
+# "de_20": new German spelling
+# "de_AT": Austrian spelling
+# "de_CH": Swiss spelling
 
 # Use a freshly compiled Vim if it exists.
 @if os.path.exists('../../../src/vim'):
     VIM = ../../../src/vim
 @else:
-    VIM = vim
+    :progsearch VIM vim
 
-SPELLDIR = ..
-FILES    = de_DE.aff de_DE.dic
-ZIPFILE  = de_DE_comb.zip
+REGIONS = DE 19 20 AT CH
+DE_REGIONS = de_$*REGIONS
 
-all: $(SPELLDIR)/de.latin1.spl $(SPELLDIR)/de.utf-8.spl ../README_de.txt
+SPELLDIR   = ..
+FILES      = de_$*(REGIONS).aff de_$*(REGIONS).dic
 
-$(SPELLDIR)/de.latin1.spl : $(VIM) $(FILES)
+ZIPFILE_DE = de_DE_comb.zip
+ZIPFILE_19 = de_OLDSPELL.zip
+ZIPFILE_20 = de_DE_neu.zip
+ZIPFILE_AT = de_DE.zip
+ZIPFILE_CH = de_CH.zip
+ZIPFILES   = $ZIPFILE_DE $ZIPFILE_19 $ZIPFILE_20 $ZIPFILE_AT $ZIPFILE_CH
+
+READMES    = README_de_$*(REGIONS).txt
+
+all: $SPELLDIR/de.latin1.spl $SPELLDIR/de.utf-8.spl ../README_de.txt
+
+$SPELLDIR/de.latin1.spl : $FILES
         :sys env LANG=de_DE.ISO8859-1
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/de $DE_REGIONS" -c q
 
-$(SPELLDIR)/de.utf-8.spl : $(VIM) $(FILES)
+$SPELLDIR/de.utf-8.spl : $FILES
         :sys env LANG=de_DE.UTF-8
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/de de_DE" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/de $DE_REGIONS" -c q
 
-../README_de.txt: README_de_DE_comb.txt
-        :copy $source $target
+../README_de.txt: $READMES
+        :print de_DE (combined) >! $target
+        :cat README_de_DE.txt   >> $target
+        :print =================================================== >>$target
+        :print de_19 (old)      >> $target
+        :cat README_de_19.txt   >> $target
+        :print =================================================== >>$target
+        :print de_20 (new)      >> $target
+        :cat README_de_20.txt   >> $target
+        :print =================================================== >>$target
+        :print de_AT (Austria)  >> $target
+        :cat README_de_AT.txt   >> $target
+        :print =================================================== >>$target
+        :print de_CH (Swiss)    >> $target
+        :cat README_de_CH.txt   >> $target
 
 #
-# Fetching the files from OpenOffice.org.
+# Fetching the files from the OpenOffice.org site.
+# The OLDSPELL file comes from elsewhere
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $(OODIR)/%file%} $(ZIPFILE)
+DEDIR = http://www.j3e.de/myspell
+:attr {fetch = $OODIR/%file%} $ZIPFILES
+:attr {fetch = $DEDIR/%file%} $ZIPFILE_19
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
 de_DE.aff de_DE.dic: {buildcheck=}
         :assertpkg unzip patch
-        :fetch $(ZIPFILE)
-        :sys $(UNZIP) $(ZIPFILE)
-        :delete $(ZIPFILE)
+        :fetch $ZIPFILE_DE
+        :sys $UNZIP $ZIPFILE_DE
+        :delete $ZIPFILE_DE
         :move de_DE_comb.aff de_DE.aff
         :move de_DE_comb.dic de_DE.dic
+        :move README_de_DE_comb.txt README_de_DE.txt
         @if not os.path.exists('de_DE.orig.aff'):
-                :copy de_DE.aff de_DE.orig.aff
+            :copy de_DE.aff de_DE.orig.aff
         @if not os.path.exists('de_DE.orig.dic'):
-                :copy de_DE.aff de_DE.orig.dic
-        :sys patch <de_DE.diff
+            :copy de_DE.dic de_DE.orig.dic
+        @if os.path.exists('de_DE.diff'):
+            :sys patch <de_DE.diff
+
+de_19.aff de_19.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch $ZIPFILE_19
+        :sys $UNZIP $ZIPFILE_19
+        :delete $ZIPFILE_19
+        :move de_OLDSPELL.aff de_19.aff
+        :move de_OLDSPELL.dic de_19.dic
+        # there is no README file
+        :print There is no README file for the old spelling >!README_de_19.txt
+        @if not os.path.exists('de_19.orig.aff'):
+            :copy de_19.aff de_19.orig.aff
+        @if not os.path.exists('de_19.orig.dic'):
+            :copy de_19.dic de_19.orig.dic
+        @if os.path.exists('de_19.diff'):
+            :sys patch <de_19.diff
+
+de_20.aff de_20.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch $ZIPFILE_20
+        :sys $UNZIP $ZIPFILE_20
+        :delete $ZIPFILE_20
+        :move de_DE_neu.aff de_20.aff
+        :move de_DE_neu.dic de_20.dic
+        :move README_de_DE_neu.txt README_de_20.txt
+        @if not os.path.exists('de_20.orig.aff'):
+            :copy de_20.aff de_20.orig.aff
+        @if not os.path.exists('de_20.orig.dic'):
+            :copy de_20.dic de_20.orig.dic
+        @if os.path.exists('de_20.diff'):
+            :sys patch <de_20.diff
+
+# The de_AT.dic is included in de_DE.zip.  We rename the files and concatenate
+# them.  Complication is that de_AT.dic is missing a newline at the end.
+# And the de_DE.dic file is used for something else.
+de_AT.aff de_AT.dic: {buildcheck=}
+        :assertpkg unzip patch
+
+        # Move de_DE files out of the way.
+        @if os.path.exists('de_DE.aff'):
+            :move de_DE.aff de_DE.temp.aff
+        @if os.path.exists('de_DE.dic'):
+            :move de_DE.dic de_DE.temp.dic
+        @if os.path.exists('README_de_DE.txt'):
+            :move README_de_DE.txt README_de_DE.temp.txt
+
+        :fetch $ZIPFILE_AT
+        :sys $UNZIP $ZIPFILE_AT
+        :delete $ZIPFILE_AT
+
+        :print >>de_AT.dic
+        :cat de_DE.dic >>de_AT.dic
+        :delete de_DE.dic
+        :move de_DE.aff de_AT.aff
+        :move README_de_DE.txt README_de_AT.txt
+
+        @if os.path.exists('de_DE.temp.aff'):
+            :move de_DE.temp.aff de_DE.aff
+        @if os.path.exists('de_DE.temp.dic'):
+            :move de_DE.temp.dic de_DE.dic
+        @if os.path.exists('README_de_DE.temp.txt'):
+            :move README_de_DE.temp.txt README_de_DE.txt
+
+        @if not os.path.exists('de_AT.orig.aff'):
+            :copy de_AT.aff de_AT.orig.aff
+        @if not os.path.exists('de_AT.orig.dic'):
+            :copy de_AT.dic de_AT.orig.dic
+        @if os.path.exists('de_AT.diff'):
+            :sys patch <de_AT.diff
+
+de_CH.aff de_CH.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch $ZIPFILE_CH
+        :sys $UNZIP $ZIPFILE_CH
+        :delete $ZIPFILE_CH
+        @if not os.path.exists('de_CH.orig.aff'):
+            :copy de_CH.aff de_CH.orig.aff
+        @if not os.path.exists('de_CH.orig.dic'):
+            :copy de_CH.dic de_CH.orig.dic
+        @if os.path.exists('de_CH.diff'):
+            :sys patch <de_CH.diff
 
 
 # Generate diff files, so that others can get the OpenOffice files and apply
 # the diffs to get the Vim versions.
-
 diff:
         :assertpkg diff
         :sys {force} diff -a -C 1 de_DE.orig.aff de_DE.aff >de_DE.diff
         :sys {force} diff -a -C 1 de_DE.orig.dic de_DE.dic >>de_DE.diff
+        :sys {force} diff -a -C 1 de_19.orig.aff de_19.aff >de_19.diff
+        :sys {force} diff -a -C 1 de_19.orig.dic de_19.dic >>de_19.diff
+        :sys {force} diff -a -C 1 de_20.orig.aff de_20.aff >de_20.diff
+        :sys {force} diff -a -C 1 de_20.orig.dic de_20.dic >>de_20.diff
+        :sys {force} diff -a -C 1 de_AT.orig.aff de_AT.aff >de_AT.diff
+        :sys {force} diff -a -C 1 de_AT.orig.dic de_AT.dic >>de_AT.diff
+        :sys {force} diff -a -C 1 de_CH.orig.aff de_CH.aff >de_CH.diff
+        :sys {force} diff -a -C 1 de_CH.orig.dic de_CH.dic >>de_CH.diff
 
 
 # Check for updated OpenOffice spell files.  When there are changes the
 # ".new.aff" and ".new.dic" files are left behind for manual inspection.
 
 check:
-        :assertpkg unzip diff
-        :fetch $(ZIPFILE)
-        :mkdir tmp
-        :cd tmp
-        @try:
-            @import stat
-            :sys $(UNZIP) ../$(ZIPFILE)
-            :move de_DE_comb.aff de_DE.aff
-            :move de_DE_comb.dic de_DE.dic
-            :sys {force} diff ../de_DE.orig.aff de_DE.aff >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy de_DE.aff ../de_DE.new.aff
-            :sys {force} diff ../de_DE.orig.dic de_DE.dic >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy de_DE.dic ../de_DE.new.dic
-        @finally:
-            :cd ..
-            :delete {r}{f}{q} tmp
-            :delete $(ZIPFILE)
+        :print TODO!!!!
 
 
 # vim: set sts=4 sw=4 :

runtime/spell/el/main.aap

@@ -0,0 +1,78 @@
+# Aap recipe for Greek Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = el_GR.aff el_GR.dic
+
+all: $SPELLDIR/el.iso-8859-7.spl $SPELLDIR/el.utf-8.spl ../README_el.txt
+
+$SPELLDIR/el.iso-8859-7.spl : $FILES
+        :sys env LANG=el_GR.ISO8859-7
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/el el_GR" -c q
+
+$SPELLDIR/el.utf-8.spl : $FILES
+        :sys env LANG=el_GR.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/el el_GR" -c q
+
+../README_el.txt : README_el_GR.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} el_GR.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+el_GR.aff el_GR.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch el_GR.zip
+        :sys $UNZIP el_GR.zip
+        :delete el_GR.zip
+        @if not os.path.exists('el_GR.orig.aff'):
+            :copy el_GR.aff el_GR.orig.aff
+        @if not os.path.exists('el_GR.orig.dic'):
+            :copy el_GR.dic el_GR.orig.dic
+        @if os.path.exists('el_GR.diff'):
+            :sys patch <el_GR.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 el_GR.orig.aff el_GR.aff >el_GR.diff
+        :sys {force} diff -a -C 1 el_GR.orig.dic el_GR.dic >>el_GR.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch el_GR.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../el_GR.zip
+            :sys {force} diff ../el_GR.orig.aff el_GR.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy el_GR.aff ../el_GR.new.aff
+            :sys {force} diff ../el_GR.orig.dic el_GR.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy el_GR.dic ../el_GR.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete el_GR.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/en/en_AU.diff

@@ -1,11 +1,11 @@
 *** en_AU.orig.aff	Fri Apr 15 13:20:36 2005
---- en_AU.aff	Sun Jul  3 17:11:07 2005
+--- en_AU.aff	Sun Jul 31 22:16:19 2005
 ***************
 *** 7,9 ****
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
   REP 24
---- 7,19 ----
+--- 7,140 ----
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ! 
@@ -17,6 +17,127 @@
 ! 
 ! RAR ?
 ! BAD !
+! 
+! MAP 9
+! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! MAP e<><65><EFBFBD><EFBFBD>
+! MAP i<><69><EFBFBD><EFBFBD>
+! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
+! MAP u<><75><EFBFBD><EFBFBD>
+! MAP n<>
+! MAP c<>
+! MAP y<><79>
+! MAP s<>
+! 
+! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+! 
+! SAL AH(AEIOUY)-^         *H
+! SAL AR(AEIOUY)-^         *R
+! SAL A(HR)^               *
+! SAL A^                   *
+! SAL AH(AEIOUY)-          H
+! SAL AR(AEIOUY)-          R
+! SAL A(HR)                _
+! SAL <20>^                   *
+! SAL <20>^                   *
+! SAL BB-                  _
+! SAL B                    B
+! SAL CQ-                  _
+! SAL CIA                  X
+! SAL CH                   X
+! SAL C(EIY)-              S
+! SAL CK                   K
+! SAL COUGH^               KF
+! SAL CC<                  C
+! SAL C                    K
+! SAL DG(EIY)              K
+! SAL DD-                  _
+! SAL D                    T
+! SAL <20><                   E
+! SAL EH(AEIOUY)-^         *H
+! SAL ER(AEIOUY)-^         *R
+! SAL E(HR)^               *
+! SAL ENOUGH^$             *NF
+! SAL E^                   *
+! SAL EH(AEIOUY)-          H
+! SAL ER(AEIOUY)-          R
+! SAL E(HR)                _
+! SAL FF-                  _
+! SAL F                    F
+! SAL GN^                  N
+! SAL GN$                  N
+! SAL GNS$                 NS
+! SAL GNED$                N
+! SAL GH(AEIOUY)-          K
+! SAL GH                   _
+! SAL GG9                  K
+! SAL G                    K
+! SAL H                    H
+! SAL IH(AEIOUY)-^         *H
+! SAL IR(AEIOUY)-^         *R
+! SAL I(HR)^               *
+! SAL I^                   *
+! SAL ING6                 N
+! SAL IH(AEIOUY)-          H
+! SAL IR(AEIOUY)-          R
+! SAL I(HR)                _
+! SAL J                    K
+! SAL KN^                  N
+! SAL KK-                  _
+! SAL K                    K
+! SAL LAUGH^               LF
+! SAL LL-                  _
+! SAL L                    L
+! SAL MB$                  M
+! SAL MM                   M
+! SAL M                    M
+! SAL NN-                  _
+! SAL N                    N
+! SAL OH(AEIOUY)-^         *H
+! SAL OR(AEIOUY)-^         *R
+! SAL O(HR)^               *
+! SAL O^                   *
+! SAL OH(AEIOUY)-          H
+! SAL OR(AEIOUY)-          R
+! SAL O(HR)                _
+! SAL PH                   F
+! SAL PN^                  N
+! SAL PP-                  _
+! SAL P                    P
+! SAL Q                    K
+! SAL RH^                  R
+! SAL ROUGH^               RF
+! SAL RR-                  _
+! SAL R                    R
+! SAL SCH(EOU)-            SK
+! SAL SC(IEY)-             S
+! SAL SH                   X
+! SAL SI(AO)-              X
+! SAL SS-                  _
+! SAL S                    S
+! SAL TI(AO)-              X
+! SAL TH                   @
+! SAL TCH--                _
+! SAL TOUGH^               TF
+! SAL TT-                  _
+! SAL T                    T
+! SAL UH(AEIOUY)-^         *H
+! SAL UR(AEIOUY)-^         *R
+! SAL U(HR)^               *
+! SAL U^                   *
+! SAL UH(AEIOUY)-          H
+! SAL UR(AEIOUY)-          R
+! SAL U(HR)                _
+! SAL V^                   W
+! SAL V                    F
+! SAL WR^                  R
+! SAL WH^                  W
+! SAL W(AEIOU)-            W
+! SAL X^                   S
+! SAL X                    KS
+! SAL Y(AEIOU)-            Y
+! SAL ZZ-                  _
+! SAL Z                    S
 ! 
   REP 24
 ***************
@@ -41,7 +162,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 44,63 ----
+--- 165,184 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -459,7 +580,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 67,461 ----
+--- 188,582 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1543,7 +1664,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
---- 468,1274 ----
+--- 589,1274 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2230,129 +2351,8 @@
 ! SFX 3 0 ist's [aeioubp]y
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
-! 
-! MAP 5
-! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-! MAP e<><65><EFBFBD><EFBFBD>
-! MAP i<><69><EFBFBD><EFBFBD>
-! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
-! MAP u<><75><EFBFBD><EFBFBD>
-! MAP n<>
-! MAP c<>
-! MAP y<><79>
-! MAP s<>
-! 
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-! 
-! SAL AH(AEIOUY)-^         *H
-! SAL AR(AEIOUY)-^         *R
-! SAL A(HR)^               *
-! SAL A^                   *
-! SAL AH(AEIOUY)-          H
-! SAL AR(AEIOUY)-          R
-! SAL A(HR)                _
-! SAL <20>^                   *
-! SAL <20>^                   *
-! SAL BB-                  _
-! SAL B                    B
-! SAL CQ-                  _
-! SAL CIA                  X
-! SAL CH                   X
-! SAL C(EIY)-              S
-! SAL CK                   K
-! SAL COUGH^               KF
-! SAL CC<                  C
-! SAL C                    K
-! SAL DG(EIY)              K
-! SAL DD-                  _
-! SAL D                    T
-! SAL <20><                   E
-! SAL EH(AEIOUY)-^         *H
-! SAL ER(AEIOUY)-^         *R
-! SAL E(HR)^               *
-! SAL ENOUGH^$             *NF
-! SAL E^                   *
-! SAL EH(AEIOUY)-          H
-! SAL ER(AEIOUY)-          R
-! SAL E(HR)                _
-! SAL FF-                  _
-! SAL F                    F
-! SAL GN^                  N
-! SAL GN$                  N
-! SAL GNS$                 NS
-! SAL GNED$                N
-! SAL GH(AEIOUY)-          K
-! SAL GH                   _
-! SAL GG9                  K
-! SAL G                    K
-! SAL H                    H
-! SAL IH(AEIOUY)-^         *H
-! SAL IR(AEIOUY)-^         *R
-! SAL I(HR)^               *
-! SAL I^                   *
-! SAL ING6                 N
-! SAL IH(AEIOUY)-          H
-! SAL IR(AEIOUY)-          R
-! SAL I(HR)                _
-! SAL J                    K
-! SAL KN^                  N
-! SAL KK-                  _
-! SAL K                    K
-! SAL LAUGH^               LF
-! SAL LL-                  _
-! SAL L                    L
-! SAL MB$                  M
-! SAL MM                   M
-! SAL M                    M
-! SAL NN-                  _
-! SAL N                    N
-! SAL OH(AEIOUY)-^         *H
-! SAL OR(AEIOUY)-^         *R
-! SAL O(HR)^               *
-! SAL O^                   *
-! SAL OH(AEIOUY)-          H
-! SAL OR(AEIOUY)-          R
-! SAL O(HR)                _
-! SAL PH                   F
-! SAL PN^                  N
-! SAL PP-                  _
-! SAL P                    P
-! SAL Q                    K
-! SAL RH^                  R
-! SAL ROUGH^               RF
-! SAL RR-                  _
-! SAL R                    R
-! SAL SCH(EOU)-            SK
-! SAL SC(IEY)-             S
-! SAL SH                   X
-! SAL SI(AO)-              X
-! SAL SS-                  _
-! SAL S                    S
-! SAL TI(AO)-              X
-! SAL TH                   @
-! SAL TCH--                _
-! SAL TOUGH^               TF
-! SAL TT-                  _
-! SAL T                    T
-! SAL UH(AEIOUY)-^         *H
-! SAL UR(AEIOUY)-^         *R
-! SAL U(HR)^               *
-! SAL U^                   *
-! SAL UH(AEIOUY)-          H
-! SAL UR(AEIOUY)-          R
-! SAL U(HR)                _
-! SAL V^                   W
-! SAL V                    F
-! SAL WR^                  R
-! SAL WH^                  W
-! SAL W(AEIOU)-            W
-! SAL X^                   S
-! SAL X                    KS
-! SAL Y(AEIOU)-            Y
-! SAL ZZ-                  _
-! SAL Z                    S
 *** en_AU.orig.dic	Fri Apr 15 13:20:36 2005
---- en_AU.dic	Sun Jul  3 17:11:07 2005
+--- en_AU.dic	Tue Aug 16 17:03:44 2005
 ***************
 *** 912,914 ****
   Alaska/M
@@ -2603,25 +2603,26 @@
   Vilnius/M
 ! vim/M
   vinaigrette/MS
---- 43742,43744 ----
+--- 43742,43745 ----
   Vilnius/M
 ! Vim/M
+! vim/?
   vinaigrette/MS
 ***************
 *** 45494,45496 ****
   yippee
 - y/K
   YMCA
---- 45487,45488 ----
+--- 45488,45489 ----
 ***************
 *** 45586,45588 ****
   zap/SGRD
 - z/d
   Zealanders
---- 45578,45579 ----
+--- 45579,45580 ----
 ***************
 *** 45655 ****
---- 45646,45653 ----
+--- 45647,45654 ----
   zymurgy/S
 + nd
 + the the/!

runtime/spell/en/en_CA.diff

@@ -1,8 +1,8 @@
 *** en_CA.orig.aff	Fri Apr 15 13:20:36 2005
---- en_CA.aff	Sun Jul  3 17:09:40 2005
+--- en_CA.aff	Sun Jul 31 22:16:56 2005
 ***************
 *** 3,4 ****
---- 3,13 ----
+--- 3,134 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -13,42 +13,7 @@
 + RAR ?
 + BAD !
 + 
-  PFX A Y 1
-***************
-*** 30,33 ****
-  SFX N   e     ion        e
-! SFX N   y     ication    y 
-! SFX N   0     en         [^ey] 
-  
---- 39,42 ----
-  SFX N   e     ion        e
-! SFX N   y     ication    y
-! SFX N   0     en         [^ey]
-  
-***************
-*** 40,42 ****
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y] 
-  
---- 49,51 ----
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y]
-  
-***************
-*** 47,49 ****
-  SFX G   e     ing        e
-! SFX G   0     ing        [^e] 
-  
---- 56,58 ----
-  SFX G   e     ing        e
-! SFX G   0     ing        [^e]
-  
-***************
-*** 98 ****
---- 107,228 ----
-  SFX L   0     ment       .
-+ 
-+ MAP 5
++ MAP 9
 + MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + MAP e<><65><EFBFBD><EFBFBD>
 + MAP i<><69><EFBFBD><EFBFBD>
@@ -168,8 +133,39 @@
 + SAL Y(AEIOU)-            Y
 + SAL ZZ-                  _
 + SAL Z                    S
++ 
+  PFX A Y 1
+***************
+*** 30,33 ****
+  SFX N   e     ion        e
+! SFX N   y     ication    y 
+! SFX N   0     en         [^ey] 
+  
+--- 160,163 ----
+  SFX N   e     ion        e
+! SFX N   y     ication    y
+! SFX N   0     en         [^ey]
+  
+***************
+*** 40,42 ****
+  SFX H   y     ieth       y
+! SFX H   0     th         [^y] 
+  
+--- 170,172 ----
+  SFX H   y     ieth       y
+! SFX H   0     th         [^y]
+  
+***************
+*** 47,49 ****
+  SFX G   e     ing        e
+! SFX G   0     ing        [^e] 
+  
+--- 177,179 ----
+  SFX G   e     ing        e
+! SFX G   0     ing        [^e]
+  
 *** en_CA.orig.dic	Sat Apr 16 14:40:06 2005
---- en_CA.dic	Sun Jul  3 17:09:40 2005
+--- en_CA.dic	Tue Aug 16 17:03:55 2005
 ***************
 *** 46,48 ****
   R/G
@@ -409,6 +405,15 @@
 + Moolenaar/M
   Bresenham/M
 ***************
+*** 40455,40457 ****
+  proneness/MS
+! transl
+  Conchita/M
+--- 40454,40456 ----
+  proneness/MS
+! transl.
+  Conchita/M
+***************
 *** 50272,50273 ****
 --- 50271,50273 ----
   Dutch/M
@@ -419,19 +424,20 @@
   hatchery/MS
 ! vim/SM
   compatriot/MS
---- 52565,52567 ----
+--- 52565,52568 ----
   hatchery/MS
 ! Vim/SM
+! vim/?
   compatriot/MS
 ***************
 *** 53490,53491 ****
---- 53490,53492 ----
+--- 53491,53493 ----
   unsearchable
 + searchable
   felicitous/IY
 ***************
 *** 62341 ****
---- 62342,62349 ----
+--- 62343,62350 ----
   data/M
 + et al.
 + the the/!

runtime/spell/en/en_GB.diff

@@ -1,8 +1,8 @@
 *** en_GB.orig.aff	Sun Jul  3 17:53:13 2005
---- en_GB.aff	Sun Jul  3 17:59:15 2005
+--- en_GB.aff	Sun Jul 31 22:17:09 2005
 ***************
 *** 8,9 ****
---- 8,19 ----
+--- 8,140 ----
   TRY esia<69>nrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKW<4B><57><EFBFBD><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + 
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -13,6 +13,127 @@
 + 
 + RAR ?
 + BAD !
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
++ # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
++ 
++ SAL AH(AEIOUY)-^         *H
++ SAL AR(AEIOUY)-^         *R
++ SAL A(HR)^               *
++ SAL A^                   *
++ SAL AH(AEIOUY)-          H
++ SAL AR(AEIOUY)-          R
++ SAL A(HR)                _
++ SAL <20>^                   *
++ SAL <20>^                   *
++ SAL BB-                  _
++ SAL B                    B
++ SAL CQ-                  _
++ SAL CIA                  X
++ SAL CH                   X
++ SAL C(EIY)-              S
++ SAL CK                   K
++ SAL COUGH^               KF
++ SAL CC<                  C
++ SAL C                    K
++ SAL DG(EIY)              K
++ SAL DD-                  _
++ SAL D                    T
++ SAL <20><                   E
++ SAL EH(AEIOUY)-^         *H
++ SAL ER(AEIOUY)-^         *R
++ SAL E(HR)^               *
++ SAL ENOUGH^$             *NF
++ SAL E^                   *
++ SAL EH(AEIOUY)-          H
++ SAL ER(AEIOUY)-          R
++ SAL E(HR)                _
++ SAL FF-                  _
++ SAL F                    F
++ SAL GN^                  N
++ SAL GN$                  N
++ SAL GNS$                 NS
++ SAL GNED$                N
++ SAL GH(AEIOUY)-          K
++ SAL GH                   _
++ SAL GG9                  K
++ SAL G                    K
++ SAL H                    H
++ SAL IH(AEIOUY)-^         *H
++ SAL IR(AEIOUY)-^         *R
++ SAL I(HR)^               *
++ SAL I^                   *
++ SAL ING6                 N
++ SAL IH(AEIOUY)-          H
++ SAL IR(AEIOUY)-          R
++ SAL I(HR)                _
++ SAL J                    K
++ SAL KN^                  N
++ SAL KK-                  _
++ SAL K                    K
++ SAL LAUGH^               LF
++ SAL LL-                  _
++ SAL L                    L
++ SAL MB$                  M
++ SAL MM                   M
++ SAL M                    M
++ SAL NN-                  _
++ SAL N                    N
++ SAL OH(AEIOUY)-^         *H
++ SAL OR(AEIOUY)-^         *R
++ SAL O(HR)^               *
++ SAL O^                   *
++ SAL OH(AEIOUY)-          H
++ SAL OR(AEIOUY)-          R
++ SAL O(HR)                _
++ SAL PH                   F
++ SAL PN^                  N
++ SAL PP-                  _
++ SAL P                    P
++ SAL Q                    K
++ SAL RH^                  R
++ SAL ROUGH^               RF
++ SAL RR-                  _
++ SAL R                    R
++ SAL SCH(EOU)-            SK
++ SAL SC(IEY)-             S
++ SAL SH                   X
++ SAL SI(AO)-              X
++ SAL SS-                  _
++ SAL S                    S
++ SAL TI(AO)-              X
++ SAL TH                   @
++ SAL TCH--                _
++ SAL TOUGH^               TF
++ SAL TT-                  _
++ SAL T                    T
++ SAL UH(AEIOUY)-^         *H
++ SAL UR(AEIOUY)-^         *R
++ SAL U(HR)^               *
++ SAL U^                   *
++ SAL UH(AEIOUY)-          H
++ SAL UR(AEIOUY)-          R
++ SAL U(HR)                _
++ SAL V^                   W
++ SAL V                    F
++ SAL WR^                  R
++ SAL WH^                  W
++ SAL W(AEIOU)-            W
++ SAL X^                   S
++ SAL X                    KS
++ SAL Y(AEIOU)-            Y
++ SAL ZZ-                  _
++ SAL Z                    S
 + 
   REP 27
 ***************
@@ -37,7 +158,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 47,66 ----
+--- 168,187 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -455,7 +576,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 70,464 ----
+--- 191,585 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1543,7 +1664,7 @@
 ! SFX 3 0 ist's [aeioubp]y 
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
---- 471,1281 ----
+--- 592,1281 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2234,129 +2355,8 @@
 ! SFX 3 0 ist's [aeioubp]y
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
-! 
-! MAP 5
-! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-! MAP e<><65><EFBFBD><EFBFBD>
-! MAP i<><69><EFBFBD><EFBFBD>
-! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
-! MAP u<><75><EFBFBD><EFBFBD>
-! MAP n<>
-! MAP c<>
-! MAP y<><79>
-! MAP s<>
-! 
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-! 
-! SAL AH(AEIOUY)-^         *H
-! SAL AR(AEIOUY)-^         *R
-! SAL A(HR)^               *
-! SAL A^                   *
-! SAL AH(AEIOUY)-          H
-! SAL AR(AEIOUY)-          R
-! SAL A(HR)                _
-! SAL <20>^                   *
-! SAL <20>^                   *
-! SAL BB-                  _
-! SAL B                    B
-! SAL CQ-                  _
-! SAL CIA                  X
-! SAL CH                   X
-! SAL C(EIY)-              S
-! SAL CK                   K
-! SAL COUGH^               KF
-! SAL CC<                  C
-! SAL C                    K
-! SAL DG(EIY)              K
-! SAL DD-                  _
-! SAL D                    T
-! SAL <20><                   E
-! SAL EH(AEIOUY)-^         *H
-! SAL ER(AEIOUY)-^         *R
-! SAL E(HR)^               *
-! SAL ENOUGH^$             *NF
-! SAL E^                   *
-! SAL EH(AEIOUY)-          H
-! SAL ER(AEIOUY)-          R
-! SAL E(HR)                _
-! SAL FF-                  _
-! SAL F                    F
-! SAL GN^                  N
-! SAL GN$                  N
-! SAL GNS$                 NS
-! SAL GNED$                N
-! SAL GH(AEIOUY)-          K
-! SAL GH                   _
-! SAL GG9                  K
-! SAL G                    K
-! SAL H                    H
-! SAL IH(AEIOUY)-^         *H
-! SAL IR(AEIOUY)-^         *R
-! SAL I(HR)^               *
-! SAL I^                   *
-! SAL ING6                 N
-! SAL IH(AEIOUY)-          H
-! SAL IR(AEIOUY)-          R
-! SAL I(HR)                _
-! SAL J                    K
-! SAL KN^                  N
-! SAL KK-                  _
-! SAL K                    K
-! SAL LAUGH^               LF
-! SAL LL-                  _
-! SAL L                    L
-! SAL MB$                  M
-! SAL MM                   M
-! SAL M                    M
-! SAL NN-                  _
-! SAL N                    N
-! SAL OH(AEIOUY)-^         *H
-! SAL OR(AEIOUY)-^         *R
-! SAL O(HR)^               *
-! SAL O^                   *
-! SAL OH(AEIOUY)-          H
-! SAL OR(AEIOUY)-          R
-! SAL O(HR)                _
-! SAL PH                   F
-! SAL PN^                  N
-! SAL PP-                  _
-! SAL P                    P
-! SAL Q                    K
-! SAL RH^                  R
-! SAL ROUGH^               RF
-! SAL RR-                  _
-! SAL R                    R
-! SAL SCH(EOU)-            SK
-! SAL SC(IEY)-             S
-! SAL SH                   X
-! SAL SI(AO)-              X
-! SAL SS-                  _
-! SAL S                    S
-! SAL TI(AO)-              X
-! SAL TH                   @
-! SAL TCH--                _
-! SAL TOUGH^               TF
-! SAL TT-                  _
-! SAL T                    T
-! SAL UH(AEIOUY)-^         *H
-! SAL UR(AEIOUY)-^         *R
-! SAL U(HR)^               *
-! SAL U^                   *
-! SAL UH(AEIOUY)-          H
-! SAL UR(AEIOUY)-          R
-! SAL U(HR)                _
-! SAL V^                   W
-! SAL V                    F
-! SAL WR^                  R
-! SAL WH^                  W
-! SAL W(AEIOU)-            W
-! SAL X^                   S
-! SAL X                    KS
-! SAL Y(AEIOU)-            Y
-! SAL ZZ-                  _
-! SAL Z                    S
 *** en_GB.orig.dic	Sun Jul  3 18:05:07 2005
---- en_GB.dic	Sun Jul  3 18:19:25 2005
+--- en_GB.dic	Tue Aug 16 17:05:18 2005
 ***************
 *** 630,632 ****
   Byrne/M
@@ -2482,7 +2482,7 @@
   vindaloo/S
 --- 30760,30763 ----
   villein/SM
-! vim/M?
+! vim/?
 ! Vim/M
   vindaloo/S
 ***************

runtime/spell/en/en_NZ.diff

@@ -1,11 +1,11 @@
 *** en_NZ.orig.aff	Fri Apr 15 13:20:36 2005
---- en_NZ.aff	Sun Jul  3 17:11:34 2005
+--- en_NZ.aff	Sun Jul 31 22:17:27 2005
 ***************
 *** 7,9 ****
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 
   REP 66
---- 7,19 ----
+--- 7,140 ----
   SET ISO8859-1
 ! TRY esia<69>nrtolcdugmphbyfvkw-'.zqjxSNRTLCGDMPHBEAUYOFIVKW<4B><57><EFBFBD>ZQJX<4A><58><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 ! 
@@ -17,6 +17,127 @@
 ! 
 ! RAR ?
 ! BAD !
+! 
+! MAP 9
+! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! MAP e<><65><EFBFBD><EFBFBD>
+! MAP i<><69><EFBFBD><EFBFBD>
+! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
+! MAP u<><75><EFBFBD><EFBFBD>
+! MAP n<>
+! MAP c<>
+! MAP y<><79>
+! MAP s<>
+! 
+! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
+! 
+! SAL AH(AEIOUY)-^         *H
+! SAL AR(AEIOUY)-^         *R
+! SAL A(HR)^               *
+! SAL A^                   *
+! SAL AH(AEIOUY)-          H
+! SAL AR(AEIOUY)-          R
+! SAL A(HR)                _
+! SAL <20>^                   *
+! SAL <20>^                   *
+! SAL BB-                  _
+! SAL B                    B
+! SAL CQ-                  _
+! SAL CIA                  X
+! SAL CH                   X
+! SAL C(EIY)-              S
+! SAL CK                   K
+! SAL COUGH^               KF
+! SAL CC<                  C
+! SAL C                    K
+! SAL DG(EIY)              K
+! SAL DD-                  _
+! SAL D                    T
+! SAL <20><                   E
+! SAL EH(AEIOUY)-^         *H
+! SAL ER(AEIOUY)-^         *R
+! SAL E(HR)^               *
+! SAL ENOUGH^$             *NF
+! SAL E^                   *
+! SAL EH(AEIOUY)-          H
+! SAL ER(AEIOUY)-          R
+! SAL E(HR)                _
+! SAL FF-                  _
+! SAL F                    F
+! SAL GN^                  N
+! SAL GN$                  N
+! SAL GNS$                 NS
+! SAL GNED$                N
+! SAL GH(AEIOUY)-          K
+! SAL GH                   _
+! SAL GG9                  K
+! SAL G                    K
+! SAL H                    H
+! SAL IH(AEIOUY)-^         *H
+! SAL IR(AEIOUY)-^         *R
+! SAL I(HR)^               *
+! SAL I^                   *
+! SAL ING6                 N
+! SAL IH(AEIOUY)-          H
+! SAL IR(AEIOUY)-          R
+! SAL I(HR)                _
+! SAL J                    K
+! SAL KN^                  N
+! SAL KK-                  _
+! SAL K                    K
+! SAL LAUGH^               LF
+! SAL LL-                  _
+! SAL L                    L
+! SAL MB$                  M
+! SAL MM                   M
+! SAL M                    M
+! SAL NN-                  _
+! SAL N                    N
+! SAL OH(AEIOUY)-^         *H
+! SAL OR(AEIOUY)-^         *R
+! SAL O(HR)^               *
+! SAL O^                   *
+! SAL OH(AEIOUY)-          H
+! SAL OR(AEIOUY)-          R
+! SAL O(HR)                _
+! SAL PH                   F
+! SAL PN^                  N
+! SAL PP-                  _
+! SAL P                    P
+! SAL Q                    K
+! SAL RH^                  R
+! SAL ROUGH^               RF
+! SAL RR-                  _
+! SAL R                    R
+! SAL SCH(EOU)-            SK
+! SAL SC(IEY)-             S
+! SAL SH                   X
+! SAL SI(AO)-              X
+! SAL SS-                  _
+! SAL S                    S
+! SAL TI(AO)-              X
+! SAL TH                   @
+! SAL TCH--                _
+! SAL TOUGH^               TF
+! SAL TT-                  _
+! SAL T                    T
+! SAL UH(AEIOUY)-^         *H
+! SAL UR(AEIOUY)-^         *R
+! SAL U(HR)^               *
+! SAL U^                   *
+! SAL UH(AEIOUY)-          H
+! SAL UR(AEIOUY)-          R
+! SAL U(HR)                _
+! SAL V^                   W
+! SAL V                    F
+! SAL WR^                  R
+! SAL WH^                  W
+! SAL W(AEIOU)-            W
+! SAL X^                   S
+! SAL X                    KS
+! SAL Y(AEIOU)-            Y
+! SAL ZZ-                  _
+! SAL Z                    S
 ! 
   REP 66
 ***************
@@ -41,7 +162,7 @@
   PFX E Y 1
 ! PFX E 0 dis . 
   PFX F Y 5
---- 86,105 ----
+--- 207,226 ----
   PFX A Y 2
 ! PFX A 0 re [^e]
 ! PFX A 0 re- e
@@ -459,7 +580,7 @@
   SFX T y iest [^aeiou]y
 ! SFX T 0 er [aeiou]y 
   SFX T 0 est [aeiou]y
---- 109,503 ----
+--- 230,624 ----
   PFX F 0 col l
 ! PFX F 0 con [^abehilmopru].
   PFX K Y 1
@@ -1544,7 +1665,7 @@
 ! SFX 3 o ist's o 
 ! SFX 3 0 ist's [^eoy] 
 \ No newline at end of file
---- 510,1316 ----
+--- 631,1316 ----
   SFX R Y 72
 ! SFX R 0 r e
 ! SFX R 0 rs e
@@ -2231,129 +2352,8 @@
 ! SFX 3 0 ist's [aeioubp]y
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
-! 
-! MAP 5
-! MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-! MAP e<><65><EFBFBD><EFBFBD>
-! MAP i<><69><EFBFBD><EFBFBD>
-! MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
-! MAP u<><75><EFBFBD><EFBFBD>
-! MAP n<>
-! MAP c<>
-! MAP y<><79>
-! MAP s<>
-! 
-! # This comes from Aspell en_phonet.dat, version 1.1, 2000-01-07
-! 
-! SAL AH(AEIOUY)-^         *H
-! SAL AR(AEIOUY)-^         *R
-! SAL A(HR)^               *
-! SAL A^                   *
-! SAL AH(AEIOUY)-          H
-! SAL AR(AEIOUY)-          R
-! SAL A(HR)                _
-! SAL <20>^                   *
-! SAL <20>^                   *
-! SAL BB-                  _
-! SAL B                    B
-! SAL CQ-                  _
-! SAL CIA                  X
-! SAL CH                   X
-! SAL C(EIY)-              S
-! SAL CK                   K
-! SAL COUGH^               KF
-! SAL CC<                  C
-! SAL C                    K
-! SAL DG(EIY)              K
-! SAL DD-                  _
-! SAL D                    T
-! SAL <20><                   E
-! SAL EH(AEIOUY)-^         *H
-! SAL ER(AEIOUY)-^         *R
-! SAL E(HR)^               *
-! SAL ENOUGH^$             *NF
-! SAL E^                   *
-! SAL EH(AEIOUY)-          H
-! SAL ER(AEIOUY)-          R
-! SAL E(HR)                _
-! SAL FF-                  _
-! SAL F                    F
-! SAL GN^                  N
-! SAL GN$                  N
-! SAL GNS$                 NS
-! SAL GNED$                N
-! SAL GH(AEIOUY)-          K
-! SAL GH                   _
-! SAL GG9                  K
-! SAL G                    K
-! SAL H                    H
-! SAL IH(AEIOUY)-^         *H
-! SAL IR(AEIOUY)-^         *R
-! SAL I(HR)^               *
-! SAL I^                   *
-! SAL ING6                 N
-! SAL IH(AEIOUY)-          H
-! SAL IR(AEIOUY)-          R
-! SAL I(HR)                _
-! SAL J                    K
-! SAL KN^                  N
-! SAL KK-                  _
-! SAL K                    K
-! SAL LAUGH^               LF
-! SAL LL-                  _
-! SAL L                    L
-! SAL MB$                  M
-! SAL MM                   M
-! SAL M                    M
-! SAL NN-                  _
-! SAL N                    N
-! SAL OH(AEIOUY)-^         *H
-! SAL OR(AEIOUY)-^         *R
-! SAL O(HR)^               *
-! SAL O^                   *
-! SAL OH(AEIOUY)-          H
-! SAL OR(AEIOUY)-          R
-! SAL O(HR)                _
-! SAL PH                   F
-! SAL PN^                  N
-! SAL PP-                  _
-! SAL P                    P
-! SAL Q                    K
-! SAL RH^                  R
-! SAL ROUGH^               RF
-! SAL RR-                  _
-! SAL R                    R
-! SAL SCH(EOU)-            SK
-! SAL SC(IEY)-             S
-! SAL SH                   X
-! SAL SI(AO)-              X
-! SAL SS-                  _
-! SAL S                    S
-! SAL TI(AO)-              X
-! SAL TH                   @
-! SAL TCH--                _
-! SAL TOUGH^               TF
-! SAL TT-                  _
-! SAL T                    T
-! SAL UH(AEIOUY)-^         *H
-! SAL UR(AEIOUY)-^         *R
-! SAL U(HR)^               *
-! SAL U^                   *
-! SAL UH(AEIOUY)-          H
-! SAL UR(AEIOUY)-          R
-! SAL U(HR)                _
-! SAL V^                   W
-! SAL V                    F
-! SAL WR^                  R
-! SAL WH^                  W
-! SAL W(AEIOU)-            W
-! SAL X^                   S
-! SAL X                    KS
-! SAL Y(AEIOU)-            Y
-! SAL ZZ-                  _
-! SAL Z                    S
 *** en_NZ.orig.dic	Fri Apr 15 13:20:36 2005
---- en_NZ.dic	Sun Jul  3 17:11:34 2005
+--- en_NZ.dic	Tue Aug 16 17:05:28 2005
 ***************
 *** 4,6 ****
   2ZB
@@ -2591,82 +2591,83 @@
   Vilnius/M
 ! vim/M
   vinaigrette/MS
---- 44313,44315 ----
+--- 44313,44316 ----
   Vilnius/M
 ! Vim/M
+! vim/?
   vinaigrette/MS
 ***************
 *** 45906,45908 ****
   y'all
 - prey/M
   yacht/M5SmGD
---- 45885,45886 ----
+--- 45886,45887 ----
 ***************
 *** 46198,46200 ****
   rata/M
 - kaka/M
   waka/M
---- 46176,46177 ----
+--- 46177,46178 ----
 ***************
 *** 46216,46218 ****
   jandal/MS
 - Swanndri/M
   hoon/MS
---- 46193,46194 ----
+--- 46194,46195 ----
 ***************
 *** 46242,46244 ****
   Invercargill/M
 - Te
   Alexandra/M
---- 46218,46219 ----
+--- 46219,46220 ----
 ***************
 *** 46261,46263 ****
   Kawerau/M
 - Kerikeri/M
   Lyttelton/M
---- 46236,46237 ----
+--- 46237,46238 ----
 ***************
 *** 46491,46493 ****
   Waianakarua
 - Hakatere
   Swin
---- 46465,46466 ----
+--- 46466,46467 ----
 ***************
 *** 46690,46692 ****
   Omarama/M
 - Wairarapa/M
   Kilda/M
---- 46663,46664 ----
+--- 46664,46665 ----
 ***************
 *** 46711,46713 ****
   Wellsford/M
 - Akaroa/M
   Avonhead/M
---- 46683,46684 ----
+--- 46684,46685 ----
 ***************
 *** 46838,46840 ****
   Ballantyne's
 - DB
   Monteith's
---- 46809,46810 ----
+--- 46810,46811 ----
 ***************
 *** 46920,46922 ****
   Egmont/M
 - Waitaki/M
   katipo/M
---- 46890,46891 ----
+--- 46891,46892 ----
 ***************
 *** 46956,46958 ****
   Sunnyside/M
 - Wairau/M
   Waikoropupu
---- 46925,46926 ----
+--- 46926,46927 ----
 ***************
 *** 47141,47142 ****
   Burkina
 ! Faso/M
 \ No newline at end of file
---- 47109,47117 ----
+--- 47110,47118 ----
   Burkina
 ! Faso/M
 ! nd

runtime/spell/en/en_US.diff

@@ -1,8 +1,8 @@
 *** en_US.orig.aff	Fri Apr 15 13:20:36 2005
---- en_US.aff	Sun Jul  3 16:59:28 2005
+--- en_US.aff	Sun Jul 31 22:17:40 2005
 ***************
 *** 3,4 ****
---- 3,13 ----
+--- 3,134 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -13,49 +13,7 @@
 + RAR ?
 + BAD !
 + 
-  PFX A Y 1
-***************
-*** 30,33 ****
-  SFX N   e     ion        e
-! SFX N   y     ication    y 
-! SFX N   0     en         [^ey] 
-  
---- 39,42 ----
-  SFX N   e     ion        e
-! SFX N   y     ication    y
-! SFX N   0     en         [^ey]
-  
-***************
-*** 40,42 ****
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y] 
-  
---- 49,51 ----
-  SFX H   y     ieth       y
-! SFX H   0     th         [^y]
-  
-***************
-*** 47,49 ****
-  SFX G   e     ing        e
-! SFX G   0     ing        [^e] 
-  
---- 56,58 ----
-  SFX G   e     ing        e
-! SFX G   0     ing        [^e]
-  
-***************
-*** 137,138 ****
---- 146,149 ----
-  REP uy i
-+ REP y ie
-+ REP ie y
-  REP i ee
-***************
-*** 188 ****
---- 199,320 ----
-  REP shun cion
-+ 
-+ MAP 5
++ MAP 9
 + MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + MAP e<><65><EFBFBD><EFBFBD>
 + MAP i<><69><EFBFBD><EFBFBD>
@@ -175,8 +133,46 @@
 + SAL Y(AEIOU)-            Y
 + SAL ZZ-                  _
 + SAL Z                    S
++ 
+  PFX A Y 1
+***************
+*** 30,33 ****
+  SFX N   e     ion        e
+! SFX N   y     ication    y 
+! SFX N   0     en         [^ey] 
+  
+--- 160,163 ----
+  SFX N   e     ion        e
+! SFX N   y     ication    y
+! SFX N   0     en         [^ey]
+  
+***************
+*** 40,42 ****
+  SFX H   y     ieth       y
+! SFX H   0     th         [^y] 
+  
+--- 170,172 ----
+  SFX H   y     ieth       y
+! SFX H   0     th         [^y]
+  
+***************
+*** 47,49 ****
+  SFX G   e     ing        e
+! SFX G   0     ing        [^e] 
+  
+--- 177,179 ----
+  SFX G   e     ing        e
+! SFX G   0     ing        [^e]
+  
+***************
+*** 137,138 ****
+--- 267,270 ----
+  REP uy i
++ REP y ie
++ REP ie y
+  REP i ee
 *** en_US.orig.dic	Fri Apr 15 13:20:36 2005
---- en_US.dic	Sun Jul  3 16:59:28 2005
+--- en_US.dic	Tue Aug 16 17:03:31 2005
 ***************
 *** 5944,5946 ****
   bk
@@ -471,6 +467,15 @@
 ! sings
   sybarite/MS
 ***************
+*** 56906,56908 ****
+  transit/SGVMD
+! transl
+  translatability/M
+--- 56905,56907 ----
+  transit/SGVMD
+! transl.
+  translatability/M
+***************
 *** 57728,57730 ****
   TX
 ! t/XTJBG
@@ -505,16 +510,17 @@
   vi/MDR
 ! vim/MS
   vinaigrette/MS
---- 59537,59539 ----
+--- 59537,59540 ----
   vi/MDR
 ! Vim/MS
+! vim/?
   vinaigrette/MS
 ***************
 *** 61534,61536 ****
   WWW
 ! w/XTJGV
   WY
---- 61533,61536 ----
+--- 61534,61537 ----
   WWW
 ! wens
 ! wings
@@ -524,19 +530,19 @@
   yew/SM
 - y/F
   Yggdrasil/M
---- 61750,61751 ----
+--- 61751,61752 ----
 ***************
 *** 62058,62060 ****
   Zsigmondy/M
 ! z/TGJ
   Zubenelgenubi/M
---- 62057,62059 ----
+--- 62058,62060 ----
   Zsigmondy/M
 ! zings
   Zubenelgenubi/M
 ***************
 *** 62077 ****
---- 62076,62083 ----
+--- 62077,62084 ----
   zymurgy/S
 + nd
 + the the/!

runtime/spell/en/main.aap

@@ -4,7 +4,7 @@
 @if os.path.exists('../../../src/vim'):
     VIM = ../../../src/vim
 @else:
-    VIM = vim
+    :progsearch VIM vim
 
 SPELLDIR = ..
 FILES    = en_US.aff en_US.dic
@@ -13,21 +13,21 @@ FILES    = en_US.aff en_US.dic
            en_GB.aff en_GB.dic
            en_NZ.aff en_NZ.dic
 
-all: $(SPELLDIR)/en.latin1.spl $(SPELLDIR)/en.utf-8.spl \
-        $(SPELLDIR)/en.ascii.spl ../README_en.txt
+all: $SPELLDIR/en.latin1.spl $SPELLDIR/en.utf-8.spl \
+        $SPELLDIR/en.ascii.spl ../README_en.txt
 
-$(SPELLDIR)/en.latin1.spl : $(VIM) $(FILES)
+$SPELLDIR/en.latin1.spl : $FILES
         :sys env LANG=en_US.ISO8859-1
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB
-			en_NZ" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/en
+                        en_US en_AU en_CA en_GB en_NZ" -c q
 
-$(SPELLDIR)/en.utf-8.spl : $(VIM) $(FILES)
+$SPELLDIR/en.utf-8.spl : $FILES
         :sys env LANG=en_US.UTF-8
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/en en_US en_AU en_CA en_GB
-			en_NZ" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/en
+                        en_US en_AU en_CA en_GB en_NZ" -c q
 
-$(SPELLDIR)/en.ascii.spl : $(VIM) $(FILES)
-        :sys $(VIM) -e -c "mkspell! -ascii $(SPELLDIR)/en
+$SPELLDIR/en.ascii.spl : $FILES
+        :sys $VIM -u NONE -e -c "mkspell! -ascii $SPELLDIR/en
                         en_US en_AU en_CA en_GB en_NZ" -c q
  
 ../README_en.txt: README_en_US.txt README_en_AU.txt
@@ -50,7 +50,7 @@ $(SPELLDIR)/en.ascii.spl : $(VIM) $(FILES)
 # Fetching the files from OpenOffice.org.
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $(OODIR)/%file%} en_US.zip en_CA.zip en_NZ.zip
+:attr {fetch = $OODIR/%file%} en_US.zip en_CA.zip en_NZ.zip
                                 en_GB.zip en_AU.zip
 
 # The files don't depend on the .zip file so that we can delete it.
@@ -58,58 +58,63 @@ OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionari
 en_US.aff en_US.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch en_US.zip
-        :sys $(UNZIP) en_US.zip
+        :sys $UNZIP en_US.zip
         :delete en_US.zip
         @if not os.path.exists('en_US.orig.aff'):
-                :copy en_US.aff en_US.orig.aff
+            :copy en_US.aff en_US.orig.aff
         @if not os.path.exists('en_US.orig.dic'):
-                :copy en_US.aff en_US.orig.dic
-        :sys patch <en_US.diff
+            :copy en_US.dic en_US.orig.dic
+        @if os.path.exists('en_US.diff'):
+            :sys patch <en_US.diff
 
 en_AU.aff en_AU.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch en_AU.zip
-        :sys $(UNZIP) en_AU.zip
+        :sys $UNZIP en_AU.zip
         :delete en_AU.zip
         @if not os.path.exists('en_AU.orig.aff'):
-                :copy en_AU.aff en_AU.orig.aff
+            :copy en_AU.aff en_AU.orig.aff
         @if not os.path.exists('en_AU.orig.dic'):
-                :copy en_AU.aff en_AU.orig.dic
-        :sys patch <en_AU.diff
+            :copy en_AU.dic en_AU.orig.dic
+        @if os.path.exists('en_AU.diff'):
+            :sys patch <en_AU.diff
 
 en_CA.aff en_CA.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch en_CA.zip
-        :sys $(UNZIP) en_CA.zip
+        :sys $UNZIP en_CA.zip
         :delete en_CA.zip
         @if not os.path.exists('en_CA.orig.aff'):
-                :copy en_CA.aff en_CA.orig.aff
+            :copy en_CA.aff en_CA.orig.aff
         @if not os.path.exists('en_CA.orig.dic'):
-                :copy en_CA.aff en_CA.orig.dic
-        :sys patch <en_CA.diff
+            :copy en_CA.dic en_CA.orig.dic
+        @if os.path.exists('en_CA.diff'):
+            :sys patch <en_CA.diff
 
 en_GB.aff en_GB.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch en_GB.zip
-        :sys $(UNZIP) en_GB.zip
+        :sys $UNZIP en_GB.zip
         :delete en_GB.zip
         :delete dictionary.lst.example
         @if not os.path.exists('en_GB.orig.aff'):
-                :copy en_GB.aff en_GB.orig.aff
+            :copy en_GB.aff en_GB.orig.aff
         @if not os.path.exists('en_GB.orig.dic'):
-                :copy en_GB.aff en_GB.orig.dic
-        :sys patch <en_GB.diff
+            :copy en_GB.dic en_GB.orig.dic
+        @if os.path.exists('en_GB.diff'):
+            :sys patch <en_GB.diff
 
 en_NZ.aff en_NZ.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch en_NZ.zip
-        :sys $(UNZIP) en_NZ.zip
+        :sys $UNZIP en_NZ.zip
         :delete en_NZ.zip
         @if not os.path.exists('en_NZ.orig.aff'):
-                :copy en_NZ.aff en_NZ.orig.aff
+            :copy en_NZ.aff en_NZ.orig.aff
         @if not os.path.exists('en_NZ.orig.dic'):
-                :copy en_NZ.aff en_NZ.orig.dic
-        :sys patch <en_NZ.diff
+            :copy en_NZ.dic en_NZ.orig.dic
+        @if os.path.exists('en_NZ.diff'):
+            :sys patch <en_NZ.diff
 
 
 # Generate diff files, so that others can get the OpenOffice files and apply
@@ -141,7 +146,7 @@ check-us:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../en_US.zip
+            :sys $UNZIP ../en_US.zip
             :sys {force} diff ../en_US.orig.aff en_US.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy en_US.aff ../en_US.new.aff
@@ -160,7 +165,7 @@ check-au:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../en_AU.zip
+            :sys $UNZIP ../en_AU.zip
             :sys {force} diff ../en_AU.orig.aff en_AU.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy en_AU.aff ../en_AU.new.aff
@@ -179,7 +184,7 @@ check-ca:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../en_CA.zip
+            :sys $UNZIP ../en_CA.zip
             :sys {force} diff ../en_CA.orig.aff en_CA.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy en_CA.aff ../en_CA.new.aff
@@ -198,7 +203,7 @@ check-gb:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../en_GB.zip
+            :sys $UNZIP ../en_GB.zip
             :sys {force} diff ../en_GB.orig.aff en_GB.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy en_GB.aff ../en_GB.new.aff
@@ -217,7 +222,7 @@ check-nz:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../en_NZ.zip
+            :sys $UNZIP ../en_NZ.zip
             :sys {force} diff ../en_NZ.orig.aff en_NZ.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy en_NZ.aff ../en_NZ.new.aff

runtime/spell/eo/main.aap

@@ -0,0 +1,80 @@
+# Aap recipe for Esperanto Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = eo_l3.aff eo_l3.dic
+
+all: $SPELLDIR/eo.iso-8859-3.spl $SPELLDIR/eo.utf-8.spl ../README_eo.txt
+
+$SPELLDIR/eo.iso-8859-3.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=iso-8859-3"
+                -c "mkspell! $SPELLDIR/eo eo_l3" -c q
+
+$SPELLDIR/eo.utf-8.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=utf-8"
+                -c "mkspell! $SPELLDIR/eo eo_l3" -c q
+
+../README_eo.txt : README_eo_l3.txt
+        :copy $source $target
+        # fix missing newline
+        :sys $VIM $target -e -c "set ff=unix" -c wq
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} eo.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+eo_l3.aff eo_l3.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch eo.zip
+        :sys $UNZIP eo.zip
+        :delete eo.zip
+        @if not os.path.exists('eo_l3.orig.aff'):
+            :copy eo_l3.aff eo_l3.orig.aff
+        @if not os.path.exists('eo_l3.orig.dic'):
+            :copy eo_l3.dic eo_l3.orig.dic
+        @if os.path.exists('eo_l3.diff'):
+            :sys patch <eo_l3.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 eo_l3.orig.aff eo_l3.aff >eo_l3.diff
+        :sys {force} diff -a -C 1 eo_l3.orig.dic eo_l3.dic >>eo_l3.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch eo.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../eo.zip
+            :sys {force} diff ../eo_l3.orig.aff eo_l3.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy eo_l3.aff ../eo_l3.new.aff
+            :sys {force} diff ../eo_l3.orig.dic eo_l3.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy eo_l3.dic ../eo_l3.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete eo.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/es/es_ES.diff

@@ -0,0 +1,25 @@
+*** es_ES.orig.aff	Thu Aug 25 19:11:20 2005
+--- es_ES.aff	Thu Aug 25 19:12:47 2005
+***************
+*** 3,4 ****
+--- 3,22 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  SFX J Y 12

runtime/spell/es/main.aap

@@ -0,0 +1,92 @@
+# Aap recipe for Spanish Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+REGIONS    = ES MX
+ES_REGIONS = es_$*REGIONS
+
+SPELLDIR   = ..
+FILES      = es_$*(REGIONS).aff es_$*(REGIONS).dic
+
+ZIPFILE_ES = es_ES.zip
+ZIPFILE_MX = es_MX.zip
+ZIPFILES   = $ZIPFILE_ES $ZIPFILE_MX
+
+READMES    = README_es_$*(REGIONS).txt
+
+all: $SPELLDIR/es.latin1.spl $SPELLDIR/es.utf-8.spl ../README_es.txt
+
+$SPELLDIR/es.latin1.spl : $FILES
+        :sys env LANG=es_ES.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/es $ES_REGIONS" -c q
+
+$SPELLDIR/es.utf-8.spl : $FILES
+        :sys env LANG=es_ES.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/es $ES_REGIONS" -c q
+
+../README_es.txt: $READMES
+        :print es_ES >! $target
+        :cat README_es_ES.txt   >> $target
+        :print =================================================== >>$target
+        :print es_MX >> $target
+        :cat README_es_MX.txt   >> $target
+
+#
+# Fetching the files from the OpenOffice.org site.
+# The OLDSPELL file comes from elsewhere
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} $ZIPFILES
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+es_ES.aff es_ES.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch $ZIPFILE_ES
+        :sys $UNZIP $ZIPFILE_ES
+        :delete add-to--dictionary.lst.example
+        #:delete $ZIPFILE_ES
+        @if not os.path.exists('es_ES.orig.aff'):
+            :copy es_ES.aff es_ES.orig.aff
+        @if not os.path.exists('es_ES.orig.dic'):
+            :copy es_ES.dic es_ES.orig.dic
+        @if os.path.exists('es_ES.diff'):
+            :sys patch <es_ES.diff
+
+es_MX.aff es_MX.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch $ZIPFILE_MX
+        :print No copyright information for es_MX wordlist >! README_es_MX.txt
+        :sys $UNZIP $ZIPFILE_MX
+        #:delete $ZIPFILE_MX
+        :sys $VIM -e -c "set ff=unix | wq" es_MX.dic
+        @if not os.path.exists('es_MX.orig.aff'):
+            :copy es_MX.aff es_MX.orig.aff
+        @if not os.path.exists('es_MX.orig.dic'):
+            :copy es_MX.dic es_MX.orig.dic
+        @if os.path.exists('es_MX.diff'):
+            :sys patch <es_MX.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 es_ES.orig.aff es_ES.aff >es_ES.diff
+        :sys {force} diff -a -C 1 es_ES.orig.dic es_ES.dic >>es_ES.diff
+        :sys {force} diff -a -C 1 es_MX.orig.aff es_MX.aff >es_MX.diff
+        :sys {force} diff -a -C 1 es_MX.orig.dic es_MX.dic >>es_MX.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :print TODO!!!!
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/fixdup

@@ -0,0 +1,27 @@
+" Vim script to fix duplicate words in a .dic file  vim: set ft=vim:
+"
+" Usage: Edit the .dic file and source this script.
+
+let deleted = 0
+
+" Start below the word count.
+let lnum = 2
+while lnum <= line('$')
+  let word = getline(lnum)
+  if word !~ '/'
+    if search('^' . word . '/', 'w') != 0
+      let deleted += 1
+      exe lnum . "d"
+      continue		" don't increment lnum, it's already at the next word
+    endif
+  endif
+  let lnum += 1
+endwhile
+
+if deleted == 0
+  echomsg "No duplicate words found"
+elseif deleted == 1
+  echomsg "Deleted 1 duplicate word"
+else
+  echomsg printf("Deleted %d duplicate words", deleted)
+endif

runtime/spell/fo/fo_FO.diff

@@ -0,0 +1,14 @@
+*** fo_FO.orig.aff	Tue Aug 16 17:39:22 2005
+--- fo_FO.aff	Tue Aug 16 17:41:00 2005
+***************
+*** 6 ****
+--- 6,14 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'-

runtime/spell/fo/main.aap

@@ -0,0 +1,79 @@
+# Aap recipe for Faroese Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = fo_FO.aff fo_FO.dic
+
+all: $SPELLDIR/fo.latin1.spl $SPELLDIR/fo.utf-8.spl ../README_fo.txt
+
+$SPELLDIR/fo.latin1.spl : $FILES
+        :sys env LANG=fo_FO.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fo fo_FO" -c q
+
+$SPELLDIR/fo.utf-8.spl : $FILES
+        :sys env LANG=fo_FO.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fo fo_FO" -c q
+
+../README_fo.txt : README_fo_FO.txt Copyright
+        :cat $source >! $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} fo_FO.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+fo_FO.aff fo_FO.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch fo_FO.zip
+        :sys $UNZIP fo_FO.zip
+        :delete fo_FO.zip
+        :delete contributors fo_FO.excluded Makefile COPYING
+        @if not os.path.exists('fo_FO.orig.aff'):
+            :copy fo_FO.aff fo_FO.orig.aff
+        @if not os.path.exists('fo_FO.orig.dic'):
+            :copy fo_FO.dic fo_FO.orig.dic
+        @if os.path.exists('fo_FO.diff'):
+            :sys patch <fo_FO.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 fo_FO.orig.aff fo_FO.aff >fo_FO.diff
+        :sys {force} diff -a -C 1 fo_FO.orig.dic fo_FO.dic >>fo_FO.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch fo_FO.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../fo_FO.zip
+            :sys {force} diff ../fo_FO.orig.aff fo_FO.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy fo_FO.aff ../fo_FO.new.aff
+            :sys {force} diff ../fo_FO.orig.dic fo_FO.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy fo_FO.dic ../fo_FO.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete fo_FO.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/fr/fr_FR.diff

@@ -1,8 +1,8 @@
 *** fr_FR.orig.aff	Sun Jul  3 19:34:20 2005
---- fr_FR.aff	Sun Jul  3 20:09:20 2005
+--- fr_FR.aff	Sun Jul 31 22:17:53 2005
 ***************
 *** 3,4 ****
---- 3,13 ----
+--- 3,24 ----
   
 + FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -13,13 +13,7 @@
 + 
 + MIDWORD	'
 + 
-  PFX A Y 10
-***************
-*** 691,692 ****
---- 700,712 ----
-  
-+ 
-+ MAP 5
++ MAP 9
 + MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 + MAP e<><65><EFBFBD><EFBFBD>
 + MAP i<><69><EFBFBD><EFBFBD>
@@ -29,4 +23,13 @@
 + MAP c<>
 + MAP y<><79>
 + MAP s<>
-  
++ 
+  PFX A Y 10
+***************
+*** 690,694 ****
+  SFX q   ssait      raient     ssait
+- 
+- 
+- 
+- 
+--- 710 ----

runtime/spell/fr/main.aap

@@ -4,42 +4,43 @@
 @if os.path.exists('../../../src/vim'):
     VIM = ../../../src/vim
 @else:
-    VIM = vim
+    :progsearch VIM vim
 
 SPELLDIR = ..
 FILES    = fr_FR.aff fr_FR.dic
 
-all: $(SPELLDIR)/fr.latin1.spl $(SPELLDIR)/fr.utf-8.spl ../README_fr.txt
+all: $SPELLDIR/fr.latin1.spl $SPELLDIR/fr.utf-8.spl ../README_fr.txt
 
-$(SPELLDIR)/fr.latin1.spl : $(VIM) $(FILES)
+$SPELLDIR/fr.latin1.spl : $FILES
         :sys env LANG=fr_FR.ISO8859-1
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/fr fr_FR" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q
 
-$(SPELLDIR)/fr.utf-8.spl : $(VIM) $(FILES)
+$SPELLDIR/fr.utf-8.spl : $FILES
         :sys env LANG=fr_FR.UTF-8
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/fr fr_FR" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q
 
-../README_fr.txt : README_fr_FR.txt
-        :copy $source $target
+../README_fr.txt : README_fr_FR.txt lisez-moi.txt
+        :cat $source >!$target
 
 #
 # Fetching the files from OpenOffice.org.
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $(OODIR)/%file%} fr_FR.zip
+:attr {fetch = $OODIR/%file%} fr_FR.zip
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
 fr_FR.aff fr_FR.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch fr_FR.zip
-        :sys $(UNZIP) fr_FR.zip
+        :sys $UNZIP fr_FR.zip
         :delete fr_FR.zip
         @if not os.path.exists('fr_FR.orig.aff'):
-                :copy fr_FR.aff fr_FR.orig.aff
+            :copy fr_FR.aff fr_FR.orig.aff
         @if not os.path.exists('fr_FR.orig.dic'):
-                :copy fr_FR.aff fr_FR.orig.dic
-        :sys patch <fr_FR.diff
+            :copy fr_FR.dic fr_FR.orig.dic
+        @if os.path.exists('fr_FR.diff'):
+            :sys patch <fr_FR.diff
 
 
 # Generate diff files, so that others can get the OpenOffice files and apply
@@ -61,7 +62,7 @@ check:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../fr_FR.zip
+            :sys $UNZIP ../fr_FR.zip
             :sys {force} diff ../fr_FR.orig.aff fr_FR.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy fr_FR.aff ../fr_FR.new.aff

runtime/spell/ga/ga_IE.diff

@@ -0,0 +1,27 @@
+*** ga_IE.orig.aff	Wed Aug 31 16:48:49 2005
+--- ga_IE.aff	Wed Aug 31 16:49:43 2005
+***************
+*** 37,38 ****
+--- 37,58 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'-
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>
++ 
+  PFX S Y 18

runtime/spell/ga/main.aap

@@ -0,0 +1,79 @@
+# Aap recipe for Irish Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = ga_IE.aff ga_IE.dic
+
+all: $SPELLDIR/ga.latin1.spl $SPELLDIR/ga.utf-8.spl ../README_ga.txt
+
+# I don't have an Irish locale, use the Dutch one instead.
+$SPELLDIR/ga.latin1.spl : $FILES
+        :sys env LANG=nl_NL.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/ga ga_IE" -c q
+
+$SPELLDIR/ga.utf-8.spl : $FILES
+        :sys env LANG=nl_NL.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/ga ga_IE" -c q
+
+../README_ga.txt : README_ga_IE.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} ga_IE.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+ga_IE.aff ga_IE.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch ga_IE.zip
+        :sys $UNZIP ga_IE.zip
+        :delete ga_IE.zip
+        @if not os.path.exists('ga_IE.orig.aff'):
+            :copy ga_IE.aff ga_IE.orig.aff
+        @if not os.path.exists('ga_IE.orig.dic'):
+            :copy ga_IE.dic ga_IE.orig.dic
+        @if os.path.exists('ga_IE.diff'):
+            :sys patch <ga_IE.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 ga_IE.orig.aff ga_IE.aff >ga_IE.diff
+        :sys {force} diff -a -C 1 ga_IE.orig.dic ga_IE.dic >>ga_IE.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch ga_IE.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../ga_IE.zip
+            :sys {force} diff ../ga_IE.orig.aff ga_IE.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy ga_IE.aff ../ga_IE.new.aff
+            :sys {force} diff ../ga_IE.orig.dic ga_IE.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy ga_IE.dic ../ga_IE.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete ga_IE.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/gd/gd_GB.diff

@@ -0,0 +1,26 @@
+*** gd_GB.orig.aff	Wed Aug 31 20:50:02 2005
+--- gd_GB.aff	Wed Aug 31 20:50:43 2005
+***************
+*** 19 ****
+--- 19,39 ----
+  TRY ahinrdesclgoutmb<6D>f-<2D>AC<41>T<EFBFBD>BpGSDM<44>IRPLNEF<45>O'U<><55><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48>
++ 
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
++ MIDWORD	'-
++ 
++ MAP 9
++ MAP a<><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ MAP e<><65><EFBFBD><EFBFBD>
++ MAP i<><69><EFBFBD><EFBFBD>
++ MAP o<><6F><EFBFBD><EFBFBD><EFBFBD>
++ MAP u<><75><EFBFBD><EFBFBD>
++ MAP n<>
++ MAP c<>
++ MAP y<><79>
++ MAP s<>

runtime/spell/gd/main.aap

@@ -0,0 +1,78 @@
+# Aap recipe for Scottish Gaelic Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = gd_GB.aff gd_GB.dic
+
+all: $SPELLDIR/gd.latin1.spl $SPELLDIR/gd.utf-8.spl ../README_gd.txt
+
+$SPELLDIR/gd.latin1.spl : $FILES
+        :sys env LANG=gd_GB.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q
+
+$SPELLDIR/gd.utf-8.spl : $FILES
+        :sys env LANG=gd_GB.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gd gd_GB" -c q
+
+../README_gd.txt : README_gd_GB.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} gd_GB.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+gd_GB.aff gd_GB.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch gd_GB.zip
+        :sys $UNZIP gd_GB.zip
+        :delete gd_GB.zip
+        @if not os.path.exists('gd_GB.orig.aff'):
+            :copy gd_GB.aff gd_GB.orig.aff
+        @if not os.path.exists('gd_GB.orig.dic'):
+            :copy gd_GB.dic gd_GB.orig.dic
+        @if os.path.exists('gd_GB.diff'):
+            :sys patch <gd_GB.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 gd_GB.orig.aff gd_GB.aff >gd_GB.diff
+        :sys {force} diff -a -C 1 gd_GB.orig.dic gd_GB.dic >>gd_GB.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch gd_GB.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../gd_GB.zip
+            :sys {force} diff ../gd_GB.orig.aff gd_GB.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy gd_GB.aff ../gd_GB.new.aff
+            :sys {force} diff ../gd_GB.orig.dic gd_GB.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy gd_GB.dic ../gd_GB.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete gd_GB.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/gl/gl_ES.diff

@@ -0,0 +1,15 @@
+*** gl_ES.orig.aff	Tue Aug 16 17:59:15 2005
+--- gl_ES.aff	Tue Aug 16 17:59:15 2005
+***************
+*** 2,3 ****
+--- 2,11 ----
+  TRY <20><><EFBFBD><EFBFBD><EFBFBD>esianrtolcdugmphbfv<66>
++ 
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
+  # COMPOUNDMIN 3

runtime/spell/gl/main.aap

@@ -0,0 +1,78 @@
+# Aap recipe for Galician (Spain) Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = gl_ES.aff gl_ES.dic
+
+all: $SPELLDIR/gl.latin1.spl $SPELLDIR/gl.utf-8.spl ../README_gl.txt
+
+$SPELLDIR/gl.latin1.spl : $FILES
+        :sys env LANG=gl_ES.ISO8859-1
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gl gl_ES" -c q
+
+$SPELLDIR/gl.utf-8.spl : $FILES
+        :sys env LANG=gl_ES.UTF-8
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/gl gl_ES" -c q
+
+../README_gl.txt : README_gl_ES.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} gl_ES.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+gl_ES.aff gl_ES.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch gl_ES.zip
+        :sys $UNZIP gl_ES.zip
+        :delete gl_ES.zip
+        @if not os.path.exists('gl_ES.orig.aff'):
+            :copy gl_ES.aff gl_ES.orig.aff
+        @if not os.path.exists('gl_ES.orig.dic'):
+            :copy gl_ES.dic gl_ES.orig.dic
+        @if os.path.exists('gl_ES.diff'):
+            :sys patch <gl_ES.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 gl_ES.orig.aff gl_ES.aff >gl_ES.diff
+        :sys {force} diff -a -C 1 gl_ES.orig.dic gl_ES.dic >>gl_ES.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch gl_ES.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../gl_ES.zip
+            :sys {force} diff ../gl_ES.orig.aff gl_ES.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy gl_ES.aff ../gl_ES.new.aff
+            :sys {force} diff ../gl_ES.orig.dic gl_ES.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy gl_ES.dic ../gl_ES.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete gl_ES.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/he.vim

@@ -0,0 +1,10 @@
+" For Hebrew capitals should not be checked.  But only change the
+" 'spellcapcheck' option when it is not at its default value.
+let s:spc = &l:spc
+setlocal spc&
+if s:spc == &l:spc
+  setlocal spc=
+else
+  let &l:spc = s:spc
+endif
+unlet s:spc

runtime/spell/he/he_IL.diff

@@ -1,5 +1,5 @@
-*** he_IL.orig.aff	Sat Jun 18 14:46:51 2005
---- he_IL.aff	Wed Jun 29 17:24:12 2005
+*** he_IL.orig.aff	Sun Jul  3 19:40:02 2005
+--- he_IL.aff	Tue Aug  9 22:32:47 2005
 ***************
 *** 2,3 ****
 --- 2,6 ----
@@ -8,8 +8,8 @@
 + PFXPOSTPONE
 + 
   # This file was generated automatically from data prepared
-*** he_IL.orig.dic	Sat Jun 18 14:47:00 2005
---- he_IL.dic	Wed Jun 29 17:22:13 2005
+*** he_IL.orig.dic	Sun Jul  3 19:40:02 2005
+--- he_IL.dic	Sun Jul  3 19:40:02 2005
 ***************
 *** 318898,318902 ****
   <20><>

runtime/spell/he/main.aap

@@ -4,20 +4,20 @@
 @if os.path.exists('../../../src/vim'):
     VIM = ../../../src/vim
 @else:
-    VIM = vim
+    :progsearch VIM vim
 
 SPELLDIR = ..
 FILES    = he_IL.aff he_IL.dic
 
-all: $(SPELLDIR)/he.utf-8.spl $(SPELLDIR)/he.iso-8859-8.spl ../README_he.txt
+all: $SPELLDIR/he.utf-8.spl $SPELLDIR/he.iso-8859-8.spl ../README_he.txt
 
-$(SPELLDIR)/he.utf-8.spl : $(VIM) $(FILES)
+$SPELLDIR/he.utf-8.spl : $FILES
         :sys env LANG=he_IL.UTF-8
-		$(VIM) -e -c "mkspell! $(SPELLDIR)/he he_IL" -c q
+		$VIM -u NONE -e -c "mkspell! $SPELLDIR/he he_IL" -c q
 
-$(SPELLDIR)/he.iso-8859-8.spl : $(VIM) $(FILES)
-        :sys $(VIM) -e -c "set enc=iso-8859-8"
-                        -c "mkspell! $(SPELLDIR)/he he_IL" -c q
+$SPELLDIR/he.iso-8859-8.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=iso-8859-8"
+                        -c "mkspell! $SPELLDIR/he he_IL" -c q
 
 ../README_he.txt : README_he_IL.txt
         :copy $source $target
@@ -26,20 +26,21 @@ $(SPELLDIR)/he.iso-8859-8.spl : $(VIM) $(FILES)
 # Fetching the files from OpenOffice.org.
 #
 OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $(OODIR)/%file%} he_IL.zip
+:attr {fetch = $OODIR/%file%} he_IL.zip
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
 he_IL.aff he_IL.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch he_IL.zip
-        :sys $(UNZIP) he_IL.zip
+        :sys $UNZIP he_IL.zip
         :delete he_IL.zip
         @if not os.path.exists('he_IL.orig.aff'):
-                :copy he_IL.aff he_IL.orig.aff
+            :copy he_IL.aff he_IL.orig.aff
         @if not os.path.exists('he_IL.orig.dic'):
-                :copy he_IL.aff he_IL.orig.dic
-        :sys patch <he_IL.diff
+            :copy he_IL.dic he_IL.orig.dic
+        @if os.path.exists('he_IL.diff'):
+            :sys patch <he_IL.diff
 
 
 # Generate diff files, so that others can get the OpenOffice files and apply
@@ -61,7 +62,7 @@ check:
         :cd tmp
         @try:
             @import stat
-            :sys $(UNZIP) ../he_IL.zip
+            :sys $UNZIP ../he_IL.zip
             :sys {force} diff ../he_IL.orig.aff he_IL.aff >d
             @if os.stat('d')[stat.ST_SIZE] > 0:
                 :copy he_IL.aff ../he_IL.new.aff

runtime/spell/hr/hr_HR.diff

@@ -0,0 +1,11 @@
+*** hr_HR.orig.aff	Sun Aug 14 20:00:56 2005
+--- hr_HR.aff	Wed Aug 17 17:11:35 2005
+***************
+*** 4,5 ****
+--- 4,9 ----
+  
++ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
+  SFX A N 1

runtime/spell/hr/main.aap

@@ -0,0 +1,81 @@
+# Aap recipe for Croatian Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = hr_HR.aff hr_HR.dic
+
+all: $SPELLDIR/hr.iso-8859-2.spl $SPELLDIR/hr.utf-8.spl \
+        $SPELLDIR/hr.cp1250.spl ../README_hr.txt
+
+$SPELLDIR/hr.iso-8859-2.spl : $FILES
+        :sys env LANG=hr_HR.ISO8859-2 $VIM -u NONE -e -c "mkspell! $SPELLDIR/hr hr_HR" -c q
+
+$SPELLDIR/hr.utf-8.spl : $FILES
+        :sys env LANG=hr_HR.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/hr hr_HR" -c q
+
+$SPELLDIR/hr.cp1250.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=cp1250" -c "mkspell! $SPELLDIR/hr hr_HR" -c q
+
+../README_hr.txt: README_hr_HR.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} hr_HR.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+hr_HR.aff hr_HR.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch hr_HR.zip
+        :sys $UNZIP hr_HR.zip
+        :delete hr_HR.zip
+        @if not os.path.exists('hr_HR.orig.aff'):
+            :copy hr_HR.aff hr_HR.orig.aff
+        @if not os.path.exists('hr_HR.orig.dic'):
+            :copy hr_HR.dic hr_HR.orig.dic
+        @if os.path.exists('hr_HR.diff'):
+            :sys patch <hr_HR.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 hr_HR.orig.aff hr_HR.aff >hr_HR.diff
+        :sys {force} diff -a -C 1 hr_HR.orig.dic hr_HR.dic >>hr_HR.diff
+
+
+# Check for updated spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch hr_HR.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../hr_HR.zip
+            :sys {force} diff ../hr_HR.orig.aff hr_HR.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy hr_HR.aff ../hr_HR.new.aff
+            :sys {force} diff ../hr_HR.orig.dic hr_HR.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy hr_HR.dic ../hr_HR.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete hr_HR.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/hu/hu_HU.diff

@@ -0,0 +1,190 @@
+*** hu_HU.orig.aff	Tue Aug 16 18:21:10 2005
+--- hu_HU.aff	Fri Aug 19 21:28:45 2005
+***************
+*** 57,62 ****
+  
+! NAME Magyar Ispell helyes<65>r<EFBFBD>si sz<73>t<EFBFBD>r
+! LANG hu_HU
+! HOME http://magyarispell.sourceforge.net
+! VERSION Magyar 0.99.4.2
+  SET ISO8859-2
+--- 57,62 ----
+  
+! #NAME Magyar Ispell helyes<65>r<EFBFBD>si sz<73>t<EFBFBD>r
+! #LANG hu_HU
+! #HOME http://magyarispell.sourceforge.net
+! #VERSION Magyar 0.99.4.2
+  SET ISO8859-2
+***************
+*** 64,77 ****
+  COMPOUNDMIN 2
+! COMPOUNDFLAG Y
+! COMPOUNDWORD 2 y
+! COMPOUNDSYLLABLE 6 a<>e<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD>u<EFBFBD><75><EFBFBD>
+! SYLLABLENUM klmc
+! COMPOUNDFIRST v
+! COMPOUNDLAST x
+! FORBIDDENWORD w
+! ONLYROOT u
+! ACCENT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> aeiooouuu
+! CHECKNUM
+! WORDCHARS -.<2E>%<25>0123456789
+! HU_KOTOHANGZO Z
+  
+--- 64,116 ----
+  COMPOUNDMIN 2
+! #COMPOUNDWORD 2 y
+! COMPOUNDMAX 2
+! # I don't understand what the "y" is for; if it's to disable compounding simply
+! # remove the compound flag from the word.
+! 
+! #COMPOUNDSYLLABLE 6 a<>e<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD>u<EFBFBD><75><EFBFBD>
+! COMPOUNDSYLMAX 6
+! SYLLABLE a/<2F>/e/<2F>/i/<2F>/o/<2F>/<2F>/<2F>/u/<2F>/<2F>/<2F>
+! # Strange that every vowel is counted as a syllable, that's how the hunspell
+! # code works.
+! 
+! #SYLLABLENUM klmc
+! # Don't understand what this is for
+! 
+! #COMPOUNDFLAG Y
+! #COMPOUNDFIRST v
+! #COMPOUNDLAST x
+! COMPOUNDFLAGS Y+
+! COMPOUNDFLAGS vY*x
+! COMPOUNDFLAGS Y+x
+! COMPOUNDFLAGS vY+
+! 
+! #FORBIDDENWORD w
+! #  I don't understand what FORBIDDENWORD is needed for, using NEEDAFFIX
+! #  (ONLYROOT) should be sufficient.
+! 
+! #ONLYROOT u
+! NEEDAFFIX u
+! 
+! #ACCENT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> aeiooouuu
+! MAP 5
+! MAP a<><61>
+! MAP e<>
+! MAP i<>
+! MAP o<><6F><EFBFBD>
+! MAP u<><75><EFBFBD>
+! 
+! #CHECKNUM
+! # Vim always handles numbers in the same way.
+! 
+! #WORDCHARS -.<2E>%<25>0123456789
+! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+! MIDWORD .
+! 
+! #HU_KOTOHANGZO Z
+! 
+! # There are soooo many affixes.  Postpone the prefixes to keep the time needed
+! # for generating the .spl within reasonable limits.
+! PFXPOSTPONE
+  
+***************
+*** 81,96 ****
+  
+! REP 89
+! REP <20> i
+! REP i <20>
+! REP <20> o
+! REP o <20>
+! REP o <20>
+! REP <20> u
+! REP u <20>
+! REP u <20>
+! REP <20> <20>
+! REP <20> <20>
+  REP j ly
+  REP ly j
+- REP a <20> # Handel->H<>ndel
+  REP S <20> # Skoda-><3E>koda
+--- 120,124 ----
+  
+! REP 78
+  REP j ly
+  REP ly j
+  REP S <20> # Skoda-><3E>koda
+***************
+*** 173,241 ****
+  
+- # character conversion table
+- # (HTML latin-1 entities -> latin-2)
+- # not implemented yet
+- 
+- CHR HTML 35
+- CHR HTML &curren; <20>
+- CHR HTML &deg; <20>
+- CHR HTML &acute; <20>
+- CHR HTML &cedil; <20>
+- CHR HTML &Aacute; <20>
+- CHR HTML &Acirc; <20>
+- CHR HTML &Auml; <20>
+- CHR HTML &Ccedil; <20>
+- CHR HTML &Eacute; <20>
+- CHR HTML &Euml; <20>
+- CHR HTML &Iacute; <20>
+- CHR HTML &Icirc; <20>
+- CHR HTML &Oacute; <20>
+- CHR HTML &Ocirc; <20>
+- CHR HTML &Ouml; <20>
+- CHR HTML &times; <20>
+- CHR HTML &Uacute; <20>
+- CHR HTML &Uuml; <20>
+- CHR HTML &Yacute; <20>
+- CHR HTML &szlig; <20>
+- CHR HTML &aacute; <20>
+- CHR HTML &acirc; <20>
+- CHR HTML &auml; <20>
+- CHR HTML &ccedil; <20>
+- CHR HTML &eacute; <20>
+- CHR HTML &euml; <20>
+- CHR HTML &iacute; <20>
+- CHR HTML &icirc; <20>
+- CHR HTML &oacute; <20>
+- CHR HTML &ocirc; <20>
+- CHR HTML &ouml; <20>
+- CHR HTML &divide; <20>
+- CHR HTML &uacute; <20>
+- CHR HTML &uuml; <20>
+- CHR HTML &yacute; <20>
+- 
+- # character conversion table
+- # (Pr<50>sz<73>ky-code -> latin-2)
+- # not implemented yet
+- 
+- CHR 123 20
+- CHR 123 a1 <20>
+- CHR 123 e1 <20>
+- CHR 123 e2 <20>
+- CHR 123 i1 <20>
+- CHR 123 o1 <20>
+- CHR 123 o2 <20>
+- CHR 123 o3 <20>
+- CHR 123 u1 <20>
+- CHR 123 u2 <20>
+- CHR 123 u3 <20>
+- CHR 123 A1 <20>
+- CHR 123 E1 <20>
+- CHR 123 E2 <20>
+- CHR 123 I1 <20>
+- CHR 123 O1 <20>
+- CHR 123 O2 <20>
+- CHR 123 O3 <20>
+- CHR 123 U1 <20>
+- CHR 123 U2 <20>
+- CHR 123 U3 <20>
+- 
+  SFX z Y 6
+--- 201,202 ----
+***************
+*** 17678,17681 ****
+  PFX D   0    leg          .
+- 
+-    1
+- 
+--- 17639 ----

runtime/spell/hu/main.aap

@@ -0,0 +1,81 @@
+# Aap recipe for Hungarian Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+    VIM = ../../../src/vim
+@else:
+    :progsearch VIM vim
+
+SPELLDIR = ..
+FILES    = hu_HU.aff hu_HU.dic
+
+all: $SPELLDIR/hu.iso-8859-2.spl $SPELLDIR/hu.utf-8.spl \
+        $SPELLDIR/hu.cp1250.spl ../README_hu.txt
+
+$SPELLDIR/hu.iso-8859-2.spl : $FILES
+        :sys env LANG=hu_HU.ISO8859-2 $VIM -u NONE -e -c "mkspell! $SPELLDIR/hu hu_HU" -c q
+
+$SPELLDIR/hu.utf-8.spl : $FILES
+        :sys env LANG=hu_HU.UTF-8 $VIM -u NONE -e -c "mkspell! $SPELLDIR/hu hu_HU" -c q
+
+$SPELLDIR/hu.cp1250.spl : $FILES
+        :sys $VIM -u NONE -e -c "set enc=cp1250" -c "mkspell! $SPELLDIR/hu hu_HU" -c q
+
+../README_hu.txt: README_hu_HU.txt
+        :copy $source $target
+
+#
+# Fetching the files from OpenOffice.org.
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} hu_HU.zip
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+# This is a bit tricky, since the file name includes the date.
+hu_HU.aff hu_HU.dic: {buildcheck=}
+        :assertpkg unzip patch
+        :fetch hu_HU.zip
+        :sys $UNZIP hu_HU.zip
+        :delete hu_HU.zip
+        @if not os.path.exists('hu_HU.orig.aff'):
+            :copy hu_HU.aff hu_HU.orig.aff
+        @if not os.path.exists('hu_HU.orig.dic'):
+            :copy hu_HU.dic hu_HU.orig.dic
+        @if os.path.exists('hu_HU.diff'):
+            :sys patch <hu_HU.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+
+diff:
+        :assertpkg diff
+        :sys {force} diff -a -C 1 hu_HU.orig.aff hu_HU.aff >hu_HU.diff
+        :sys {force} diff -a -C 1 hu_HU.orig.dic hu_HU.dic >>hu_HU.diff
+
+
+# Check for updated OpenOffice spell files.  When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+        :assertpkg unzip diff
+        :fetch hu_HU.zip
+        :mkdir tmp
+        :cd tmp
+        @try:
+            @import stat
+            :sys $UNZIP ../hu_HU.zip
+            :sys {force} diff ../hu_HU.orig.aff hu_HU.aff >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy hu_HU.aff ../hu_HU.new.aff
+            :sys {force} diff ../hu_HU.orig.dic hu_HU.dic >d
+            @if os.stat('d')[stat.ST_SIZE] > 0:
+                :copy hu_HU.dic ../hu_HU.new.dic
+        @finally:
+            :cd ..
+            :delete {r}{f}{q} tmp
+            :delete hu_HU.zip
+
+
+# vim: set sts=4 sw=4 :

runtime/spell/id/id_ID.diff

@@ -0,0 +1,22 @@
+*** id_ID.orig.aff	Wed Aug 31 16:41:11 2005
+--- id_ID.aff	Wed Aug 31 16:43:29 2005
+***************
+*** 18,19 ****
+--- 18,26 ----
+  
++ FOL  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ LOW  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ UPP  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
++ 
++ SOFOFROM abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<59><5A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޿
++ SOFOTO   ebctefghejklnnepkrstevvkesebctefghejklnnepkrstevvkeseeeeeeeceeeeeeeedneeeeeeeeeeepseeeeeeeeceeeeeeeedneeeeeeeeeeep?
++ 
+  PFX A Y 1
+*** id_ID.orig.dic	Wed Aug 31 16:41:11 2005
+--- id_ID.dic	Wed Aug 31 16:41:35 2005
+***************
+*** 21729,21731 ****
+  berabarkan
+- buletin
+  kernu
+--- 21729,21730 ----