updated for version 7.0157

Filelist

@@ -52,6 +52,7 @@ SRC_ALL1 =	\
 		src/ops.c \
 		src/option.c \
 		src/option.h \
+		src/popupmenu.c \
 		src/quickfix.c \
 		src/regexp.c \
 		src/regexp.h \
@@ -111,6 +112,7 @@ SRC_ALL2 =	\
 		src/proto/normal.pro \
 		src/proto/ops.pro \
 		src/proto/option.pro \
+		src/proto/popupmenu.pro \
 		src/proto/quickfix.pro \
 		src/proto/regexp.pro \
 		src/proto/screen.pro \
@@ -377,6 +379,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 =	\

runtime/autoload/README.txt

@@ -4,3 +4,12 @@ These are functions used by plugins and for general use.  They will be loaded
 automatically when the function is invoked.  See ":help autoload".
 
 gzip.vim	for editing compressed files
+netrw.vim	browsing (remote) directories and editing remote files
+tar.vim		browsing tar files
+zip.vim		browsing zip files
+
+Occult completion files:
+ccomplete.vim		C
+csscomplete.vim		HTML / CSS
+htmlcomplete.vim	HTML
+

runtime/autoload/ccomplete.vim

@@ -0,0 +1,257 @@
+" Vim completion script
+" Language:	C
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2005 Oct 06
+
+
+" This function is used for the 'omnifunc' option.
+function! ccomplete#Complete(findstart, base)
+  if a:findstart
+    " Locate the start of the item, including "." and "->".
+    let line = getline('.')
+    let start = col('.') - 1
+    let lastword = -1
+    while start > 0
+      if line[start - 1] =~ '\w'
+	let start -= 1
+      elseif line[start - 1] =~ '\.'
+	if lastword == -1
+	  let lastword = start
+	endif
+	let start -= 1
+      elseif start > 1 && line[start - 2] == '-' && line[start - 1] == '>'
+	if lastword == -1
+	  let lastword = start
+	endif
+	let start -= 2
+      else
+	break
+      endif
+    endwhile
+
+    " Return the column of the last word, which is going to be changed.
+    " Remember the text that comes before it in s:prepended.
+    if lastword == -1
+      let s:prepended = ''
+      return start
+    endif
+    let s:prepended = strpart(line, start, lastword - start)
+    return lastword
+  endif
+
+  " Return list of matches.
+
+  let base = s:prepended . a:base
+
+  " Split item in words, keep empty word after "." or "->".
+  " "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc.
+  let items = split(base, '\.\|->', 1)
+  if len(items) <= 1
+    " Don't do anything for an empty base, would result in all the tags in the
+    " tags file.
+    if base == ''
+      return []
+    endif
+
+    " Only one part, no "." or "->": complete from tags file.
+    " When local completion is wanted CTRL-N would have been used.
+    return map(taglist('^' . base), 'v:val["name"]')
+  endif
+
+  " Find the variable items[0].
+  " 1. in current function (like with "gd")
+  " 2. in tags file(s) (like with ":tag")
+  " 3. in current file (like with "gD")
+  let res = []
+  if searchdecl(items[0], 0, 1) == 0
+    " Found, now figure out the type.
+    " TODO: join previous line if it makes sense
+    let line = getline('.')
+    let col = col('.')
+    let res = s:Nextitem(strpart(line, 0, col), items[1:])
+  endif
+
+  if len(res) == 0
+    " Find the variable in the tags file(s)
+    let diclist = taglist('^' . items[0] . '$')
+
+    let res = []
+    for i in range(len(diclist))
+      " New ctags has the "typename" field.
+      if has_key(diclist[i], 'typename')
+	call extend(res, s:StructMembers(diclist[i]['typename'], items[1:]))
+      endif
+
+      " For a variable use the command, which must be a search pattern that
+      " shows the declaration of the variable.
+      if diclist[i]['kind'] == 'v'
+	let line = diclist[i]['cmd']
+	if line[0] == '/' && line[1] == '^'
+	  let col = match(line, items[0])
+	  call extend(res, s:Nextitem(strpart(line, 2, col - 2), items[1:]))
+	endif
+      endif
+    endfor
+  endif
+
+  if len(res) == 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('.')
+    let res = s:Nextitem(strpart(line, 0, col), items[1:])
+  endif
+
+  " If the one and only match was what's already there and it is a composite
+  " type, add a "." or "->".
+  if len(res) == 1 && res[0]['match'] == items[-1] && len(s:SearchMembers(res, [''])) > 0
+    " If there is a '*' before the name use "->".
+    if match(res[0]['tagline'], '\*\s*' . res[0]['match']) > 0
+      let res[0]['match'] .= '->'
+    else
+      let res[0]['match'] .= '.'
+    endif
+  endif
+
+  return map(res, 'v:val["match"]')
+endfunc
+
+" Find composing type in "lead" and match items[0] with it.
+" Repeat this recursively for items[1], if it's there.
+" Return the list of matches.
+function! s:Nextitem(lead, items)
+
+  " Use the text up to the variable name and split it in tokens.
+  let tokens = split(a:lead, '\s\+\|\<')
+
+  " Try to recognize the type of the variable.  This is rough guessing...
+  let res = []
+  for tidx in range(len(tokens))
+
+    " Recognize "struct foobar" and "union foobar".
+    if (tokens[tidx] == 'struct' || tokens[tidx] == 'union') && tidx + 1 < len(tokens)
+      let res = s:StructMembers(tokens[tidx] . ':' . tokens[tidx + 1], a:items)
+      break
+    endif
+
+    " TODO: add more reserved words
+    if index(['int', 'float', 'static', 'unsigned', 'extern'], tokens[tidx]) >= 0
+      continue
+    endif
+
+    " Use the tags file to find out if this is a typedef.
+    let diclist = taglist('^' . tokens[tidx] . '$')
+    for tagidx in range(len(diclist))
+      " New ctags has the "typename" field.
+      if has_key(diclist[tagidx], 'typename')
+	call extend(res, s:StructMembers(diclist[tagidx]['typename'], a:items))
+	continue
+      endif
+
+      " Only handle typedefs here.
+      if diclist[tagidx]['kind'] != 't'
+	continue
+      endif
+
+      " For old ctags we recognize "typedef struct aaa" and
+      " "typedef union bbb" in the tags file command.
+      let cmd = diclist[tagidx]['cmd']
+      let ei = matchend(cmd, 'typedef\s\+')
+      if ei > 1
+	let cmdtokens = split(strpart(cmd, ei), '\s\+\|\<')
+	if len(cmdtokens) > 1
+	  if cmdtokens[0] == 'struct' || cmdtokens[0] == 'union'
+	    let name = ''
+	    " Use the first identifier after the "struct" or "union"
+	    for ti in range(len(cmdtokens) - 1)
+	      if cmdtokens[ti] =~ '^\w'
+		let name = cmdtokens[ti]
+		break
+	      endif
+	    endfor
+	    if name != ''
+	      call extend(res, s:StructMembers(cmdtokens[0] . ':' . name, a:items))
+	    endif
+	  else
+	    " Could be "typedef other_T some_T".
+	    call extend(res, s:Nextitem(cmdtokens[0], a:items))
+	  endif
+	endif
+      endif
+    endfor
+    if len(res) > 0
+      break
+    endif
+  endfor
+
+  return res
+endfunction
+
+
+" Return a list with resulting matches.
+" Each match is a dictionary with "match" and "tagline" entries.
+function! s:StructMembers(typename, items)
+  " Todo: What about local structures?
+  let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
+  if fnames == ''
+    return []
+  endif
+
+  let typename = a:typename
+  let qflist = []
+  while 1
+    exe 'silent! vimgrep /\t' . typename . '\(\t\|$\)/j ' . fnames
+    let qflist = getqflist()
+    if len(qflist) > 0 || match(typename, "::") < 0
+      break
+    endif
+    " No match for "struct:context::name", remove "context::" and try again.
+    let typename = substitute(typename, ':[^:]*::', ':', '')
+  endwhile
+
+  let matches = []
+  for l in qflist
+    let memb = matchstr(l['text'], '[^\t]*')
+    if memb =~ '^' . a:items[0]
+      call add(matches, {'match': memb, 'tagline': l['text']})
+    endif
+  endfor
+
+  if len(matches) > 0
+    " No further items, return the result.
+    if len(a:items) == 1
+      return matches
+    endif
+
+    " More items following.  For each of the possible members find the
+    " matching following members.
+    return s:SearchMembers(matches, a:items[1:])
+  endif
+
+  " Failed to find anything.
+  return []
+endfunction
+
+" For matching members, find matches for following items.
+function! s:SearchMembers(matches, items)
+  let res = []
+  for i in range(len(a:matches))
+    let line = a:matches[i]['tagline']
+    let e = matchend(line, '\ttypename:')
+    if e > 0
+      " Use typename field
+      let name = matchstr(line, '[^\t]*', e)
+      call extend(res, s:StructMembers(name, a:items))
+    else
+      " Use the search command (the declaration itself).
+      let s = match(line, '\t\zs/^')
+      if s > 0
+	let e = match(line, a:matches[i]['match'], s)
+	if e > 0
+	  call extend(res, s:Nextitem(strpart(line, s, e - s), a:items))
+	endif
+      endif
+    endif
+  endfor
+  return res
+endfunc

runtime/autoload/csscomplete.vim

@@ -0,0 +1,430 @@
+" Vim completion script
+" Language:	CSS 2.1
+" Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change:	2005 Oct 12
+
+function! csscomplete#CompleteCSS(findstart, base)
+if a:findstart
+	" We need whole line to proper checking
+    let line = getline('.')
+    let start = col('.') - 1
+	let compl_begin = col('.') - 2
+	while start >= 0 && line[start - 1] =~ '\(\k\|-\)'
+		let start -= 1
+	endwhile
+	let b:compl_context = getline('.')[0:compl_begin]
+	return start
+else
+	" There are few chars important for context:
+	" ^ ; : { } /* */
+	" Where ^ is start of line and /* */ are comment borders
+	" Depending on their relative position to cursor we will now what should
+	" be completed. 
+	" 1. if nearest are ^ or { or ; current word is property
+	" 2. if : it is value (with exception of pseudo things)
+	" 3. if } we are outside of css definitions
+	" 4. for comments ignoring is be the easiest but assume they are the same
+	"    as 1. 
+	" 5. if @ complete at-rule
+	" 6. if ! complete important
+	if exists("b:compl_context")
+		let line = b:compl_context
+		unlet! b:compl_context
+	else
+		let line = a:base
+	endif
+
+	let res = []
+	let res2 = []
+	let borders = {}
+
+	" We need the last occurrence of char so reverse line
+	let revline = join(reverse(split(line, '.\zs')), '')
+
+	let openbrace  = stridx(revline, '{')
+	let closebrace = stridx(revline, '}')
+	let colon      = stridx(revline, ':')
+	let semicolon  = stridx(revline, ';')
+	let opencomm   = stridx(revline, '*/') " Line was reversed
+	let closecomm  = stridx(revline, '/*') " Line was reversed
+	let style      = stridx(revline, '=\s*elyts') " Line was reversed
+	let atrule     = stridx(revline, '@')
+	let exclam     = stridx(revline, '!')
+
+	if openbrace > -1
+		let borders[openbrace] = "openbrace"
+	endif
+	if closebrace > -1
+		let borders[closebrace] = "closebrace"
+	endif
+	if colon > -1
+		let borders[colon] = "colon"
+	endif
+	if semicolon > -1
+		let borders[semicolon] = "semicolon"
+	endif
+	if opencomm > -1
+		let borders[opencomm] = "opencomm"
+	endif
+	if closecomm > -1
+		let borders[closecomm] = "closecomm"
+	endif
+	if style > -1
+		let borders[style] = "style"
+	endif
+	if atrule > -1
+		let borders[atrule] = "atrule"
+	endif
+	if exclam > -1
+		let borders[exclam] = "exclam"
+	endif
+
+
+	if len(borders) == 0 || borders[min(keys(borders))] =~ '^\(openbrace\|semicolon\|opencomm\|closecomm\|style\)$'
+		" Complete properties
+
+		let values = split("azimuth background background-attachment background-color background-image background-position background-repeat border bottom border-collapse border-color border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color  border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width caption-side clear clip color content counter-increment counter-reset cue cue-after cue-before cursor display direction elevation empty-cells float font font-family font-size font-style font-variant font-weight height left letter-spacing line-height list-style list-style-image list-style-position list-style-type margin margin-right margin-left margin-top margin-bottom max-height max-width min-height min-width orphans outline outline-color outline-style outline-width overflow padding padding-top padding-right padding-bottom padding-left page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes right richness speak speak-header speak-numeral speak-punctuation speech-rate stress table-layout text-align text-decoration text-indent text-transform top unicode-bidi vertical-align visibility voice-family volume white-space width widows word-spacing z-index")
+
+		let entered_property = matchstr(line, '.\{-}\zs[a-zA-Z-]*$')
+
+		for m in values
+			if m =~? '^'.entered_property
+				call add(res, m . ':')
+			elseif m =~? entered_property
+				call add(res2, m . ':')
+			endif
+		endfor
+
+		return res + res2
+
+	elseif borders[min(keys(borders))] == 'colon'
+		" Get name of property
+		let prop = tolower(matchstr(line, '\zs[a-zA-Z-]*\ze\s*:[^:]\{-}$'))
+
+		if prop == 'azimuth'
+			let values = ["left-side", "far-left", "left", "center-left", "center", "center-right", "right", "far-right", "right-side", "behind", "leftwards", "rightwards"]
+		elseif prop == 'background-attachment'
+			let values = ["scroll", "fixed"]
+		elseif prop == 'background-color'
+			let values = ["transparent", "rgb(", "#"]
+		elseif prop == 'background-image'
+			let values = ["url(", "none"]
+		elseif prop == 'background-position'
+			let vals = matchstr(line, '.*:\s*\zs.*')
+			if vals =~ '^\([a-zA-Z]\+\)\?$'
+				let values = ["top", "center", "bottom"]
+			elseif vals =~ '^[a-zA-Z]\+\s\+\([a-zA-Z]\+\)\?$'
+				let values = ["left", "center", "right"]
+			else
+				return []
+			endif
+		elseif prop == 'background-repeat'
+			let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
+		elseif prop == 'background'
+			let values = ["url(", "scroll", "fixed", "transparent", "rgb(", "#", "none", "top", "center", "bottom" , "left", "right", "repeat", "repeat-x", "repeat-y", "no-repeat"]
+		elseif prop == 'border-collapse'
+			let values = ["collapse", "separate"]
+		elseif prop == 'border-color'
+			let values = ["rgb(", "#", "transparent"]
+		elseif prop == 'border-spacing'
+			return []
+		elseif prop == 'border-style'
+			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+		elseif prop =~ 'border-\(top\|right\|bottom\|left\)$'
+			let vals = matchstr(line, '.*:\s*\zs.*')
+			if vals =~ '^\([a-zA-Z0-9.]\+\)\?$'
+				let values = ["thin", "thick", "medium"]
+			elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\([a-zA-Z]\+\)\?$'
+				let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+			elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$'
+				let values = ["rgb(", "#", "transparent"]
+			else
+				return []
+			endif
+		elseif prop =~ 'border-\(top\|right\|bottom\|left\)-color'
+			let values = ["rgb(", "#", "transparent"]
+		elseif prop =~ 'border-\(top\|right\|bottom\|left\)-style'
+			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+		elseif prop =~ 'border-\(top\|right\|bottom\|left\)-width'
+			let values = ["thin", "thick", "medium"]
+		elseif prop == 'border-width'
+			let values = ["thin", "thick", "medium"]
+		elseif prop == 'border'
+			let vals = matchstr(line, '.*:\s*\zs.*')
+			if vals =~ '^\([a-zA-Z0-9.]\+\)\?$'
+				let values = ["thin", "thick", "medium"]
+			elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\([a-zA-Z]\+\)\?$'
+				let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+			elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$'
+				let values = ["rgb(", "#", "transparent"]
+			else
+				return []
+			endif
+		elseif prop == 'bottom'
+			let values = ["auto"]
+		elseif prop == 'caption-side'
+			let values = ["top", "bottom"]
+		elseif prop == 'clear'
+			let values = ["none", "left", "right", "both"]
+		elseif prop == 'clip'
+			let values = ["auto", "rect("]
+		elseif prop == 'color'
+			let values = ["rgb(", "#"]
+		elseif prop == 'content'
+			let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"]
+		elseif prop =~ 'counter-\(increment\|reset\)$'
+			let values = ["none"]
+		elseif prop =~ '^\(cue-after\|cue-before\|cue\)$'
+			let values = ["url(", "none"]
+		elseif prop == 'cursor'
+			let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"]
+		elseif prop == 'direction'
+			let values = ["ltr", "rtl"]
+		elseif prop == 'display'
+			let values = ["inline", "block", "list-item", "run-in", "inline-block", "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none"]
+		elseif prop == 'elevation'
+			let values = ["below", "level", "above", "higher", "lower"]
+		elseif prop == 'empty-cells'
+			let values = ["show", "hide"]
+		elseif prop == 'float'
+			let values = ["left", "right", "none"]
+		elseif prop == 'font-family'
+			let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy"]
+		elseif prop == 'font-size'
+			 let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
+		elseif prop == 'font-style'
+			let values = ["normal", "italic", "oblique"]
+		elseif prop == 'font-variant'
+			let values = ["normal", "small-caps"]
+		elseif prop == 'font-weight'
+			let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
+		elseif prop == 'font'
+			let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
+		elseif prop =~ '^\(height\|width\)$'
+			let values = ["auto"]
+		elseif prop =~ '^\(left\|rigth\)$'
+			let values = ["auto"]
+		elseif prop == 'letter-spacing'
+			let values = ["normal"]
+		elseif prop == 'line-height'
+			let values = ["normal"]
+		elseif prop == 'list-style-image'
+			let values = ["url(", "none"]
+		elseif prop == 'list-style-position'
+			let values = ["inside", "outside"]
+		elseif prop == 'list-style-type'
+			let values = ["disc", "circle", "square", "decimal", "decimal-leading-zero", "lower-roman", "upper-roman", "lower-latin", "upper-latin", "none"]
+		elseif prop == 'list-style'
+			return []
+		elseif prop == 'margin'
+			let values = ["auto"]
+		elseif prop =~ 'margin-\(right\|left\|top\|bottom\)$'
+			let values = ["auto"]
+		elseif prop == 'max-height'
+			let values = ["auto"]
+		elseif prop == 'max-width'
+			let values = ["none"]
+		elseif prop == 'min-height'
+			let values = ["none"]
+		elseif prop == 'min-width'
+			let values = ["none"]
+		elseif prop == 'orphans'
+			return []
+		elseif prop == 'outline-color'
+			let values = ["rgb(", "#"]
+		elseif prop == 'outline-style'
+			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+		elseif prop == 'outline-width'
+			let values = ["thin", "thick", "medium"]
+		elseif prop == 'outline'
+			let vals = matchstr(line, '.*:\s*\zs.*')
+			if vals =~ '^\([a-zA-Z0-9,()#]\+\)\?$'
+				let values = ["rgb(", "#"]
+			elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\([a-zA-Z]\+\)\?$'
+				let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+			elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\([a-zA-Z(]\+\)\?$'
+				let values = ["thin", "thick", "medium"]
+			else
+				return []
+			endif
+		elseif prop == 'overflow'
+			let values = ["visible", "hidden", "scroll", "auto"]
+		elseif prop == 'padding'
+			return []
+		elseif prop =~ 'padding-\(top\|right\|bottom\|left\)$'
+			return []
+		elseif prop =~ 'page-break-\(after\|before\)$'
+			let values = ["auto", "always", "avoid", "left", "right"]
+		elseif prop == 'page-break-inside'
+			let values = ["auto", "avoid"]
+		elseif prop =~ 'pause-\(after\|before\)$'
+			return []
+		elseif prop == 'pause'
+			return []
+		elseif prop == 'pitch-range'
+			return []
+		elseif prop == 'pitch'
+			let values = ["x-low", "low", "medium", "high", "x-high"]
+		elseif prop == 'play-during'
+			let values = ["url(", "mix", "repeat", "auto", "none"]
+		elseif prop == 'position'
+			let values = ["static", "relative", "absolute", "fixed"]
+		elseif prop == 'quotes'
+			let values = ["none"]
+		elseif prop == 'richness'
+			return []
+		elseif prop == 'speak-header'
+			let values = ["once", "always"]
+		elseif prop == 'speak-numeral'
+			let values = ["digits", "continuous"]
+		elseif prop == 'speak-punctuation'
+			let values = ["code", "none"]
+		elseif prop == 'speak'
+			let values = ["normal", "none", "spell-out"]
+		elseif prop == 'speech-rate'
+			let values = ["x-slow", "slow", "medium", "fast", "x-fast", "faster", "slower"]
+		elseif prop == 'stress'
+			return []
+		elseif prop == 'table-layout'
+			let values = ["auto", "fixed"]
+		elseif prop == 'text-align'
+			let values = ["left", "right", "center", "justify"]
+		elseif prop == 'text-decoration'
+			let values = ["none", "underline", "overline", "line-through", "blink"]
+		elseif prop == 'text-indent'
+			return []
+		elseif prop == 'text-transform'
+			let values = ["capitalize", "uppercase", "lowercase", "none"]
+		elseif prop == 'top'
+			let values = ["auto"]
+		elseif prop == 'unicode-bidi'
+			let values = ["normal", "embed", "bidi-override"]
+		elseif prop == 'vertical-align'
+			let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"]
+		elseif prop == 'visibility'
+			let values = ["visible", "hidden", "collapse"]
+		elseif prop == 'voice-family'
+			return []
+		elseif prop == 'volume'
+			let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"]
+		elseif prop == 'white-space'
+			let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"]
+		elseif prop == 'widows'
+			return []
+		elseif prop == 'word-spacing'
+			let values = ["normal"]
+		elseif prop == 'z-index'
+			let values = ["auto"]
+		else
+			" If no property match it is possible we are outside of {} and
+			" trying to complete pseudo-(class|element)
+			let element = tolower(matchstr(line, '\zs[a-zA-Z1-6]*\ze:[^:[:space:]]\{-}$'))
+			if ",a,abbr,acronym,address,area,b,base,bdo,big,blockquote,body,br,button,caption,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,fieldset,form,head,h1,h2,h3,h4,h5,h6,hr,html,i,img,input,ins,kbd,label,legend,li,link,map,meta,noscript,object,ol,optgroup,option,p,param,pre,q,samp,script,select,small,span,strong,style,sub,sup,table,tbody,td,textarea,tfoot,th,thead,title,tr,tt,ul,var," =~ ','.element.','
+				let values = ["first-child", "link", "visited", "hover", "active", "focus", "lang", "first-line", "first-letter", "before", "after"]
+			else
+				return []
+			endif
+		endif
+
+		" Complete values
+		let entered_value = matchstr(line, '.\{-}\zs[a-zA-Z0-9#,.(_-]*$')
+
+		for m in values
+			if m =~? '^'.entered_value
+				call add(res, m)
+			elseif m =~? entered_value
+				call add(res2, m)
+			endif
+		endfor
+
+		return res + res2
+
+	elseif borders[min(keys(borders))] == 'closebrace'
+
+		return []
+
+	elseif borders[min(keys(borders))] == 'exclam'
+
+		" Complete values
+		let entered_imp = matchstr(line, '.\{-}!\s*\zs[a-zA-Z ]*$')
+
+		let values = ["important"]
+
+		for m in values
+			if m =~? '^'.entered_imp
+				call add(res, m)
+			endif
+		endfor
+
+		return res
+
+	elseif borders[min(keys(borders))] == 'atrule'
+
+		let afterat = matchstr(line, '.*@\zs.*')
+
+		if afterat =~ '\s'
+
+			let atrulename = matchstr(line, '.*@\zs[a-zA-Z-]\+\ze')
+
+			if atrulename == 'media'
+				let values = ["screen", "tty", "tv", "projection", "handheld", "print", "braille", "aural", "all"]
+
+				let atruleafterbase = matchstr(line, '.*@media\s\+\ze.*$')
+				let entered_atruleafter = matchstr(line, '.*@media\s\+\zs.*$')
+
+			elseif atrulename == 'import'
+				let atruleafterbase = matchstr(line, '.*@import\s\+\ze.*$')
+				let entered_atruleafter = matchstr(line, '.*@import\s\+\zs.*$')
+
+				if entered_atruleafter =~ "^[\"']"
+					let filestart = matchstr(entered_atruleafter, '^.\zs.*')
+					let files = split(glob(filestart.'*'), '\n')
+					let values = map(copy(files), '"\"".v:val')
+
+				elseif entered_atruleafter =~ "^url("
+					let filestart = matchstr(entered_atruleafter, "^url([\"']\\?\\zs.*")
+					let files = split(glob(filestart.'*'), '\n')
+					let values = map(copy(files), '"url(".v:val')
+					
+				else
+					let values = ['"', 'url(']
+
+				endif
+
+			else
+				return []
+
+			endif
+
+			for m in values
+				if m =~? '^'.entered_atruleafter
+					call add(res, m)
+				elseif m =~? entered_atruleafter
+					call add(res2, m)
+				endif
+			endfor
+
+			return res + res2
+
+		endif
+
+		let values = ["charset", "page", "media", "import", "font-face"]
+
+		let entered_atrule = matchstr(line, '.*@\zs[a-zA-Z-]*$')
+
+		for m in values
+			if m =~? '^'.entered_atrule
+				call add(res, m .' ')
+			elseif m =~? entered_atrule
+				call add(res2, m .' ')
+			endif
+		endfor
+
+		return res + res2
+
+	endif
+
+	return []
+
+	endif
+endfunction

runtime/autoload/htmlcomplete.vim

@@ -0,0 +1,653 @@
+" Vim completion script
+" Language:	XHTML 1.0 Strict
+" Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change:	2005 Oct 12
+
+function! htmlcomplete#CompleteTags(findstart, base)
+  if a:findstart
+    " locate the start of the word
+    let line = getline('.')
+    let start = col('.') - 1
+	let compl_begin = col('.') - 2
+    while start >= 0 && line[start - 1] =~ '\(\k\|[:.-]\)'
+		let start -= 1
+    endwhile
+	if start >= 0 && line[start - 1] =~ '&'
+		let b:entitiescompl = 1
+		let b:compl_context = ''
+		return start
+	endif
+	let stylestart = searchpair('<style\>', '', '<\/style\>', "bnW")
+	let styleend   = searchpair('<style\>', '', '<\/style\>', "nW")
+	if stylestart != 0 && styleend != 0 
+		let curpos = line('.')
+		if stylestart <= curpos && styleend >= curpos
+			let start = col('.') - 1
+			let b:csscompl = 1
+			while start >= 0 && line[start - 1] =~ '\(\k\|-\)'
+				let start -= 1
+			endwhile
+		endif
+	endif
+	if !exists("b:csscompl")
+		let b:compl_context = getline('.')[0:(compl_begin)]
+		let b:compl_context = matchstr(b:compl_context, '.*<\zs.*')
+	else
+		let b:compl_context = getline('.')[0:compl_begin]
+	endif
+    return start
+  else
+	" Initialize base return lists
+    let res = []
+    let res2 = []
+	" a:base is very short - we need context
+	let context = b:compl_context
+	unlet! b:compl_context
+	" Check if we should do CSS completion inside of <style> tag
+	if exists("b:csscompl")
+		unlet! b:csscompl
+		return csscomplete#CompleteCSS(0, context)
+	endif
+	" Make entities completion
+	if exists("b:entitiescompl")
+		unlet! b:entitiescompl
+
+		" Very, very long line
+        let values = ["AElig", "Aacute", "Acirc", "Agrave", "Alpha", "Aring", "Atilde", "Auml", "Beta", "Ccedil", "Chi", "Dagger", "Delta", "ETH", "Eacute", "Ecirc", "Egrave", "Epsilon", "Eta", "Euml", "Gamma", "Iacute", "Icirc", "Igrave", "Iota", "Iuml", "Kappa", "Lambda", "Mu", "Ntilde", "Nu", "OElig", "Oacute", "Ocirc", "Ograve", "Omega", "Omicron", "Oslash", "Otilde", "Ouml", "Phi", "Pi", "Prime", "Psi", "Rho", "Scaron", "Sigma", "THORN", "TITY", "Tau", "Theta", "Uacute", "Ucirc", "Ugrave", "Upsilon", "Uuml", "Xi", "Yacute", "Yuml", "Zeta", "amp", "aacute", "acirc", "acute", "aelig", "agrave", "alefsym", "alpha", "and", "ang", "apos", "aring", "asymp", "atilde", "auml", "bdquo", "beta", "brvbar", "bull", "cap", "ccedil", "cedil", "cent", "chi", "circ", "clubs", "copy", "cong", "crarr", "cup", "curren", "dArr", "dagger", "darr", "deg", "delta", "diams", "divide", "eacute", "ecirc", "egrave", "empty", "ensp", "emsp", "epsilon", "equiv", "eta", "eth", "euro", "euml", "exist", "fnof", "forall", "frac12", "frac14", "frac34", "frasl", "gt", "gamma", "ge", "hArr", "harr", "hearts", "hellip", "iacute", "icirc", "iexcl", "igrave", "image", "infin", "int", "iota", "iquest", "isin", "iuml", "kappa", "lt", "laquo", "lArr", "lambda", "lang", "larr", "lceil", "ldquo", "le", "lfloor", "lowast", "loz", "lrm", "lsaquo", "lsquo", "macr", "mdash", "micro", "middot", "minus", "mu", "nbsp", "nabla", "ndash", "ne", "ni", "not", "notin", "nsub", "ntilde", "nu", "oacute", "ocirc", "oelig", "ograve", "oline", "omega", "omicron", "oplus", "or", "ordf", "ordm", "oslash", "otilde", "otimes", "ouml", "para", "part", "permil", "perp", "phi", "pi", "piv", "plusmn", "pound", "prime", "prod", "prop", "psi", "quot", "rArr", "raquo", "radic", "rang", "rarr", "rceil", "rdquo", "real", "reg", "rfloor", "rho", "rlm", "rsaquo", "rsquo", "sbquo", "scaron", "sdot", "sect", "shy", "sigma", "sigmaf", "sim", "spades", "sub", "sube", "sum", "sup", "sup1", "sup2", "sup3", "supe", "szlig", "tau", "there4", "theta", "thetasym", "thinsp", "thorn", "tilde", "times", "trade", "uArr", "uacute", "uarr", "ucirc", "ugrave", "uml", "upsih", "upsilon", "uuml", "weierp", "xi", "yacute", "yen", "yuml", "zeta", "zwj", "zwnj"]
+
+		for m in values
+			if m =~ '^'.a:base
+				call add(res, m.';')
+			endif
+		endfor
+
+		return res
+
+	endif
+	if context =~ '>'
+		" Generally if context contains > it means we are outside of tag and
+		" should abandon action - with one exception: <style> span { bo
+		if context =~ 'style[^>]\{-}>[^<]\{-}$'
+			return csscomplete#CompleteCSS(0, context)
+		else
+			return []
+		endif
+	endif
+
+	" Set attribute groups
+    let coreattrs = ["id", "class", "style", "title"] 
+    let i18n = ["lang", "xml:lang", "dir=\"ltr\" ", "dir=\"rtl\" "]
+    let events = ["onclick", "ondblclick", "onmousedown", "onmouseup", "onmousemove",
+    			\ "onmouseover", "onmouseout", "onkeypress", "onkeydown", "onkeyup"]
+    let focus = ["accesskey", "tabindex", "onfocus", "onblur"]
+    let coregroup = coreattrs + i18n + events
+    " find tags matching with "context"
+	" If context contains > it means we are already outside of tag and we
+	" should abandon action
+	" If context contains white space it is attribute. 
+	" It could be also value of attribute...
+	" We have to get first word to offer
+	" proper completions
+	if context == ''
+		let tag = ''
+	else
+		let tag = split(context)[0]
+	endif
+	" Get last word, it should be attr name
+	let attr = matchstr(context, '.*\s\zs.*')
+	" Possible situations where any prediction would be difficult:
+	" 1. Events attributes
+	if context =~ '\s'
+		" Sort out style, class, and on* cases
+		if context =~ "\\(on[a-z]*\\|id\\|style\\|class\\)\\s*=\\s*[\"']"
+			if context =~ "\\(id\\|class\\)\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"
+				if context =~ "class\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"
+					let search_for = "class"
+				elseif context =~ "id\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"
+					let search_for = "id"
+				endif
+				" Handle class name completion
+				" 1. Find lines of <link stylesheet>
+				" 1a. Check file for @import
+				" 2. Extract filename(s?) of stylesheet,
+				call cursor(1,1)
+				let head = getline(search('<head\>'), search('<\/head>'))
+				let headjoined = join(copy(head), ' ')
+				if headjoined =~ '<style'
+					let stylehead = substitute(headjoined, '+>\*[,', ' ', 'g')
+					if search_for == 'class'
+						let styleheadlines = split(stylehead)
+						let headclasslines = filter(copy(styleheadlines), "v:val =~ '\\([a-zA-Z0-9:]\\+\\)\\?\\.[a-zA-Z0-9_-]\\+'")
+					else
+						let stylesheet = split(headjoined, '[{}]')
+						" Get all lines which fit id syntax
+						let classlines = filter(copy(stylesheet), "v:val =~ '#[a-zA-Z0-9_-]\\+'")
+						" Filter out possible color definitions
+						call filter(classlines, "v:val !~ ':\\s*#[a-zA-Z0-9_-]\\+'")
+						" Filter out complex border definitions
+						call filter(classlines, "v:val !~ '\\(none\\|hidden\\|dotted\\|dashed\\|solid\\|double\\|groove\\|ridge\\|inset\\|outset\\)\\s*#[a-zA-Z0-9_-]\\+'")
+						let templines = join(classlines, ' ')
+						let headclasslines = split(templines)
+						call filter(headclasslines, "v:val =~ '#[a-zA-Z0-9_-]\\+'")
+					endif
+					let internal = 1
+				else
+					let internal = 0
+				endif
+				let styletable = []
+				let secimportfiles = []
+				let filestable = filter(copy(head), "v:val =~ '\\(@import\\|link.*stylesheet\\)'")
+				for line in filestable
+					if line =~ "@import"
+						let styletable += [matchstr(line, "import\\s\\+\\(url(\\)\\?[\"']\\?\\zs\\f\\+\\ze")]
+					elseif line =~ "<link"
+						let styletable += [matchstr(line, "href\\s*=\\s*[\"']\\zs\\f\\+\\ze")]
+					endif
+				endfor
+				for file in styletable
+					if filereadable(file)
+						let stylesheet = readfile(file)
+						let secimport = filter(copy(stylesheet), "v:val =~ '@import'")
+						if len(secimport) > 0
+							for line in secimport
+								let secfile = matchstr(line, "import\\s\\+\\(url(\\)\\?[\"']\\?\\zs\\f\\+\\ze")
+								let secfile = fnamemodify(file, ":p:h").'/'.secfile
+								let secimportfiles += [secfile]
+							endfor
+						endif
+					endif
+				endfor
+				let cssfiles = styletable + secimportfiles
+				let classes = []
+				for file in cssfiles
+					if filereadable(file)
+						let stylesheet = readfile(file)
+						let stylefile = join(stylesheet, ' ')
+						let stylefile = substitute(stylefile, '+>\*[,', ' ', 'g')
+						if search_for == 'class'
+							let stylesheet = split(stylefile)
+							let classlines = filter(copy(stylesheet), "v:val =~ '\\([a-zA-Z0-9:]\\+\\)\\?\\.[a-zA-Z0-9_-]\\+'")
+						else
+							let stylesheet = split(stylefile, '[{}]')
+							" Get all lines which fit id syntax
+							let classlines = filter(copy(stylesheet), "v:val =~ '#[a-zA-Z0-9_-]\\+'")
+							" Filter out possible color definitions
+							call filter(classlines, "v:val !~ ':\\s*#[a-zA-Z0-9_-]\\+'")
+							" Filter out complex border definitions
+							call filter(classlines, "v:val !~ '\\(none\\|hidden\\|dotted\\|dashed\\|solid\\|double\\|groove\\|ridge\\|inset\\|outset\\)\\s*#[a-zA-Z0-9_-]\\+'")
+							let templines = join(classlines, ' ')
+							let stylelines = split(templines)
+							let classlines = filter(stylelines, "v:val =~ '#[a-zA-Z0-9_-]\\+'")
+
+						endif
+					endif
+					" We gathered classes definitions from all external files
+					let classes += classlines
+				endfor
+				if internal == 1
+					let classes += headclasslines
+				endif
+
+				if search_for == 'class'
+					let elements = {}
+					for element in classes
+						if element =~ '^\.'
+							let class = matchstr(element, '^\.\zs[a-zA-Z][a-zA-Z0-9_-]*\ze')
+							let class = substitute(class, ':.*', '', '')
+							if has_key(elements, 'common')
+								let elements['common'] .= ' '.class
+							else
+								let elements['common'] = class
+							endif
+						else
+							let class = matchstr(element, '[a-zA-Z1-6]*\.\zs[a-zA-Z][a-zA-Z0-9_-]*\ze')
+							let tagname = tolower(matchstr(element, '[a-zA-Z1-6]*\ze.'))
+							if tagname != ''
+								if has_key(elements, tagname)
+									let elements[tagname] .= ' '.class
+								else
+									let elements[tagname] = class
+								endif
+							endif
+						endif
+					endfor
+
+					if has_key(elements, tag) && has_key(elements, 'common')
+						let values = split(elements[tag]." ".elements['common'])
+					elseif has_key(elements, tag) && !has_key(elements, 'common')
+						let values = split(elements[tag])
+					elseif !has_key(elements, tag) && has_key(elements, 'common')
+						let values = split(elements['common'])
+					else
+						return []
+					endif
+
+				elseif search_for == 'id'
+					" Find used IDs
+					" 1. Catch whole file
+					let filelines = getline(1, line('$'))
+					" 2. Find lines with possible id
+					let used_id_lines = filter(filelines, 'v:val =~ "id\\s*=\\s*[\"''][a-zA-Z0-9_-]\\+"')
+					" 3a. Join all filtered lines 
+					let id_string = join(used_id_lines, ' ')
+					" 3b. And split them to be sure each id is in separate item
+					let id_list = split(id_string, 'id\s*=\s*')
+					" 4. Extract id values
+					let used_id = map(id_list, 'matchstr(v:val, "[\"'']\\zs[a-zA-Z0-9_-]\\+\\ze")')
+					let joined_used_id = ','.join(used_id, ',').','
+
+					let allvalues = map(classes, 'matchstr(v:val, ".*#\\zs[a-zA-Z0-9_-]\\+")')
+
+					let values = []
+
+					for element in classes
+						if joined_used_id !~ ','.element.','
+							let values += [element]
+						endif
+
+					endfor
+
+				endif
+
+				" We need special version of sbase
+				let classbase = matchstr(context, ".*[\"']")
+				let classquote = matchstr(classbase, '.$')
+
+				let entered_class = matchstr(attr, ".*=\\s*[\"']\\zs.*")
+
+				for m in sort(values)
+					if m =~? '^'.entered_class
+						call add(res, m . classquote)
+					elseif m =~? entered_class
+						call add(res2, m . classquote)
+					endif
+				endfor
+
+				return res + res2
+
+			elseif context =~ "style\\s*=\\s*[\"'][^\"']*$"
+				return csscomplete#CompleteCSS(0, context)
+
+			endif
+			let stripbase = matchstr(context, ".*\\(on[a-z]*\\|style\\|class\\)\\s*=\\s*[\"']\\zs.*")
+			" Now we have context stripped from all chars up to style/class.
+			" It may fail with some strange style value combinations.
+			if stripbase !~ "[\"']"
+				return []
+			endif
+		endif
+		" If attr contains =\s*[\"'] we catched value of attribute
+		if attr =~ "=\s*[\"']"
+			" Let do attribute specific completion
+			let attrname = matchstr(attr, '.*\ze\s*=')
+			let entered_value = matchstr(attr, ".*=\\s*[\"']\\zs.*")
+			let values = []
+			if attrname == 'media'
+				let values = ["screen", "tty", "tv", "projection", "handheld", "print", "braille", "aural", "all"]
+			elseif attrname == 'xml:space'
+				let values = ["preserve"]
+			elseif attrname == 'shape'
+				let values = ["rect", "circle", "poly", "default"]
+			elseif attrname == 'valuetype'
+				let values = ["data", "ref", "object"]
+			elseif attrname == 'method'
+				let values = ["get", "post"]
+			elseif attrname == 'dir'
+				let values = ["ltr", "rtl"]
+			elseif attrname == 'frame'
+				let values = ["void", "above", "below", "hsides", "lhs", "rhs", "vsides", "box", "border"]
+			elseif attrname == 'rules'
+				let values = ["none", "groups", "rows", "all"]
+			elseif attrname == 'align'
+				let values = ["left", "center", "right", "justify", "char"]
+			elseif attrname == 'valign'
+				let values = ["top", "middle", "bottom", "baseline"]
+			elseif attrname == 'scope'
+				let values = ["row", "col", "rowgroup", "colgroup"]
+			elseif attrname == 'href'
+				" Now we are looking for local anchors defined by name or id
+				if entered_value =~ '^#'
+					let file = join(getline(1, line('$')), ' ')
+					" Split it be sure there will be one id/name element in
+					" item, it will be also first word [a-zA-Z0-9_-] in element
+					let oneelement = split(file, "\\(meta \\)\\@<!\\(name\\|id\\)\\s*=\\s*[\"']")
+					for i in oneelement
+						let values += ['#'.matchstr(i, "^[a-zA-Z][a-zA-Z0-9%_-]*")]
+					endfor
+				endif
+			elseif attrname == 'type'
+				if context =~ '^input'
+					let values = ["text", "password", "checkbox", "radio", "submit", "reset", "file", "hidden", "image", "button"]
+				elseif context =~ '^button'
+					let values = ["button", "submit", "reset"]
+				elseif context =~ '^style'
+					let values = ["text/css"]
+				elseif context =~ '^script'
+					let values = ["text/javascript"]
+				endif
+			else
+				return []
+			endif
+
+			if len(values) == 0
+				return []
+			endif
+
+			" We need special version of sbase
+			let attrbase = matchstr(context, ".*[\"']")
+			let attrquote = matchstr(attrbase, '.$')
+
+			for m in values
+				" This if is needed to not offer all completions as-is
+				" alphabetically but sort them. Those beginning with entered
+				" part will be as first choices
+				if m =~ '^'.entered_value
+					call add(res, m . attrquote.' ')
+				elseif m =~ entered_value
+					call add(res2, m . attrquote.' ')
+				endif
+			endfor
+
+			return res + res2
+
+		endif
+		" Shorten context to not include last word
+		let sbase = matchstr(context, '.*\ze\s.*')
+		if tag =~ '^\(abbr\|acronym\|address\|b\|bdo\|big\|caption\|cite\|code\|dd\|dfn\|div\|dl\|dt\|em\|fieldset\|h\d\|hr\|i\|kbd\|li\|noscript\|ol\|p\|samp\|small\|span\|strong\|sub\|sup\|tt\|ul\|var\)$'
+			let attrs = coregroup
+		elseif tag == 'a'
+			let attrs = coregroup + focus + ["charset", "type", "name", "href", "hreflang", "rel", "rev", "shape", "coords"]
+		elseif tag == 'area'
+			let attrs = coregroup + focus + ["shape", "coords", "href", "nohref", "alt"]
+		elseif tag == 'base'
+			let attrs = ["href", "id"]
+		elseif tag == 'blockquote'
+			let attrs = coregroup + ["cite"]
+		elseif tag == 'body'
+			let attrs = coregroup + ["onload", "onunload"]
+		elseif tag == 'br'
+			let attrs = coreattrs
+		elseif tag == 'button'
+			let attrs = coregroup + focus + ["name", "value", "type"]
+		elseif tag == '^\(col\|colgroup\)$'
+			let attrs = coregroup + ["span", "width", "align", "char", "charoff", "valign"]
+		elseif tag =~ '^\(del\|ins\)$'
+			let attrs = coregroup + ["cite", "datetime"]
+		elseif tag == 'form'
+			let attrs = coregroup + ["action", "method=\"get\" ", "method=\"post\" ", "enctype", "onsubmit", "onreset", "accept", "accept-charset"]
+		elseif tag == 'head'
+			let attrs = i18n + ["id", "profile"]
+		elseif tag == 'html'
+			let attrs = i18n + ["id", "xmlns"]
+		elseif tag == 'img'
+			let attrs = coregroup + ["src", "alt", "longdesc", "height", "width", "usemap", "ismap"]
+		elseif tag == 'input'
+			let attrs = coregroup + ["type", "name", "value", "checked", "disabled", "readonly", "size", "maxlength", "src", "alt", "usemap", "onselect", "onchange", "accept"]
+		elseif tag == 'label'
+			let attrs = coregroup + ["for", "accesskey", "onfocus", "onblur"]
+		elseif tag == 'legend'
+			let attrs = coregroup + ["accesskey"]
+		elseif tag == 'link'
+			let attrs = coregroup + ["charset", "href", "hreflang", "type", "rel", "rev", "media"]
+		elseif tag == 'map'
+			let attrs = i18n + events + ["id", "class", "style", "title", "name"]
+		elseif tag == 'meta'
+			let attrs = i18n + ["id", "http-equiv", "content", "scheme", "name"]
+		elseif tag == 'title'
+			let attrs = i18n + ["id"]
+		elseif tag == 'object'
+			let attrs = coregroup + ["declare", "classid", "codebase", "data", "type", "codetype", "archive", "standby", "height", "width", "usemap", "name", "tabindex"]
+		elseif tag == 'optgroup'
+			let attrs = coregroup + ["disbled", "label"]
+		elseif tag == 'option'
+			let attrs = coregroup + ["disbled", "selected", "value", "label"]
+		elseif tag == 'param'
+			let attrs = ["id", "name", "value", "valuetype", "type"]
+		elseif tag == 'pre'
+			let attrs = coregroup + ["xml:space"]
+		elseif tag == 'q'
+			let attrs = coregroup + ["cite"]
+		elseif tag == 'script'
+			let attrs = ["id", "charset", "type=\"text/javascript\"", "type", "src", "defer", "xml:space"]
+		elseif tag == 'select'
+			let attrs = coregroup + ["name", "size", "multiple", "disabled", "tabindex", "onfocus", "onblur", "onchange"]
+		elseif tag == 'style'
+			let attrs = coreattrs + ["id", "type=\"text/css\"", "type", "media", "title", "xml:space"]
+		elseif tag == 'table'
+			let attrs = coregroup + ["summary", "width", "border", "frame", "rules", "cellspacing", "cellpadding"]
+		elseif tag =~ '^\(thead\|tfoot\|tbody\|tr\)$'
+			let attrs = coregroup + ["align", "char", "charoff", "valign"]
+		elseif tag == 'textarea'
+			let attrs = coregroup + ["name", "rows", "cols", "disabled", "readonly", "onselect", "onchange"]
+		elseif tag =~ '^\(th\|td\)$'
+			let attrs = coregroup + ["abbr", "headers", "scope", "rowspan", "colspan", "align", "char", "charoff", "valign"]
+		else
+			return []
+		endif
+
+		for m in sort(attrs)
+			if m =~ '^'.attr
+				if m =~ '^\(ismap\|defer\|declare\|nohref\|checked\|disabled\|selected\|readonly\)$' || m =~ '='
+					call add(res, m)
+				else
+					call add(res, m.'="')
+				endif
+			elseif m =~ attr
+				if m =~ '^\(ismap\|defer\|declare\|nohref\|checked\|disabled\|selected\|readonly\)$' || m =~ '='
+					call add(res2, m)
+				else
+					call add(res2, m.'="')
+				endif
+			endif
+		endfor
+
+		return res + res2
+
+	endif
+	" Close tag
+	let b:unaryTagsStack = "base meta link hr br param img area input col"
+	if context =~ '^\/'
+		let opentag = htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+		return [opentag.">"]
+	endif
+	" Deal with tag completion.
+	let opentag = htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+	" Clusters
+	let special = "br span bdo map object img"
+	let phrase =  "em strong dfn code q samp kbd var cite abbr acronym sub sup"
+	let inlineforms = "input select textarea label button"
+	let miscinline = "ins del script"
+	let inline = "a ".special." ".phrase." ".inlineforms." tt i b big small"
+	let misc = "noscript ".miscinline
+	let block = "p h1 h2 h3 h4 h5 h6 div ul ol dl pre hr blockquote address fieldset table"
+
+	if opentag == 'a'
+		let tags = split("tt i b big small ".special." ".phrase." ".inlineforms." ".miscinline)
+	elseif opentag =~ '^\(abbr\|acronym\|address\|b\|p\|h\d\|dt\|span\|bdo\|em\|strong\|dfn\|code\|samp\|kbd\|var\|cite\|q\|sub\|sup\|tt\|i\|big\|small\|label\|caption\)$'
+		let tags = split(inline." ".miscinline)
+	elseif opentag == 'pre'
+		let tags = split("a tt i b big small br span bdo map ".phrase." ".miscinline." ".inlineforms)
+	elseif opentag == 'html'
+		let tags = ["head", "body"]
+	elseif opentag == 'legend'
+		let tags = split(inline." ".miscinline)
+	elseif opentag == 'head'
+		let tags = ["title", "base", "scipt", "style", "meta", "link", "object"]
+	elseif opentag =~ '^\(noscript\|body\|blockquote\)$'
+		let tags = split("form ".block." ".misc)
+	elseif opentag =~ '^\(ul\|ol\)$'
+		let tags = ["li"]
+	elseif opentag == 'dl'
+		let tags = ["dt", "dd"]
+	elseif opentag =~ '^\(ins\|del\|th\|td\|dd\|div\|li\)$'
+		let tags = split("form ".block." ".inline." ".misc)
+	elseif opentag == 'object'
+		let tags = split("param form ".block." ".inline." ".misc)
+	elseif opentag == 'fieldset'
+		let tags = split("legend form ".block." ".inline." ".misc)
+	elseif opentag == 'map'
+		let tags = split("area form ".block." ".misc)
+	elseif opentag == 'form'
+		let tags = split(block." ".misc)
+	elseif opentag == 'select'
+		let tags = ["optgroup", "option"]
+	elseif opentag == 'optgroup'
+		let tags = ["option"]
+	elseif opentag == 'colgroup'
+		let tags = ["col"]
+	elseif opentag == '^\(textarea\|option\|script\|style\|title\)$'
+		let tags = ['empty']
+	elseif opentag == 'button'
+		let tags = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "div", "ul", "ol", "dl", "table"]
+	elseif opentag =~ '^\(thead\|tfoot\|tbody\)$'
+		let tags = ["tr"]
+	elseif opentag == 'tr'
+		let tags = ["th", "td"]
+	elseif opentag == 'table'
+		let tags = ["caption", "col", "colgroup", "thead", "tfoot", "tbody", "tr"]
+	else
+		return []
+	endif
+
+	for m in tags
+		if m =~ '^'.context
+			call add(res, m)
+		elseif m =~ context
+			call add(res2, m)
+		endif
+	endfor
+
+	return res + res2
+
+  endif
+endfunction
+
+" MM: This is greatly reduced closetag.vim used with kind permission of Steven
+"     Mueller
+"     Changes: strip all comments; delete error messages
+" Author: Steven Mueller <diffusor@ugcs.caltech.edu>
+" Last Modified: Tue May 24 13:29:48 PDT 2005 
+" Version: 0.9.1
+
+function! htmlcomplete#GetLastOpenTag(unaryTagsStack)
+	let linenum=line('.')
+	let lineend=col('.') - 1 " start: cursor position
+	let first=1              " flag for first line searched
+	let b:TagStack=''        " main stack of tags
+	let startInComment=s:InComment()
+
+	let tagpat='</\=\(\k\|[-:]\)\+\|/>'
+	while (linenum>0)
+		let line=getline(linenum)
+		if first
+			let line=strpart(line,0,lineend)
+		else
+			let lineend=strlen(line)
+		endif
+		let b:lineTagStack=''
+		let mpos=0
+		let b:TagCol=0
+		while (mpos > -1)
+			let mpos=matchend(line,tagpat)
+			if mpos > -1
+				let b:TagCol=b:TagCol+mpos
+				let tag=matchstr(line,tagpat)
+
+				if exists('b:closetag_disable_synID') || startInComment==s:InCommentAt(linenum, b:TagCol)
+					let b:TagLine=linenum
+					call s:Push(matchstr(tag,'[^<>]\+'),'b:lineTagStack')
+				endif
+				let lineend=lineend-mpos
+				let line=strpart(line,mpos,lineend)
+			endif
+		endwhile
+		while (!s:EmptystackP('b:lineTagStack'))
+			let tag=s:Pop('b:lineTagStack')
+			if match(tag, '^/') == 0		"found end tag
+				call s:Push(tag,'b:TagStack')
+			elseif s:EmptystackP('b:TagStack') && !s:Instack(tag, a:unaryTagsStack)	"found unclosed tag
+				return tag
+			else
+				let endtag=s:Peekstack('b:TagStack')
+				if endtag == '/'.tag || endtag == '/'
+					call s:Pop('b:TagStack')	"found a open/close tag pair
+				elseif !s:Instack(tag, a:unaryTagsStack) "we have a mismatch error
+					return ''
+				endif
+			endif
+		endwhile
+		let linenum=linenum-1 | let first=0
+	endwhile
+return ''
+endfunction
+
+function! s:InComment()
+	return synIDattr(synID(line('.'), col('.'), 0), 'name') =~ 'Comment'
+endfunction
+
+function! s:InCommentAt(line, col)
+	return synIDattr(synID(a:line, a:col, 0), 'name') =~ 'Comment'
+endfunction
+
+function! s:SetKeywords()
+	let g:IsKeywordBak=&iskeyword
+	let &iskeyword='33-255'
+endfunction
+
+function! s:RestoreKeywords()
+	let &iskeyword=g:IsKeywordBak
+endfunction
+
+function! s:Push(el, sname)
+	if !s:EmptystackP(a:sname)
+		exe 'let '.a:sname."=a:el.' '.".a:sname
+	else
+		exe 'let '.a:sname.'=a:el'
+	endif
+endfunction
+
+function! s:EmptystackP(sname)
+	exe 'let stack='.a:sname
+	if match(stack,'^ *$') == 0
+		return 1
+	else
+		return 0
+	endif
+endfunction
+
+function! s:Instack(el, sname)
+	exe 'let stack='.a:sname
+	call s:SetKeywords()
+	let m=match(stack, '\<'.a:el.'\>')
+	call s:RestoreKeywords()
+	if m < 0
+		return 0
+	else
+		return 1
+	endif
+endfunction
+
+function! s:Peekstack(sname)
+	call s:SetKeywords()
+	exe 'let stack='.a:sname
+	let top=matchstr(stack, '\<.\{-1,}\>')
+	call s:RestoreKeywords()
+	return top
+endfunction
+
+function! s:Pop(sname)
+	if s:EmptystackP(a:sname)
+		return ''
+	endif
+	exe 'let stack='.a:sname
+	call s:SetKeywords()
+	let loc=matchend(stack,'\<.\{-1,}\>')
+	exe 'let '.a:sname.'=strpart(stack, loc+1, strlen(stack))'
+	let top=strpart(stack, match(stack, '\<'), loc)
+	call s:RestoreKeywords()
+	return top
+endfunction
+
+function! s:Clearstack(sname)
+	exe 'let '.a:sname."=''"
+endfunction

runtime/autoload/netrwFileHandlers.vim

@@ -0,0 +1,321 @@
+" netrwFileHandlers: contains various extension-based file handlers for
+"                    netrw's browsers' x command ("eXecute launcher")
+" Author:	Charles E. Campbell, Jr.
+" Date:		Oct 12, 2005
+" Version:	7
+" 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.
+
+" ---------------------------------------------------------------------
+" Load Once: {{{1
+if exists("g:loaded_netrwFileHandlers") || &cp
+ finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+let g:loaded_netrwFileHandlers= "v7"
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#Init: {{{1
+"    This functions is here to allow a call to this function to autoload
+"    the netrwFileHandlers.vim file
+fun! netrwFileHandlers#Init()
+"  call Dfunc("netrwFileHandlers#Init()")
+"  call Dret("netrwFileHandlers#Init")
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_html: handles html when the user hits "x" when the {{{1
+"                        cursor is atop a *.html file
+fun! netrwFileHandlers#NFH_html(pagefile)
+"  call Dfunc("netrwFileHandlers#NFH_html(".a:pagefile.")")
+
+  let page= substitute(a:pagefile,'^','file://','')
+
+  if executable("mozilla")
+"   call Decho("executing !mozilla ".page)
+   exe "!mozilla \"".page.'"'
+  elseif executable("netscape")
+"   call Decho("executing !netscape ".page)
+   exe "!netscape \"".page.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_html 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_html 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_htm: handles html when the user hits "x" when the {{{1
+"                        cursor is atop a *.htm file
+fun! netrwFileHandlers#NFH_htm(pagefile)
+"  call Dfunc("netrwFileHandlers#NFH_htm(".a:pagefile.")")
+
+  let page= substitute(a:pagefile,'^','file://','')
+
+  if executable("mozilla")
+"   call Decho("executing !mozilla ".page)
+   exe "!mozilla \"".page.'"'
+  elseif executable("netscape")
+"   call Decho("executing !netscape ".page)
+   exe "!netscape \"".page.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_htm 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_htm 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_jpg: {{{1
+fun! netrwFileHandlers#NFH_jpg(jpgfile)
+"  call Dfunc("netrwFileHandlers#NFH_jpg(jpgfile<".a:jpgfile.">)")
+
+  if executable("gimp")
+   exe "silent! !gimp -s ".a:jpgfile
+  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
+"   call Decho("silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT ".escape(a:jpgfile," []|'"))
+   exe "!".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:jpgfile.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_jpg 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_jpg 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_gif: {{{1
+fun! netrwFileHandlers#NFH_gif(giffile)
+"  call Dfunc("netrwFileHandlers#NFH_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.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_gif 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_gif 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_png: {{{1
+fun! netrwFileHandlers#NFH_png(pngfile)
+"  call Dfunc("netrwFileHandlers#NFH_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.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_png 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_png 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_pnm: {{{1
+fun! netrwFileHandlers#NFH_pnm(pnmfile)
+"  call Dfunc("netrwFileHandlers#NFH_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.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_pnm 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_pnm 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_bmp: visualize bmp files {{{1
+fun! netrwFileHandlers#NFH_bmp(bmpfile)
+"  call Dfunc("netrwFileHandlers#NFH_bmp(bmpfile<".a:bmpfile.">)")
+
+  if executable("gimp")
+   exe "silent! !gimp -s ".a:bmpfile
+  elseif executable(expand("$SystemRoot")."/SYSTEM32/MSPAINT.EXE")
+   exe "silent! !".expand("$SystemRoot")."/SYSTEM32/MSPAINT \"".a:bmpfile.'"'
+  else
+"   call Dret("netrwFileHandlers#NFH_bmp 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_bmp 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_pdf: visualize pdf files {{{1
+fun! netrwFileHandlers#NFH_pdf(pdf)
+"  " call Dfunc("netrwFileHandlers#NFH_pdf(pdf<".a:pdf.">)")
+  if executable("gs")
+   exe 'silent! !gs "'.a:pdf.'"'
+  else
+"   " call Dret("netrwFileHandlers#NFH_pdf 0")
+   return 0
+  endif
+
+"  " call Dret("netrwFileHandlers#NFH_pdf 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_doc: visualize doc files {{{1
+fun! netrwFileHandlers#NFH_doc(doc)
+"  " call Dfunc("netrwFileHandlers#NFH_doc(doc<".a:doc.">)")
+
+  if executable("oowriter")
+   exe 'silent! !oowriter "'.a:doc.'"'
+   redraw!
+  else
+"   " call Dret("netrwFileHandlers#NFH_doc 0")
+   return 0
+  endif
+
+"  " call Dret("netrwFileHandlers#NFH_doc 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_sxw: visualize sxw files {{{1
+fun! netrwFileHandlers#NFH_sxw(sxw)
+"  " call Dfunc("netrwFileHandlers#NFH_sxw(sxw<".a:sxw.">)")
+
+  if executable("oowriter")
+   exe 'silent! !oowriter "'.a:sxw.'"'
+   redraw!
+  else
+"   " call Dret("netrwFileHandlers#NFH_sxw 0")
+   return 0
+  endif
+
+"  " call Dret("netrwFileHandlers#NFH_sxw 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_xls: visualize xls files {{{1
+fun! netrwFileHandlers#NFH_xls(xls)
+"  " call Dfunc("netrwFileHandlers#NFH_xls(xls<".a:xls.">)")
+
+  if executable("oocalc")
+   exe 'silent! !oocalc "'.a:xls.'"'
+   redraw!
+  else
+"   " call Dret("netrwFileHandlers#NFH_xls 0")
+   return 0
+  endif
+
+"  " call Dret("netrwFileHandlers#NFH_xls 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_ps: handles PostScript files {{{1
+fun! netrwFileHandlers#NFH_ps(ps)
+"  call Dfunc("netrwFileHandlers#NFH_ps()")
+  if executable("gs")
+   exe "silent! !gs ".a:ps
+   redraw!
+  elseif executable("ghostscript")
+   exe "silent! !ghostscript ".a:ps
+   redraw!
+  elseif executable("ghostscript")
+   exe "silent! !ghostscript ".a:ps
+   redraw!
+  elseif executable("gswin32")
+   exe "silent! !gswin32 \"".a:ps.'"'
+   redraw!
+  else
+"   call Dret("netrwFileHandlers#NFH_ps 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_ps 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_eps: handles encapsulated PostScript files {{{1
+fun! netrwFileHandlers#NFH_eps(eps)
+"  call Dfunc("netrwFileHandlers#NFH_ps()")
+  if executable("gs")
+   exe "silent! !gs ".a:eps
+   redraw!
+  elseif executable("ghostscript")
+   exe "silent! !ghostscript ".a:eps
+   redraw!
+  elseif executable("ghostscript")
+   exe "silent! !ghostscript ".a:eps
+   redraw!
+  elseif executable("gswin32")
+   exe "silent! !gswin32 \"".a:eps.'"'
+   redraw!
+  else
+"   call Dret("netrwFileHandlers#NFH_ps 0")
+   return 0
+  endif
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_fig: handles xfig files {{{1
+fun! netrwFileHandlers#NFH_fig(fig)
+"  call Dfunc("netrwFileHandlers#NFH_fig()")
+  if executable("xfig")
+   exe "silent! !xfig ".a:fig
+   redraw!
+  else
+"   call Dret("netrwFileHandlers#NFH_fig 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_fig 1")
+  return 1
+endfun
+
+" ---------------------------------------------------------------------
+" netrwFileHandlers#NFH_obj: handles tgif's obj files {{{1
+fun! netrwFileHandlers#NFH_obj(obj)
+"  call Dfunc("netrwFileHandlers#NFH_obj()")
+  if has("unix") && executable("tgif")
+   exe "silent! !tgif ".a:obj
+   redraw!
+  else
+"   call Dret("netrwFileHandlers#NFH_obj 0")
+   return 0
+  endif
+
+"  call Dret("netrwFileHandlers#NFH_obj 1")
+  return 1
+endfun
+
+let &cpo= s:keepcpo
+" ---------------------------------------------------------------------
+"  Modelines: {{{1
+"  vim: ts=4 fdm=marker

runtime/autoload/tar.vim

@@ -1,11 +1,11 @@
-" vim:set ts=8 sts=4 sw=4:
 "
 " tar.vim -- a Vim plugin for browsing tarfiles
 " Copyright (c) 2002, Michael C. Toren <mct@toren.net>
 " Distributed under the GNU General Public License.
 "
-" Version: 1.01
-" Last Change: 2005 Jul 26
+" Version:	2
+" Date:		Sep 14, 2005
+" Modified By:	Charles E. Campbell, Jr.
 "
 " Updates are available from <http://michael.toren.net/code/>.  If you
 " find this script useful, or have suggestions for improvements, please
@@ -13,14 +13,15 @@
 " Also look there for further comments and documentation.
 "
 " This part defines the functions.  The autocommands are in plugin/tar.vim.
+if exists("g:loaded_tar") || &cp
+ finish
+endif
+let g:loaded_tar= "v2"
 
-let s:version = "1.01"
-
-function! tar#Write(argument)
-    echo "ERROR: Sorry, no write support for tarfiles yet"
-endfunction
-
-function! tar#Read(argument, cleanup)
+" ---------------------------------------------------------------------
+"  tar#Read: {{{1
+fun! tar#Read(argument, cleanup)
+"    call Dfunc("tar#Read(argument<".a:argument."> cleanup=".a:cleanup.")")
     let l:argument = a:argument
     let l:argument = substitute(l:argument, '^tarfile:', '', '')
     let l:argument = substitute(l:argument, '^\~', $HOME, '')
@@ -28,7 +29,8 @@ function! tar#Read(argument, cleanup)
     let l:tarfile = l:argument
     while 1
 	if (l:tarfile == "" || l:tarfile == "/")
-	    echo "ERROR: Could not find a readable tarfile in path:" l:argument
+	    echo "***error*** (tar#Read) Could not find a readable tarfile in path:" l:argument
+"            call Dret("tar#Read")
 	    return
 	endif
 
@@ -42,6 +44,7 @@ function! tar#Read(argument, cleanup)
     let l:toextract = strpart(l:argument, strlen(l:tarfile) + 1)
 
     if (l:toextract == "")
+"        call Dret("tar#Read")
 	return
     endif
 
@@ -52,12 +55,90 @@ function! tar#Read(argument, cleanup)
     if (a:cleanup)
 	0d "blank line
 	execute "doautocmd BufReadPost " . expand("%")
-	setlocal readonly
+	setlocal nomod
 	silent preserve
     endif
-endfunction
+"    call Dret("tar#Read")
+endfun
 
-function! tar#Browse(tarfile)
+" ---------------------------------------------------------------------
+" tar#Write: {{{1
+fun! tar#Write(argument)
+"  call Dfunc("tar#Write(argument<".a:argument.">)")
+"
+  " sanity checks
+  if !executable("tar")
+   echo "***error*** (TarWrite) sorry, your system doesn't appear to have the tar pgm"
+"   call Dret("tar#Write")
+   return
+  endif
+  if !exists("*mkdir")
+   echo "***error*** (TarWrite) sorry, mkdir() doesn't work on your system"
+"   call Dret("tar#Write")
+   return
+  endif
+
+  let curdir= getcwd()
+  let tmpdir= tempname()
+"  call Decho("orig tempname<".tmpdir.">")
+  if tmpdir =~ '\.'
+   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
+  endif
+"  call Decho("tmpdir<".tmpdir.">")
+  call mkdir(tmpdir,"p")
+
+  " attempt to change to the indicated directory
+  try
+   exe "cd ".escape(tmpdir,' \')
+  catch /^Vim\%((\a\+)\)\=:E344/
+   echo "***error*** (TarWrite) cannot cd to temporary directory"
+"   call Dret("tar#Write")
+   return
+  endtry
+"  call Decho("current directory now: ".getcwd())
+
+  " place temporary files under .../_TARVIM_/
+  if isdirectory("_TARVIM_")
+   call s:Rmdir("_TARVIM_")
+  endif
+  call mkdir("_TARVIM_")
+  cd _TARVIM_
+"  call Decho("current directory now: ".getcwd())
+
+  let tarfile = curdir."/".substitute(a:argument,'tarfile:\([^/]\{-}\)/.*$','\1','')
+  let path    = substitute(a:argument,'^.\{-}/','','')
+  let dirpath = substitute(path,'/\=[^/]\+$','','')
+"  call Decho("path   <".path.">")
+"  call Decho("dirpath<".dirpath.">")
+  call mkdir(dirpath,"p")
+  exe "w! ".path
+  if executable("cygpath")
+   let path    = substitute(system("cygpath ".path),'\n','','e')
+   let tarfile = substitute(system("cygpath ".tarfile),'\n','','e')
+  endif
+
+"  call Decho("tar --delete -f ".tarfile." ".path)
+  call system("tar --delete -f ".tarfile." ".path)
+  if v:shell_error != 0
+   echo "***error*** (TarWrite) sorry, your tar pgm doesn't support deletion of ".path
+  else
+"   call Decho("tar -rf ".tarfile." ".path)
+   call system("tar -rf ".tarfile." ".path)
+  endif
+  
+  " cleanup and restore current directory
+  cd ..
+  call s:Rmdir("_TARVIM_")
+  exe "cd ".escape(curdir,' \')
+  setlocal nomod
+
+"  call Dret("tar#Write")
+endfun
+
+" ---------------------------------------------------------------------
+"  tar#Browse: {{{1
+fun! tar#Browse(tarfile)
+"    call Dfunc("tar#Browse(tarfile<".a:tarfile.">)")
     setlocal noswapfile
     setlocal buftype=nofile
     setlocal bufhidden=hide
@@ -76,11 +157,12 @@ function! tar#Browse(tarfile)
     endif
 
     if ! filereadable(l:tarfile)
-	echo "ERROR: File not readable:" l:tarfile
+	echo "***error*** (tar#Browse) File not readable:" l:tarfile
+"        call Dret("tar#Browse")
 	return
     endif
 
-    call s:Say("\" tar.vim version " . s:version)
+    call s:Say("\" tar.vim version " . g:loaded_tar)
     call s:Say("\" Browsing tarfile " . l:tarfile)
     call s:Say("\" Hit ENTER to view a file in a new window")
     call s:Say("")
@@ -89,12 +171,15 @@ function! tar#Browse(tarfile)
     0d "blank line
     /^$/1
 
-    setlocal readonly
-    setlocal nomodifiable
-    noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>
-endfunction
+    setlocal noma nomod ro
 
-function! s:TarBrowseSelect()
+    noremap <silent> <buffer> <cr> :call <SID>TarBrowseSelect()<cr>
+"    call Dret("tar#Browse")
+endfun
+
+" ---------------------------------------------------------------------
+"  TarBrowseSelect: {{{1
+fun! s:TarBrowseSelect()
     let l:line = getline(".")
 
     if (l:line =~ '^" ')
@@ -110,10 +195,12 @@ function! s:TarBrowseSelect()
     new
     wincmd _
     execute "e " . l:selection
-endfunction
+endfun
 
-" kludge to deal with compressed archives
-function! s:TarCatCommand(tarfile)
+" ---------------------------------------------------------------------
+" TarCatCommand: kludge to deal with compressed archives {{{1
+fun! s:TarCatCommand(tarfile)
+"    call Dfunc("s:TarCatCommand(tarfile<".a:tarfile.">)")
     if a:tarfile =~# '\.\(gz\|tgz\|Z\)$'
 	let l:cat = "gzip -d -c"
     elseif a:tarfile =~# '\.bz2$'
@@ -121,10 +208,33 @@ function! s:TarCatCommand(tarfile)
     else
 	let l:cat = "cat"
     endif
+"    call Dret("s:TarCatCommand ".l:cat)
     return l:cat
-endfunction
+endfun
 
-function! s:Say(string)
+" ---------------------------------------------------------------------
+"  Say: {{{1
+fun! s:Say(string)
     let @" = a:string
     $ put
-endfunction
+endfun
+
+" ---------------------------------------------------------------------
+" Rmdir: {{{1
+fun! s:Rmdir(fname)
+"  call Dfunc("Rmdir(fname<".a:fname.">)")
+  if has("unix")
+   call system("/bin/rm -rf ".a:fname)
+  elseif has("win32") || has("win95") || has("win64") || has("win16")
+   if &shell =~? "sh$"
+    call system("/bin/rm -rf ".a:fname)
+   else
+    call system("del /S ".a:fname)
+   endif
+  endif
+"  call Dret("Rmdir")
+endfun
+
+" ---------------------------------------------------------------------
+"  Modelines: {{{1
+" vim:set ts=8 sts=4 sw=4 fdm=marker:

runtime/autoload/zip.vim

@@ -0,0 +1,226 @@
+" zip.vim: Handles browsing zipfiles
+"            AUTOLOAD PORTION
+" Date:			Sep 16, 2005
+" Version:		2
+" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" License:		Vim License  (see vim's :help license)
+" Copyright:    Copyright (C) 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,
+"               zipPlugin.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.
+
+" ---------------------------------------------------------------------
+" Initialization: {{{1
+let s:keepcpo= &cpo
+set cpo&vim
+if exists("g:loaded_zip")
+ finish
+endif
+
+let g:loaded_zip= "v2"
+
+" ----------------
+"  Functions: {{{1
+" ----------------
+
+" ---------------------------------------------------------------------
+" zip#Browse: {{{2
+fun! zip#Browse(zipfile)
+"  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
+
+  " sanity checks
+  if !executable("unzip")
+   echohl Error | echo "***error*** (zip#Browse) unzip not available on your system"
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("zip#Browse")
+   return
+  endif
+  if !filereadable(a:zipfile)
+   echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("zip#Browse")
+   return
+  endif
+  if &ma != 1
+   set ma
+  endif
+  let w:zipfile= a:zipfile
+
+  setlocal noswapfile
+  setlocal buftype=nofile
+  setlocal bufhidden=hide
+  setlocal nobuflisted
+  setlocal nowrap
+  set ft=tar
+
+  " give header
+  exe "$put ='".'\"'." zip.vim version ".g:loaded_zip."'"
+  exe "$put ='".'\"'." Browsing zipfile ".a:zipfile."'"
+  exe "$put ='".'\"'." Select a file with cursor and press ENTER"."'"
+  $put =''
+  0d
+  $
+
+  exe "silent r! unzip -l ".a:zipfile
+  $d
+  silent 4,$v/^\s\+\d\+\s\{0,5}\d/d
+  silent  4,$s/^\%(.*\)\s\+\(\S\)/\1/
+
+  setlocal noma nomod ro
+  noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
+
+"  call Dret("zip#Browse")
+endfun
+
+" ---------------------------------------------------------------------
+" ZipBrowseSelect: {{{2
+fun! s:ZipBrowseSelect()
+"  call Dfunc("ZipBrowseSelect() zipfile<".w:zipfile.">")
+  let fname= getline(".")
+
+  " sanity check
+  if fname =~ '^"'
+"   call Dret("ZipBrowseSelect")
+   return
+  endif
+  if fname =~ '/$'
+   echohl Error | echo "***error*** (zip#Browse) Please specify a file, not a directory" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("ZipBrowseSelect")
+   return
+  endif
+
+"  call Decho("fname<".fname.">")
+
+  " get zipfile to the new-window
+  let zipfile= substitute(w:zipfile,'.zip$','','e')
+
+  new
+  wincmd _
+  exe "e zipfile:".zipfile.':'.fname
+  filetype detect
+
+"  call Dret("ZipBrowseSelect")
+endfun
+
+" ---------------------------------------------------------------------
+" zip#Read: {{{2
+fun! zip#Read(fname,mode)
+"  call Dfunc("zip#Read(fname<".a:fname.">,mode=".a:mode.")")
+  let zipfile = substitute(a:fname,'zipfile:\(.\{-}\):.*$','\1','')
+  let fname   = substitute(a:fname,'zipfile:.\{-}:\(.*\)$','\1','')
+"  call Decho("zipfile<".zipfile."> fname<".fname.">")
+
+  exe "r! unzip -p ".zipfile." ".fname
+
+  " cleanup
+  0d
+  set nomod
+
+"  call Dret("zip#Read")
+endfun
+
+" ---------------------------------------------------------------------
+" zip#Write: {{{2
+fun! zip#Write(fname)
+"  call Dfunc("zip#Write(fname<".a:fname.")")
+
+  " sanity checks
+  if !executable("zip")
+   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the zip pgm" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("zip#Write")
+   return
+  endif
+  if !exists("*mkdir")
+   echohl Error | echo "***error*** (zip#Write) sorry, mkdir() doesn't work on your system" | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("zip#Write")
+   return
+  endif
+
+  let curdir= getcwd()
+  let tmpdir= tempname()
+"  call Decho("orig tempname<".tmpdir.">")
+  if tmpdir =~ '\.'
+   let tmpdir= substitute(tmpdir,'\.[^.]*$','','e')
+  endif
+"  call Decho("tmpdir<".tmpdir.">")
+  call mkdir(tmpdir,"p")
+
+  " attempt to change to the indicated directory
+  try
+   exe "cd ".escape(tmpdir,' \')
+  catch /^Vim\%((\a\+)\)\=:E344/
+   echohl Error | echo "***error*** (zip#Write) cannot cd to temporary directory" | Echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+"   call Dret("zip#Write")
+   return
+  endtry
+"  call Decho("current directory now: ".getcwd())
+
+  " place temporary files under .../_ZIPVIM_/
+  if isdirectory("_ZIPVIM_")
+   call s:Rmdir("_ZIPVIM_")
+  endif
+  call mkdir("_ZIPVIM_")
+  cd _ZIPVIM_
+"  call Decho("current directory now: ".getcwd())
+
+  let zipfile = substitute(a:fname,'zipfile:\(.\{-}\):.*$','\1','')
+  let fname   = substitute(a:fname,'zipfile:.\{-}:\(.*\)$','\1','')
+  let dirpath = substitute(fname,'/[^/]\+$','','e')
+  if zipfile !~ '/'
+   let zipfile= curdir.'/'.zipfile
+  endif
+"  call Decho("zipfile<".zipfile."> fname<".fname.">")
+
+  call mkdir(dirpath,"p")
+  exe "w! ".fname
+  if executable("cygpath")
+   let dirpath = substitute(system("cygpath ".dirpath),'\n','','e')
+   let zipfile = substitute(system("cygpath ".zipfile),'\n','','e')
+  endif
+
+"  call Decho("zip -u ".zipfile.".zip ".fname)
+  call system("zip -u ".zipfile.".zip ".fname)
+  if v:shell_error != 0
+   echohl Error | echo "***error*** (zip#Write) sorry, unable to update ".zipfile." with ".fname | echohl None
+   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+  endif
+  
+  " cleanup and restore current directory
+  cd ..
+  call s:Rmdir("_ZIPVIM_")
+  exe "cd ".escape(curdir,' \')
+  setlocal nomod
+
+"  call Dret("zip#Write")
+endfun
+
+" ---------------------------------------------------------------------
+" Rmdir: {{{2
+fun! s:Rmdir(fname)
+"  call Dfunc("Rmdir(fname<".a:fname.">)")
+  if has("unix")
+   call system("/bin/rm -rf ".a:fname)
+  elseif has("win32") || has("win95") || has("win64") || has("win16")
+   if &shell =~? "sh$"
+    call system("/bin/rm -rf ".a:fname)
+   else
+    call system("del /S ".a:fname)
+   endif
+  endif
+"  call Dret("Rmdir")
+endfun
+
+" ------------------------------------------------------------------------
+" Modelines And Restoration: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" vim:ts=8 fdm=marker

runtime/compiler/eruby.vim

@@ -0,0 +1,47 @@
+" Vim compiler file
+" Language:	eRuby
+" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.sourceforge.net
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "eruby"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+if exists("eruby_compiler") && eruby_compiler == "eruby"
+  CompilerSet makeprg=eruby
+else
+  CompilerSet makeprg=erb
+endif
+
+CompilerSet errorformat=
+    \eruby:\ %f:%l:%m,
+    \%+E%f:%l:\ parse\ error,
+    \%W%f:%l:\ warning:\ %m,
+    \%E%f:%l:in\ %*[^:]:\ %m,
+    \%E%f:%l:\ %m,
+    \%-C%\tfrom\ %f:%l:in\ %.%#,
+    \%-Z%\tfrom\ %f:%l,
+    \%-Z%p^,
+    \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:

runtime/compiler/ruby.vim

@@ -1,12 +1,22 @@
 " Vim compiler file
-" Compiler:     Ruby syntax check and/or error reporting
-" Maintainer:   Tim Hammerquist <timmy@cpan.org>
-" Last Change:  Tue Jul 16 00:38:00 PDT 2002
+" Language:	Ruby
+" Function:	Syntax check and/or error reporting
+" Maintainer:	Tim Hammerquist <timh at rubyforge.org>
+" Info:		$Id$
+" URL:		http://vim-ruby.rubyforge.org
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
 "
 " Changelog:
-" 0.2:  script saves and restores 'cpoptions' value to prevent problems with
-"       line continuations
-" 0.1:  initial release
+" 0.2:	script saves and restores 'cpoptions' value to prevent problems with
+"	line continuations
+" 0.1:	initial release
 "
 " Contributors:
 "   Hugh Sasse <hgs@dmu.ac.uk>
@@ -22,6 +32,7 @@
 "   This is my first experience with 'errorformat' and compiler plugins and
 "   I welcome any input from more experienced (or clearer-thinking)
 "   individuals.
+" ----------------------------------------------------------------------------
 
 if exists("current_compiler")
   finish
@@ -59,4 +70,4 @@ CompilerSet errorformat=
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ft=vim
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:

runtime/compiler/rubyunit.vim

@@ -0,0 +1,41 @@
+" Vim compiler file
+" Language:	Test::Unit - Ruby Unit Testing Framework
+" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.sourceforge.net
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "rubyunit"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=testrb
+
+CompilerSet errorformat=\%W\ %\\+%\\d%\\+)\ Failure:,
+			\%C%m\ [%f:%l]:,
+			\%E\ %\\+%\\d%\\+)\ Error:,
+			\%C%m:,
+			\%C\ \ \ \ %f:%l:%.%#,
+			\%C%m,
+			\%Z\ %#,
+			\%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:

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 30
+*autocmd.txt*   For Vim version 7.0aa.  Last change: 2005 Oct 10
 
 
 		  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*
 
@@ -313,9 +324,11 @@ FileChangedRO			Before making the first change to a read-only
 				file.  Can be used to check-out the file from
 				a source control system.  Not triggered when
 				the change was caused by an autocommand.
-				WARNING: This event is triggered when making a
-				change, just before the change is applied to
-				the text.  If the autocommand moves the cursor
+				This event is triggered when making the first
+				change in a buffer or the first change after
+				'readonly' was set,
+				just before the change is applied to the text.
+				WARNING: If the autocommand moves the cursor
 				the effect of the change is undefined.
 							*FocusGained*
 FocusGained			When Vim got input focus.  Only for the GUI

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0aa.  Last change: 2005 Jul 05
+*cmdline.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -153,6 +153,7 @@ CTRL-R {0-9a-z"%#:-=.}					*c_CTRL-R* *c_<C-R>*
 							*c_CTRL-R_=*
 			'='	the expression register: you are prompted to
 				enter an expression (see |expression|)
+				(doesn't work at the expression prompt)
 		See |registers| about registers.  {not in Vi}
 		Implementation detail: When using the |expression| register
 		and invoking setcmdpos(), this sets the position before
@@ -191,7 +192,8 @@ CTRL-\ e {expr}						*c_CTRL-\_e*
 		to finish it.  It's most useful in mappings though.  See
 		|expression|.
 		See |c_CTRL-R_=| for inserting the result of an expression.
-		Useful functions are |getcmdline()| and |getcmdpos()|.
+		Useful functions are |getcmdtype()|, |getcmdline()| and
+		|getcmdpos()|.
 		The cursor position is unchanged, except when the cursor was
 		at the end of the line, then it stays at the end.
 		|setcmdpos()| can be used to set the cursor position.
@@ -203,7 +205,9 @@ CTRL-\ e {expr}						*c_CTRL-\_e*
 			   :call setcmdpos(strlen(cmd))
 			   :return cmd
 			:endfunc
-<
+<		This doesn't work recursively, thus not when already editing
+		an expression.
+
 							*c_CTRL-Y*
 CTRL-Y		When there is a modeless selection, copy the selection into
 		the clipboard. |modeless-selection|

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 Aug 14
+*develop.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -238,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/diff.txt

@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 26
+*diff.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -218,7 +218,7 @@ It is an error if there is no change for the cursor to move to.
 
 ==============================================================================
 4. Diff copying			*copy-diffs* *E99* *E100* *E101* *E102* *E103*
-
+								*merge*
 There are two commands to copy text from one buffer to another.  The result is
 that the buffers will be equal within the specified range.
 
@@ -235,6 +235,8 @@ that the buffers will be equal within the specified range.
 		Modify another buffer to undo difference with the current
 		buffer.  Just like ":diffget" but the other buffer is modified
 		instead of the current one.
+		When [bufspec] is omitted and there is more than one other
+		buffer in diff mode where 'modifiable' is set this fails.
 		See below for [range].
 
 							*do*

runtime/doc/digraph.txt

@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 06
+*digraph.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -166,7 +166,8 @@ EURO
 Exception: RFC1345 doesn't specify the euro sign.  In Vim the digraph =e was
 added for this.  Note the difference between latin1, where the digraph Cu is
 used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is
-used for the euro sign, while both of them are the character 164, 0xa4.
+used for the euro sign, while both of them are the character 164, 0xa4.  For
+compatibility with zsh Eu can also be used for the euro sign.
 
 							*digraph-table*
 char  digraph	hex	dec	official name ~

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Aug 11
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Oct 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1372,6 +1372,14 @@ v:progname	Contains the name (with path removed) with which Vim was
 v:register	The name of the register supplied to the last normal mode
 		command.  Empty if none were supplied. |getreg()| |setreg()|
 
+					*v:scrollstart* *scrollstart-variable*
+v:scrollstart	String describing the script or function that caused the
+		screen to scroll up.  It's only set when it is empty, thus the
+		first reason is remembered.  It is set to "Unknown" for a
+		typed command.
+		This can be used to find out why your script causes the
+		hit-enter prompt.
+
 					*v:servername* *servername-variable*
 v:servername	The resulting registered |x11-clientserver| name if any.
 		Read-only.
@@ -1520,6 +1528,7 @@ getcharmod( )			Number	modifiers for the last typed character
 getbufvar( {expr}, {varname})		variable {varname} in buffer {expr}
 getcmdline()			String	return the current command-line
 getcmdpos()			Number	return cursor position in command-line
+getcmdtype()			String	return the current command-line type
 getcwd()			String	the current working directory
 getfperm( {fname})		String	file permissions of file {fname}
 getfsize( {fname})		Number	size in bytes of file {fname}
@@ -1550,7 +1559,8 @@ iconv( {expr}, {from}, {to})	String	convert encoding of {expr}
 indent( {lnum})			Number	indent of line {lnum}
 index( {list}, {expr} [, {start} [, {ic}]])
 				Number	index in {list} where {expr} appears
-input( {prompt} [, {text}])	String	get input from the user
+input( {prompt} [, {text} [, {completion}]])
+				String	get input from the user
 inputdialog( {p} [, {t} [, {c}]]) String  like input() but in a GUI dialog
 inputrestore()			Number	restore typeahead
 inputsave()			Number	save and clear typeahead
@@ -1607,6 +1617,8 @@ 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} [, {thisblock}]])
+				Number  search for variable declaration
 searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]])
 				Number	search for other end of start/end pair
 server2client( {clientid}, {string})
@@ -1622,7 +1634,8 @@ 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} [, {capital}]])
+				List	spelling suggestions
 split( {expr} [, {pat} [, {keepempty}]])
 				List	make List from {pat} separated {expr}
 strftime( {format}[, {time}])	String	time in specified format
@@ -1643,7 +1656,8 @@ synIDattr( {synID}, {what} [, {mode}])
 				String	attribute {what} of syntax ID {synID}
 synIDtrans( {synID})		Number	translated syntax ID of {synID}
 system( {expr} [, {input}])	String	output of shell command/filter {expr}
-taglist({expr})			List	list of tags matching {expr}
+taglist( {expr})			List	list of tags matching {expr}
+tagfiles()			List    tags files used
 tempname()			String	name for a temporary file
 tolower( {expr})		String	the String {expr} switched to lowercase
 toupper( {expr})		String	the String {expr} switched to uppercase
@@ -1863,6 +1877,7 @@ cindent({lnum})						*cindent()*
 		relevant.  {lnum} is used just like in |getline()|.
 		When {lnum} is invalid or Vim was not compiled the |+cindent|
 		feature, -1 is returned.
+		See |C-indenting|.
 
 							*col()*
 col({expr})	The result is a Number, which is the byte index of the column
@@ -2013,11 +2028,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.
@@ -2529,14 +2545,28 @@ getcmdline()						*getcmdline()*
 		|c_CTRL-R_=|.
 		Example: >
 			:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
-<		Also see |getcmdpos()| and |setcmdpos()|.
+<		Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|.
 
 getcmdpos()						*getcmdpos()*
 		Return the position of the cursor in the command line as a
 		byte count.  The first column is 1.
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=|.  Returns 0 otherwise.
-		Also see |setcmdpos()| and |getcmdline()|.
+		Also see |getcmdtype()|, |setcmdpos()| and |getcmdline()|.
+
+getcmdtype()						*getcmdtype()*
+		Return the current command-line type. Possible return values
+		are:
+		    :	normal Ex command
+		    >	debug mode command |debug-mode|
+		    /	forward search command
+		    ?	backward search command
+		    @	|input()| command
+		    -	|:insert| or |:append| command
+		Only works when editing the command line, thus requires use of
+		|c_CTRL-\_e| or |c_CTRL-R_=|.  Returns an empty string
+		otherwise.
+		Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
 
 							*getcwd()*
 getcwd()	The result is a String, which is the name of the current
@@ -2641,6 +2671,9 @@ getqflist()						*getqflist()*
 			type	type of the error, 'E', '1', etc.
 			valid	non-zero: recognized error message
 
+		When there is no error list or it's empty an empty list is
+		returned.
+
 		Useful application: Find pattern matches in multiple files and
 		do something with them: >
 			:vimgrep /theword/jg *.c
@@ -2903,19 +2936,34 @@ index({list}, {expr} [, {start} [, {ic}]])			*index()*
 			:if index(numbers, 123) >= 0
 
 
-input({prompt} [, {text}])				*input()*
+input({prompt} [, {text} [, {completion}]])		*input()*
 		The result is a String, which is whatever the user typed on
 		the command-line.  The parameter is either a prompt string, or
 		a blank string (for no prompt).  A '\n' can be used in the
-		prompt to start a new line.  The highlighting set with
-		|:echohl| is used for the prompt.  The input is entered just
-		like a command-line, with the same editing commands and
-		mappings.  There is a separate history for lines typed for
-		input().
-		If the optional {text} is present, this is used for the
-		default reply, as if the user typed this.
-		NOTE: This must not be used in a startup file, for the
-		versions that only run in GUI mode (e.g., the Win32 GUI).
+		prompt to start a new line.
+		The highlighting set with |:echohl| is used for the prompt.
+		The input is entered just like a command-line, with the same
+		editing commands and mappings.  There is a separate history
+		for lines typed for input().
+		Example: >
+			:if input("Coffee or beer? ") == "beer"
+			:  echo "Cheers!"
+			:endif
+<
+		If the optional {text} is present and not empty, this is used
+		for the default reply, as if the user typed this.  Example: >
+			:let color = input("Color? ", "white")
+
+<		The optional {completion} argument specifies the type of
+		completion supported for the input.  Without it completion is
+		not performed.  The supported completion types are the same as
+		that can be supplied to a user-defined command using the
+		"-complete=" argument.  Refer to |:command-completion| for
+		more information.  Example: >
+			let fname = input("File: ", "", "file")
+<
+		NOTE: This function must not be used in a startup file, for
+		the versions that only run in GUI mode (e.g., the Win32 GUI).
 		Note: When input() is called from within a mapping it will
 		consume remaining characters from that mapping, because a
 		mapping is handled like the characters were typed.
@@ -2924,13 +2972,7 @@ input({prompt} [, {text}])				*input()*
 		that further characters follow in the mapping, e.g., by using
 		|:execute| or |:normal|.
 
-		Example: >
-			:if input("Coffee or beer? ") == "beer"
-			:  echo "Cheers!"
-			:endif
-<		Example with default text: >
-			:let color = input("Color? ", "white")
-<		Example with a mapping: >
+		Example with a mapping: >
 			:nmap \x :call GetFoo()<CR>:exe "/" . Foo<CR>
 			:function GetFoo()
 			:  call inputsave()
@@ -2950,6 +2992,22 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]])		*inputdialog()*
 		omitted an empty string is returned.
 		Hitting <Enter> works like pressing the OK button.  Hitting
 		<Esc> works like pressing the Cancel button.
+		NOTE: Command-line completion is not supported.
+
+inputlist({textlist})					*inputlist()*
+		{textlist} must be a list of strings.  This list is displayed,
+		one string per line.  The user will be prompted to enter a
+		number, which is returned.
+		The user can also select an item by clicking on it with the
+		mouse.  For the first string 0 is returned.  When clicking
+		above the first item a negative number is returned.  When
+		clicking on the prompt one more than the length of {textlist}
+		is returned.
+		Make sure {textlist} has less then 'lines' entries, otherwise
+		it won't work.  It's a good idea to put the entry number at
+		the start of the string.  Example: >
+			let color = inputlist(['Select color:', '1. red',
+				\ '2. green', '3. blue'])
 
 inputrestore()						*inputrestore()*
 		Restore typeahead that was saved with a previous inputsave().
@@ -2974,6 +3032,7 @@ inputsecret({prompt} [, {text}])			*inputsecret()*
 		|history| stack.
 		The result is a String, which is whatever the user actually
 		typed on the command-line in response to the issued prompt.
+		NOTE: Command-line completion is not supported.
 
 insert({list}, {item} [, {idx}])			*insert()*
 		Insert {item} at the start of List {list}.
@@ -3708,6 +3767,25 @@ search({pattern} [, {flags}])				*search()*
 		    :  let n = n + 1
 		    :endwhile
 <
+
+searchdecl({name} [, {global} [, {thisblock}]])			*searchdecl()*
+		Search for the declaration of {name}.
+		
+		With a non-zero {global} argument it works like |gD|, find
+		first match in the file.  Otherwise it works like |gd|, find
+		first match in the function.
+
+		With a non-zero {thisblock} argument matches in a {} block
+		that ends before the cursor position are ignored.  Avoids
+		finding variable declarations only valid in another scope.
+
+		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
@@ -3982,25 +4060,49 @@ soundfold({word})
 		the method can be quite slow.
 
 							*spellbadword()*
-spellbadword()	Return the badly spelled word under or after the cursor.
-		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.
+spellbadword([{sentence}])
+		Without argument: The result is the badly spelled word under
+		or after the cursor.  The cursor is moved to the start of the
+		bad word.  When no bad word is found in the cursor line the
+		result is an empty string and the cursor doesn't move.
+
+		With argument: The result is the first word in {sentence} that
+		is badly spelled.  If there are no spelling mistakes the
+		result is an empty string.
+
+		The return value is a list with two items:
+		- The badly spelled word or an empty string.
+		- The type of the spelling error:
+		  	"bad"		spelling mistake
+			"rare"		rare word
+			"local"		word only valid in another region
+			"caps"		word should start with Capital
+		Example: >
+			echo spellbadword("the quik brown fox")
+<			['quik', 'bad'] ~
+
+		The spelling information for the current window is used.  The
+		'spell' option must be set and the value of 'spelllang' is
+		used.
 
 							*spellsuggest()*
-spellsuggest({word} [, {max}])
+spellsuggest({word} [, {max} [, {capital}]])
 		Return a List with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
 		returned.  Otherwise up to 25 suggestions are returned.
 
+		When the {capital} argument is given and it's non-zero only
+		suggestions with a leading capital will be given.  Use this
+		after a match with 'spellcapcheck'.
+
 		{word} can be a badly spelled word followed by other text.
 		This allows for joining two words that were split.  The
 		suggestions also include the following text, thus you can
 		replace a line.
 
 		{word} may also be a good word.  Similar words will then be
-		returned.  {word} itself is also included, most likely as the
-		first entry, thus this can be used to check spelling.
+		returned.  {word} itself is not included in the suggestions,
+		although it may appear capitalized.
 
 		The spelling information for the current window is used.  The
 		'spell' option must be set and the values of 'spelllang' and
@@ -4080,12 +4182,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()|.
@@ -4281,6 +4383,10 @@ taglist({expr})							*taglist()*
 		located by Vim. Refer to |tags-file-format| for the format of
 		the tags file generated by the different ctags tools.
 
+							*tagfiles()*
+tagfiles()	Returns a List with the file names used to search for tags for
+		the current buffer.  This is the 'tags' option expanded.
+
 
 tempname()					*tempname()* *temp-file-name*
 		The result is a String, which is the name of a file that
@@ -4405,6 +4511,8 @@ winheight({nr})						*winheight()*
 winline()	The result is a Number, which is the screen line of the cursor
 		in the window.  This is counting screen lines from the top of
 		the window.  The first line is one.
+		If the cursor was moved the view on the file will be updated
+		first, this may cause a scroll.
 
 							*winnr()*
 winnr([{arg}])	The result is a Number, which is the number of the current
@@ -4667,7 +4775,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
@@ -4683,6 +4792,10 @@ 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
+
+: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
@@ -4922,7 +5035,7 @@ then define the function like this: >
 	   echo "Done!"
 	endfunction
 
-The file name and the name used before the colon in the function must match
+The file name and the name used before the # in the function must match
 exactly, and the defined function must have the name exactly as it will be
 called.
 
@@ -4933,9 +5046,6 @@ a path separator.  Thus when calling a function: >
 
 Vim will look for the file "autoload/foo/bar.vim" in 'runtimepath'.
 
-The name before the first colon must be at least two characters long,
-otherwise it looks like a scope, such as "s:".
-
 This also works when reading a variable that has not been set yet: >
 
 	:let l = foo#bar#lvar
@@ -5062,7 +5172,7 @@ This would call the function "my_func_whizz(parameter)".
 			always converted to the type of the option.
 			For an option local to a window or buffer the effect
 			is just like using the |:set| command: both the local
-			value and the global value is changed.
+			value and the global value are changed.
 			Example: >
 				:let &path = &path . ',/usr/local/include'
 

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 Sep 16
 
 
 		  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
@@ -178,7 +184,8 @@ A. If you want to overrule all default file type checks.
 <  3. To use the new filetype detection you must restart Vim.
 
    The files in the "ftdetect" directory are used after all the default
-   checks, thus they can overrule a previously detected file type.
+   checks, thus they can overrule a previously detected file type.  But you
+   can also use |:setfiletype| to keep a previously detected filetype.
 
 B. If you want to detect your file after the default file type checks.
 
@@ -380,7 +387,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 +408,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 +473,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 +483,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 +503,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 +530,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/fold.txt

@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 29
+*fold.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -512,7 +512,8 @@ FOLDCOLUMN						*fold-foldcolumn*
 
 'foldcolumn' is a number, which sets the width for a column on the side of the
 window to indicate folds.  When it is zero, there is no foldcolumn.  A normal
-value is 4 or 5.  The minimal useful value is 2.  The maximum is 12.
+value is 4 or 5.  The minimal useful value is 2, although 1 still provides
+some information.  The maximum is 12.
 
 An open fold is indicated with a column that has a '-' at the top and '|'
 characters below it.  This column stops where the open fold stops.  When folds

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 Aug 11
+*index.txt*     For Vim version 7.0aa.  Last change: 2005 Sep 13
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -150,7 +150,7 @@ 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-O|	CTRL-X CTRL-O	omni 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

runtime/doc/insert.txt

@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 17
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -569,7 +569,7 @@ Completion can be done for:
 8. definitions or macros				|i_CTRL-X_CTRL-D|
 9. Vim command-line					|i_CTRL-X_CTRL-V|
 10. User defined completion				|i_CTRL-X_CTRL-U|
-11. Occult completion					|i_CTRL-X_CTRL-O|
+11. omni completion					|i_CTRL-X_CTRL-O|
 12. Spelling suggestions				|i_CTRL-X_s|
 13. keywords in 'complete'				|i_CTRL-N|
 
@@ -674,6 +674,9 @@ at least two characters is matched.
 	just type:
 	    printf("(%g, %g, %g)", vector[0], ^P[1], ^P[2]);
 
+The search wraps around the end of the file, the value of 'wrapscan' is not
+used here.
+
 Multiple repeats of the same completion are skipped; thus a different match
 will be inserted at each CTRL-N and CTRL-P (unless there is only one
 matching keyword).
@@ -868,8 +871,8 @@ CTRL-X CTRL-V		Guess what kind of item is in front of the cursor and
 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
@@ -882,9 +885,13 @@ CTRL-X CTRL-U		Guess what kind of item is in front of the cursor and
 			previous one.
 
 
-Occult completion					*compl-occult*
+Omni completion						*compl-omni*
 
-Completion is done by a supernatural being.
+Completion is done by a function that can be defined by the user with the
+'omnifunc' option.  This is to be used for filetype-specific completion.
+
+See the 'completefunc' help for how the function is called and an example.
+For remarks about specific filetypes see |compl-omni-filetypes|.
 
 							*i_CTRL-X_CTRL-O*
 CTRL-X CTRL-O		Guess what kind of item is in front of the cursor and
@@ -944,6 +951,93 @@ CTRL-P			Find previous match for words that start with the
 			copy the words following the previous expansion in
 			other contexts unless a double CTRL-X is used.
 
+
+INSERT COMPLETION POPUP MENU				*ins-completion-menu*
+
+Vim can display the matches in a simplistic popup menu.
+
+The menu is used when:
+- The 'completeopt' option contains "menu".
+- The terminal supports at least 8 colors.
+- There are at least two matches.
+
+While the menu is displayed these keys have a special meaning:
+<CR> and <Enter>: Accept the currently selected match
+<Up>:             Select the previous match, as if CTRL-P was used
+<Down>:           Select the next match, as if CTRL-N was used
+
+The colors of the menu can be changed with these highlight groups:
+Pmenu		normal item  |hl-Pmenu|
+PmenuSel	selected item  |hl-PmenuSel|
+PmenuSbar	scrollbar  |hl-PmenuSbar|
+PmenuThumb	thumb of the scrollbar  |hl-PmenuThumb|
+
+
+Filetype-specific remarks for omni completion	    *compl-omni-filetypes*
+
+C							*ft-c-omni*
+
+Completion of C code requires a tags file.  You should use Exuberant ctags,
+because it adds extra information that is needed for completion.  You can find
+it here: http://ctags.sourceforge.net/
+For version 5.5.4 you should add a patch that adds the "typename:" field:
+ftp://ftp.vim.org/pub/vim/unstable/patches/ctags-5.5.4.patch
+
+If you want to complete system functions you can do something like this.  Use
+ctags to generate a tags file for all the system header files: >
+	% ctags -R -f ~/.vim/systags /usr/include /usr/local/include
+In your vimrc file add this tags file to the 'tags' option: >
+	set tags+=~/.vim/systags
+
+When using CTRL-X CTRL-O after a name without any "." or "->" it is completed
+from the tags file directly.  This works for any identifier, also function
+names.  If you want to complete a local variable name, which does not appear
+in the tags file, use CTRL-P instead.
+
+When using CTRL-X CTRL-O after something that has "." or "->" Vim will attempt
+to recognize the type of the variable and figure out what members it has.
+This means only members valid for the variable will be listed.
+
+When a member name already was complete, CTRL-X CTRL-O will add a "." or
+"->" for composite types.
+
+Vim doesn't include a C compiler, only the most obviously formatted
+declarations are recognized.  Preprocessor stuff may cause confusion.
+When the same structure name appears in multiple places all possible members
+are included.
+
+
+(X)HTML                          			*ft-html-omni*
+
+CTRL-X CTRL-O provides completion of various elements of (X)HTML files.
+It is designed to support writing of XHTML 1.0 Strict files but will
+also works for other versions of HTML. Features:
+
+- after "<" complete tag name depending on context (no div suggest
+  inside of an a tag)
+- inside of tag complete proper attributes (no width attribute for an
+  a tag)
+- when attribute has limited number of possible values help to complete
+  them
+- complete values of "class" and "id" attributes with data obtained from
+  style tag and included CSS files
+- when completing "style" attribute or working inside of "style" tag
+  switch to |ft-css-omni| completion
+- when used after "</" CTRL-X CTRL-O will close the last opened tag
+
+File htmlcomplete.vim provides through |autoload| mechanism
+GetLastOpenTag function which can be used in XML files to get name of
+last open tag with (b:unaryTagsStack has to be defined): >
+
+        :echo htmlcomplete#GetLastOpenTag("b:unaryTagsStack")
+
+
+CSS                                                     *ft-css-omni*
+
+Complete properties and their appropriate values according to CSS 2.1
+specification. 
+
+
 ==============================================================================
 8. Insert mode commands					*inserting*
 

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 Aug 16
+*map.txt*       For Vim version 7.0aa.  Last change: 2005 Sep 22
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -306,11 +306,12 @@ If you type a space, then "foo" will get inserted, plus the space.  If you
 type "a", then "bar" will get inserted.
 {Vi does not allow ambiguous mappings}
 
-							*map_CTRL_C*
-It's not possible to use a CTRL-C in the {lhs}.  You just can't map CTRL-C.
-The reason is that CTRL-C must always be available to break a running command.
-Exception: When using the GUI version on MS-Windows CTRL-C can be mapped to
-allow a Copy command to the clipboard.  Use CTRL-Break to interrupt Vim.
+							*map_CTRL-C*
+Using CTRL-C in the {lhs} is possible, but it will only work when Vim is
+waiting for a key, not when Vim is busy with something.  When Vim is busy
+CTRL-C interrupts/breaks the command.
+When using the GUI version on MS-Windows CTRL-C can be mapped to allow a Copy
+command to the clipboard.  Use CTRL-Break to interrupt Vim.
 
 							*map_space_in_lhs*
 To include a space in {lhs} precede it with a CTRL-V (type two CTRL-Vs for
@@ -666,6 +667,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

runtime/doc/message.txt

@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2005 Aug 01
+*message.txt*   For Vim version 7.0aa.  Last change: 2005 Oct 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -23,7 +23,7 @@ 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
+This is especially useful if you accidentally typed <Space> at the hit-enter
 prompt.
 Note: when you stopped the output with "q" at the more prompt only up to that
 point will be displayed.
@@ -589,6 +589,7 @@ The file is read-only and you are making a change to it anyway.  You can use
 the |FileChangedRO| autocommand event to avoid this message (the autocommand
 must reset the 'readonly' option).  See 'modifiable' to completely disallow
 making changes to a file.
+This message is only given for the first change after 'readonly' has been set.
 
 							*W13*  >
   Warning: File "{filename}" has been created after editing started
@@ -768,6 +769,9 @@ To reduce the number of hit-enter prompts:
 - Add flags to 'shortmess'.
 - Reset 'showcmd' and/or 'ruler'.
 
+If your script causes the hit-enter prompt and you don't know why, you may
+find the |v:scrollstart| variable useful.
+
 Also see 'mouse'.  The hit-enter message is highlighted with the |hl-Question|
 group.
 
@@ -813,4 +817,8 @@ Any other key causes the meaning of the keys to be displayed.
 Note: The typed key is directly obtained from the terminal, it is not mapped
 and typeahead is ignored.
 
+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-enter
+prompt.
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/motion.txt

@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Jul 31
+*motion.txt*    For Vim version 7.0aa.  Last change: 2005 Sep 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -642,6 +642,8 @@ i'							*v_i'* *i'*
 i`							*v_i`* *i`*
 			Like a", a' and a`, but exclude the quotes and
 			repeating won't extend the Visual selection.
+			Special case: With a count of 2 the quotes are
+			included, but no extra white space as with a"/a'/a`.
 
 When used after an operator:
 For non-block objects:

runtime/doc/options.txt

@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 21
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -19,7 +19,7 @@ achieve special effects.  These options come in three forms:
 	string		has a string value
 
 ==============================================================================
-1. Setting options					*set-option*
+1. Setting options					*set-option* *E764*
 
 							*:se* *:set*
 :se[t]			Show all options that differ from their default value.
@@ -560,12 +560,20 @@ is entered, this is almost like having global options.  If 's' and 'S' are not
 present, the options are copied from the currently active buffer when the
 buffer is created.
 
-Not all options are supported in all versions.  To test if option "foo" can be
-used with ":set" use "exists('&foo')".  This doesn't mean the value is
-actually remembered and works.  Some options are hidden, which means that you
-can set them but the value is not remembered.  To test if option "foo" is
-really supported use "exists('+foo')".
+Hidden options						*hidden-options*
 
+Not all options are supported in all versions.  This depends on the supported
+features and sometimes on the system.  A remark about this is in curly braces
+below.  When an option is not supported it may still be set without getting an
+error, this is called a hidden option.  You can't get the value of a hidden
+option though, it is not stored.
+
+To test if option "foo" can be used with ":set" use something like this: >
+	if exists('&foo')
+This also returns true for a hidden option.  To test if option "foo" is really
+supported use something like this: >
+	if exists('+foo')
+<
 							*E355*
 A jump table for the options with a short description can be found at |Q_op|.
 
@@ -1100,7 +1108,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 +1209,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.
@@ -1589,23 +1599,29 @@ A jump table for the options with a short description can be found at |Q_op|.
 	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 three arguments:
-	   a:findstart  either 1 or 0
-	   a:col        column in the cursor line where the completion ends,
-			first column is zero
-	   a:base	the text with which matches should match
+	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.
 
-	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 the
-	cursor line before column a:col and include those characters that
-	could be part of the completed item.  The text between this column and
-	a:col will be replaced with the matches.  Return -1 if no completion
-	can be done.
+	On the first invocation the arguments are:
+	   a:findstart  1
+	   a:base	empty
 
-	When the a:findstart argument is 0 the function must return a List
-	with the matching words.  These matches should include the "a:base"
-	text.  When there are no matches return an empty List.
+	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 (can be empty)
+
+	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
@@ -1613,16 +1629,16 @@ A jump table for the options with a short description can be found at |Q_op|.
 	allow the user to press a key while still searching for matches.  Stop
 	searching when it returns non-zero.
 
-	The function must not move the cursor!
+	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(findstart, col, base)
+		fun! CompleteMonths(findstart, base)
 		  if a:findstart
 		    " locate the start of the word
 		    let line = getline('.')
-		    let start = a:col
+		    let start = col('.') - 1
 		    while start > 0 && line[start - 1] =~ '\a'
 		      let start -= 1
 		    endwhile
@@ -1641,11 +1657,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 		set completefunc=CompleteMonths
 <
 	The same, but now pretending searching for matches is slow: >
-		fun! CompleteMonths(findstart, col, base)
+		fun! CompleteMonths(findstart, base)
 		  if a:findstart
 		    " locate the start of the word
 		    let line = getline('.')
-		    let start = a:col
+		    let start = col('.') - 1
 		    while start > 0 && line[start - 1] =~ '\a'
 		      let start -= 1
 		    endwhile
@@ -1667,6 +1683,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 		set completefunc=CompleteMonths
 <
 
+						*'completeopt'* *'cot'*
+'completeopt' 'cot'	string	(default: "menu")
+			global
+			{not in Vi}
+	Options for Insert mode completion |ins-completion|.
+	Currently the only supported value is:
+
+	   menu	    Use a popup menu to show the possible completions.  The
+		    menu is only shown when there is more than one match and
+		    sufficient colors are available.  |ins-completion-menu|
+
+
 				*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
 'confirm' 'cf'		boolean (default off)
 			global
@@ -3366,7 +3394,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 				     f:Folded,F:FoldColumn,A:DiffAdd,
 				     C:DiffChange,D:DiffDelete,T:DiffText,
 				     >:SignColumn,B:SpellBad,P:SpellCap,
-				     R:SpellRare,L:SpellLocal")
+				     R:SpellRare,L:SpellLocal,
+				     +:Pmenu,=:PmenuSel,
+				     x:PmenuSbar,X:PmenuThumb")
 			global
 			{not in Vi}
 	This option can be used to set highlighting mode for various
@@ -3407,6 +3437,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-SpellCap|	 P  word that should start with capital|spell|
 	|hl-SpellRare|	 R  rare word |spell|
 	|hl-SpellLocal|	 L  word from other region |spell|
+	|hl-Pmenu|       +  popup menu normal line
+	|hl-PmenuSel|    =  popup menu normal line
+	|hl-PmenuSbar|   x  popup menu scrollbar
+	|hl-PmenuThumb|  X  popup menu scrollbar thumb
 
 	The display modes are:
 		r	reverse		(termcap entry "mr" and "me")
@@ -3631,9 +3665,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Pattern to be used to find an include command.  It is a search
 	pattern, just like for the "/" command (See |pattern|).  The default
 	value is for C programs.  This option is used for the commands "[i",
-	"]I", "[d", etc.  The 'isfname' option is used to recognize the file
-	name that comes after the matched pattern.  See |option-backslash|
-	about including spaces and backslashes.
+	"]I", "[d", etc.
+	Normally the 'isfname' option is used to recognize the file name that
+	comes after the matched pattern.  But if "\zs" appears in the pattern
+	then the text matched from "\zs" to the end, or until "\ze" if it
+	appears, is used as the file name.  Use this to include characters
+	that are not in 'isfname', such as a space.  You can then use
+	'includeexpr' to process the matched text.
+	See |option-backslash| about including spaces and backslashes.
 
 						*'includeexpr'* *'inex'*
 'includeexpr' 'inex'	string	(default "")
@@ -3681,7 +3720,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'smartindent' indenting.
 	When 'paste' is set this option is not used for indenting.
 	The expression is evaluated with |v:lnum| set to the line number for
-	which the indent is to be computed.  The cursor is also as this line
+	which the indent is to be computed.  The cursor is also in this line
 	when the expression is evaluated (but it may be moved around).
 	The expression must return the number of spaces worth of indent.  It
 	can return "-1" to keep the current indent (this means 'autoindent' is
@@ -4586,6 +4625,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.
 
+						*'omnifunc'* *'ofu'*
+'omnifunc' '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: "")
@@ -5132,6 +5183,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Minimal number of lines to scroll when the cursor gets off the
 	screen (e.g., with "j").  Not used for scroll commands (e.g., CTRL-E,
 	CTRL-D).  Useful if your terminal scrolls very slowly.
+	When set to a negative number from -1 to -100 this is used as the
+	percentage of the window height.  Thus -50 scrolls half the window
+	height.
 	NOTE: This option is set to 1 when 'compatible' is set.
 
 						*'scrolloff'* *'so'*
@@ -5629,13 +5683,13 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{not in Vi}
 	The minimal number of screen columns to keep to the left and to the
-	right of the cursor if 'nowrap' is set.  Setting this option to a value
-	greater than 0 while having |'sidescroll'| also at a non-zero value
-	makes some context visible in the line you are scrolling in
-	horizontally (except at the end and beginning of the line).  Setting
-	this option to a large value (like 999) has the effect of keeping the
-	cursor horizontally centered in the window, as long as one does not
-	come too close to the beginning or end of the line.
+	right of the cursor if 'nowrap' is set.  Setting this option to a
+	value greater than 0 while having |'sidescroll'| also at a non-zero
+	value makes some context visible in the line you are scrolling in
+	horizontally (except at beginning of the line).  Setting this option
+	to a large value (like 999) has the effect of keeping the cursor
+	horizontally centered in the window, as long as one does not come too
+	close to the beginning of the line.
 	NOTE: This option is set to 0 when 'compatible' is set.
 
 	Example: Try this together with 'sidescroll' and 'listchars' as
@@ -6255,6 +6309,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"*", "**" and other wildcards can be used to search for tags files in
 	a directory tree.  See |file-searching|.  {not available when compiled
 	without the |+path_extra| feature}
+	The |tagfiles()| function can be used to get a list of the file names
+	actually used.
 	If Vim was compiled with the |+emacs_tags| feature, Emacs-style tag
 	files are also supported.  They are automatically recognized.  The
 	default value becomes "./tags,./TAGS,tags,TAGS", unless case
@@ -7281,7 +7337,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 Aug 18
+*pattern.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -117,6 +117,14 @@ gD			Goto global Declaration.  When the cursor is on a
 			like "gd", except that the search for the keyword
 			always starts in line 1.  {not in Vi}
 
+							*1gd*
+1gd			Like "gd", but ignore matches inside a {} block that
+			ends before the cursor position. {not in Vi}
+
+							*1gD*
+1gD			Like "gD", but ignore matches inside a {} block that
+			ends before the cursor position. {not in Vi}
+
 							*CTRL-C*
 CTRL-C			Interrupt current (search) command.  Use CTRL-Break on
 			MS-DOS |dos-CTRL-Break|.

runtime/doc/pi_netrw.txt

@@ -1,8 +1,8 @@
-*pi_netrw.txt*  For Vim version 7.0.  Last change: Aug 15, 2005
-
+*pi_netrw.txt*  For Vim version 7.0.  Last change: Oct 03, 2005
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
 
+
 *dav*           *http*          *network*       *rcp*           *scp*
 *fetch*         *netrw*         *Nread*         *rsync*         *sftp*
 *ftp*           *netrw.vim*     *Nwrite*        *netrw-file*
@@ -25,7 +25,7 @@
 4.  Transparent File Transfer............................|netrw-transparent|
 5.  Ex Commands..........................................|netrw-ex|
 6.  Variables and Options................................|netrw-var|
-7.  Directory Browser....................................|netrw-browse| {{{1
+7.  Directory Browsing...................................|netrw-browse| {{{1
       Maps...............................................|netrw-maps|
       Exploring..........................................|netrw-explore-cmds|
       Quick Reference Commands Table.....................|netrw-browse-cmds|
@@ -35,11 +35,12 @@
       Refreshing The Listing.............................|netrw-ctrl-l|
       Going Up...........................................|netrw--|
       Browsing...........................................|netrw-cr|
-      Long Vs Short Listing..............................|netrw-i|
+      Obtaining A File...................................|netrw-O|
+      Thin, Long, and Wide Listings......................|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|
+      Hiding Files Or Directories........................|netrw-a|
       Edit File Or Directory Hiding List.................|netrw-h|
       Browsing With A Horizontally Split Window..........|netrw-o|
       Preview Window.....................................|netrw-p|
@@ -51,10 +52,10 @@
       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|
+      Bookmarking A Directory............................|netrw-b| |netrw-Nb|
+      Changing To A Bookmarked Directory.................|netrw-B| |netrw-NB|
       Listing Bookmarks And History......................|netrw-q|
-      Improving Directory Browsing.......................|netrw-list-hack| }}}1
+      Improving Directory Browsing.......................|netrw-listhack| }}}1
 8.  Problems and Fixes...................................|netrw-problems|
 9.  Debugging............................................|netrw-debug|
 10. History..............................................|netrw-history|
@@ -193,8 +194,8 @@ file using root-relative paths, use the full path:
 2. Network-Oriented File Transfer				*netrw-xfer*
 
 Network-oriented file transfer under Vim is implemented by a VimL-based script
-(<netrw.vim>) using plugin techniques.  It currently supports both reading
-and writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
+(<netrw.vim>) using plugin techniques.  It currently supports both reading and
+writing across networks using rcp, scp, ftp or ftp+<.netrc>, scp, fetch,
 dav/cadaver, rsync, or sftp.
 
 http is currently supported read-only via use of wget or fetch.
@@ -205,24 +206,23 @@ FileReadCmd, BufWriteCmd) to intercept reads/writes with url-like filenames. >
 
 	ex. vim ftp://hostname/path/to/file
 <
-The characters preceding the colon specify the protocol to use;
-in the example, its ftp.  The <netrw.vim> script then formulates
-a command or a series of commands (typically ftp) which it issues
-to an external program (ftp, scp, etc) which does the actual file
-transfer/protocol.  Files are read from/written to a temporary file
-(under Unix/Linux, /tmp/...) which the <netrw.vim> script will
-clean up.
+The characters preceding the colon specify the protocol to use; in the
+example, its ftp.  The <netrw.vim> script then formulates a command or a
+series of commands (typically ftp) which it issues to an external program
+(ftp, scp, etc) which does the actual file transfer/protocol.  Files are read
+from/written to a temporary file (under Unix/Linux, /tmp/...) which the
+<netrw.vim> script will clean up.
 
-One may modify any protocol's implementing external application
-by setting a variable (ex. scp uses the variable g:netrw_scp_cmd,
-which is defaulted to "scp -q").
+One may modify any protocol's implementing external application 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 (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
-(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.
+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 (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.
 
@@ -331,8 +331,9 @@ The script attempts to get passwords for ftp invisibly using |inputsecret()|,
 a built-in Vim function.  See |netrw-uidpass| for how to change the password
 after one has set it.
 
-Unfortunately there doesn't appear to be a way for netrw to feed a password
-to scp.  Thus every transfer via scp will require re-entry of the password.
+Unfortunately there doesn't appear to be a way for netrw to feed a password to
+scp.  Thus every transfer via scp will require re-entry of the password.
+However, |netrw-listhack| can help with this problem.
 
 
 ==============================================================================
@@ -340,21 +341,28 @@ to scp.  Thus every transfer via scp will require re-entry of the password.
 
 Network-oriented file transfers are available by default whenever
 |'nocompatible'| mode is enabled.  The <netrw.vim> file resides in your
-system's vim-plugin directory and is sourced automatically whenever you
-bring up vim.
-
+system's vim-plugin directory and is sourced automatically whenever you bring
+up vim.  I suggest that, at a minimum, you have at least the following in your
+<.vimrc> customization file: >
+	set nocp
+	if version >= 600
+	  filetype plugin indent on
+	endif
+<
 
 ==============================================================================
 4. Transparent File Transfer				*netrw-transparent*
 
 Transparent file transfers occur whenever a regular file read or write
 (invoked via an |:autocmd| for |BufReadCmd| or |BufWriteCmd| events) is made.
-Thus one may use files across networks as if they were local. >
+Thus one may use files across networks just as simply as if they were local. >
 
 	vim ftp://[user@]machine/path
 	...
 	:wq
 
+See |netrw-activate| for more on how to encourage your vim to use plugins
+such as netrw.
 
 ==============================================================================
 5. Ex Commands						*netrw-ex*
@@ -368,15 +376,14 @@ additional commands available.
 :[range]Nw {netfile} [{netfile}]...
 		Write the specified lines to the {netfile}.
 
-:Nread
-		Read the specified lines into the current
+:Nread		Read the specified lines into the current
 		buffer from the file specified in
 		b:netrw_lastfile.
 
 :Nread {netfile} {netfile}...
 		Read the {netfile} after the current line.
 
-									*netrw-uidpass*
+								*netrw-uidpass*
 :call NetUserPass()
 		If b:netrw_uid and b:netrw_passwd don't exist,
 		this function query the user for them.
@@ -400,10 +407,11 @@ additional commands available.
 
 The script <netrw.vim> uses several variables which can affect <netrw.vim>'s
 behavior.  These variables typically may be set in the user's <.vimrc> file:
->
-                                -------------
-                           	Netrw Options
-                                -------------
+(also see |netrw-settings|) >
+
+                        -------------
+                        Netrw Options
+                        -------------
 	Option			Meaning
 	--------------		-----------------------------------------------
 <
@@ -426,7 +434,7 @@ behavior.  These variables typically may be set in the user's <.vimrc> file:
 	g:netrw_silent          =0 transfers done normally
 	                        =1 transfers done silently
         g:netrw_uid             Holds current user-id for ftp.
-                                =1 use alternate ftp          (user uid password)
+                                =1 use alternate ftp         (user uid password)
                                 (see |netrw-options|)
         g:netrw_use_nt_rcp      =0 don't use WinNT/2K/XP's rcp (default)
                                 =1 use WinNT/2K/XP's rcp, binary mode
@@ -480,12 +488,12 @@ variables listed below, and may be modified by the user.
     -------------------------------------------------------------------------
 <
 								*netrw-ftp*
-The first two options both help with certain ftp's that give trouble otherwise.
-In order to best understand how to use these options if ftp is giving you
-troubles, a bit of discussion follows on how netrw does ftp reads.
+The first two options both help with certain ftp's that give trouble
+otherwise.  In order to best understand how to use these options if ftp is
+giving you troubles, a bit of discussion follows on how netrw does ftp reads.
 
-The g:netrw_..._cmd variables specify the external program to use handle
-the associated protocol (rcp, ftp, etc), plus any options.
+The g:netrw_..._cmd variables specify the external program to use handle the
+associated protocol (rcp, ftp, etc), plus any options.
 
 The g:netrw_list_cmd's HOSTNAME entry will be changed via substitution with
 whatever the current request is for a hostname.
@@ -518,8 +526,8 @@ userid and password.  The transferred file is put into a temporary file.
 The temporary file is then read into the main editing session window that
 requested it and the temporary file deleted.
 
-If your ftp doesn't accept the "user" command and immediately just demands
-a userid, then try putting "let netrw_ftp=1" in your <.vimrc>.
+If your ftp doesn't accept the "user" command and immediately just demands a
+userid, then try putting "let netrw_ftp=1" in your <.vimrc>.
 
 								*netrw-cadaver*
 To handle the SSL certificate dialog for untrusted servers, one may pull
@@ -546,12 +554,12 @@ messages) you may write a NetReadFixup(tmpfile) function:
       endif
     endfunction
 >
-The NetReadFixup() function will be called if it exists and thus allows
-you to customize your reading process.  As a further example, <netrw.vim>
-contains just such a function to handle Windows 95 ftp.  For whatever
-reason, Windows 95's ftp dumps four blank lines at the end of a transfer,
-and so it is desirable to automate their removal.  Here's some code taken
-from <netrw.vim> itself:
+The NetReadFixup() function will be called if it exists and thus allows you to
+customize your reading process.  As a further example, <netrw.vim> contains
+just such a function to handle Windows 95 ftp.  For whatever reason, Windows
+95's ftp dumps four blank lines at the end of a transfer, and so it is
+desirable to automate their removal.  Here's some code taken from <netrw.vim>
+itself:
 >
     if has("win95") && g:netrw_win95ftp
      fun! NetReadFixup(method, line1, line2)
@@ -564,7 +572,7 @@ from <netrw.vim> itself:
 >
 
 ==============================================================================
-7. Directory Browser	*netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
+7. Directory Browsing	*netrw-browse* *netrw-dir* *netrw-list* *netrw-help*
 
 MAPS   								*netrw-maps*
      ?................Help.......................................|netrw-help|
@@ -655,12 +663,13 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 				 : 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_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_hide*			if true, the hiding list is used
+				 default: =0
 
   *g:netrw_keepdir*		=1 (default) keep current directory immune from
 				   the browsing directory.
@@ -675,16 +684,11 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 
   *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"
+				 default: "mkdir"
 
   *g:netrw_local_rmdir*		remove directory command (rmdir)
 				 default: "rmdir"
@@ -708,9 +712,6 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
   *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"
 
@@ -722,6 +723,18 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 				 default: '[\/]$,*,\.bak$,\.o$,\.h$,
 				           \.info$,\.swp$,\.obj$'
 
+  *g:netrw_ssh_cmd*		One may specify an executable command
+  				to use instead of ssh for remote actions
+				such as listing, file removal, etc.
+				 default: ssh
+
+  *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_timefmt*		specify format string to strftime() (%c)
 				 default: "%c"
 
@@ -731,7 +744,7 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 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
+hosts, including listing files and directories, entering directories, editing
 files therein, deleting files/directories, making new directories, and moving
 (renaming) files and directories.  The Netrw browser generally implements the
 previous explorer maps and commands for remote directories, although details
@@ -742,13 +755,15 @@ ftp.  The protocol in the url, if it is ftp, will cause netrw to use ftp
 in its remote browsing.  Any other protocol will be used for file transfers,
 but otherwise the ssh protocol will be used to do remote directory browsing.
 
-To enter the netrw directory browser, simply attempt to read a "file" with a
+To use Netrw's remote directory browser, simply attempt to read a "file" with a
 trailing slash and it will be interpreted as a request to list a directory:
 
 	vim [protocol]://[user@]hostname/path/
 
-If you'd like to avoid entering the password in for directory listings, scp,
-ssh interaction, etc, see |netrw-list-hack|.
+For local directories, the trailing slash is not required.
+
+If you'd like to avoid entering the password in for remote directory listings
+with ssh or scp, see |netrw-listhack|.
 
 				*netrw-explore*  *netrw-pexplore*
 				*netrw-hexplore* *netrw-sexplore*
@@ -782,7 +797,8 @@ 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
+When Explore, Sexplore, Hexplore, or Vexplore are used with a **,
+such as:
 >
 	:Explore **/filename_pattern
 <
@@ -796,7 +812,8 @@ 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:
+find using shift-downarrow and shift-uparrow convenient.  They're mapped by
+netrw:
 
 	<s-down>  == Nexplore, and
 	<s-up>    == Pexplore.
@@ -821,11 +838,12 @@ refresh a local directory by using ":e .".
 
 GOING UP						*netrw--*
 
-To go up a directory, press - or his the <cr> when atop the ../ directory
+To go up a directory, press "-" or press the <cr> when atop the ../ directory
 entry in the listing.
 
-Netrw will modify the command in |g:netrw_list_cmd| to perform the directory
-listing operation.  By default the command is:
+Netrw will use the command in |g:netrw_list_cmd| to perform the directory
+listing operation after changing HOSTNAME to the host specified by the
+user-provided url.  By default netrw provides the command as:
 
 	ssh HOSTNAME ls -FLa
 
@@ -840,23 +858,65 @@ BROWSING 							*netrw-cr*
 Browsing is simple: move the cursor onto a file or directory of interest.
 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.
+protocol given in the original read request.  
+
+  CAVEAT: There are three forms of listing (see |netrw-i|).  Netrw assumes
+  that two or more spaces delimit filenames and directory names for the long
+  and wide listing formats.  Thus, if your filename or directory name has two
+  or more spaces embedded in it, or any trailing spaces, then you'll need to
+  use the "thin" format to select it.
 
 
-LONG VS SHORT LISTING						*netrw-i*
+OBTAINING A FILE						*netrw-O*
+
+When browsing a remote directory, one may obtain a file under the cursor (ie.
+get a copy on your local machine, but not edit it) by pressing the O key.
+Only ftp and scp are supported for this operation (but since these two are
+available for browsing, that shouldn't be a problem).  The status bar
+will then show, on its right hand side, a message like "Obtaining filename".
+The statusline will be restored after the transfer is complete.
+
+Netrw can also "obtain" a file using the local browser.  Netrw's display
+of a directory is not necessarily the same as Vim's "current directory",
+unless |g:netrw_keepdir| is set to 0 in the user's <.vimrc>.  One may select
+a file using the local browser (by putting the cursor on it) and pressing
+"O" will then "obtain" the file; ie. copy it to Vim's current directory.
+
+Related topics:
+ * To see what the current directory is, use |:pwd|
+ * To make the currently browsed directory the current directory, see |netrw-c|
+ * To automatically make the currently browsed directory the current
+   directory, see |g:netrw_keepdir|.
+
+
+THIN, LONG, AND WIDE LISTINGS					*netrw-i*
+
+The "i" map cycles between the thin, long, and wide listing formats.
 
 The short listing format gives just the files' and directories' names.
+
 The long listing is either based on the "ls" command via ssh for remote
-directories or displays the filename, file size (in bytes), and the
-time and date of last modification for local directories.
+directories or displays the filename, file size (in bytes), and the time and
+date of last modification for local directories.  With the long listing
+format, netrw is not able to recognize filenames which have trailing spaces.
+Use the thin listing format for such files.
+
+The wide listing format has a multi-column display of the various files in the
+netrw current directory, rather like the Unix "ls" presents.  In this mode the
+"b" and "B" maps are not available; instead, use Nb (|netrw-Nb|) and NB
+(|netrw-NB|).  The wide listing format uses two or more contiguous spaces to
+delineate filenames; when using that format, netrw won't be able to recognize
+or use filenames which have two or more contiguous spaces embedded in the name
+or any trailing spaces.  The thin listing format will, however, work with such
+files.
 
 
 MAKING A NEW DIRECTORY						*netrw-d*
 
-With the "d" map one may make a new directory either remotely (which
-depends on the global variable g:netrw_mkdir_cmd) or locally (which depends on
-the global variable g:netrw_local_mkdir).  Netrw will issue a request for the
-new directory's name.  A bare <CR> at that point will abort the making of the
+With the "d" map one may make a new directory either remotely (which depends
+on the global variable g:netrw_mkdir_cmd) or locally (which depends on the
+global variable g:netrw_local_mkdir).  Netrw will issue a request for the 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.
 
@@ -864,12 +924,12 @@ 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
-file/directory to be deleted and pressing "D".  Directories must be empty first
-before they can be successfully removed.  If the directory is a softlink to a
-directory, then netrw will make two requests to remove the directory before
-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".
+file/directory to be deleted and pressing "D".  Directories must be empty
+first before they can be successfully removed.  If the directory is a softlink
+to a directory, then netrw will make two requests to remove the directory
+before 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".
 
 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
@@ -904,19 +964,19 @@ One may rename a block of files and directories by selecting them with
 the V (|linewise-visual|).
 
 
-HIDING FILES OR DIRECTORIES				*g:netrw-a*
+HIDING FILES OR DIRECTORIES				*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 "a" map allows the user to cycle about these three ways.
+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 "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.
+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* *netrw-edithide*
@@ -924,7 +984,8 @@ 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
 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|).
+either be hidden (ie. not shown) or be the only ones displayed (see
+|netrw-a|).
 
 
 BROWSING WITH A HORIZONTALLY SPLIT WINDOW		*netrw-o* *netrw-horiz*
@@ -933,9 +994,9 @@ 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
 horizontal split is used.  (for vertical splitting, see |netrw-v|)
 
-Normally, the o key splits the window horizontally with the new window
-and cursor at the top.  To change to splitting the window horizontally
-with the new window and cursor at the bottom, have
+Normally, the o key splits the window horizontally with the new window and
+cursor at the top.  To change to splitting the window horizontally with the
+new window and cursor at the bottom, have
 
 	let g:netrw_alto = 1
 
@@ -944,30 +1005,30 @@ in your <.vimrc>.
 
 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.
+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* *netrw-sort*
 
-One may select the sorting style by name, time, or (file) size.  The
-"s" map allows one to circulate amongst the three choices; the directory
-listing will automatically be refreshed to reflect the selected style.
+One may select the sorting style by name, time, or (file) size.  The "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* *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:
+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$
 <
-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
-the g:netrw_sort_sequence variable (either manually or in your <.vimrc>)
-or by using the "S" map.
+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 the
+g:netrw_sort_sequence variable (either manually or in your <.vimrc>) or by
+using the "S" map.
 
 
 REVERSING SORTING ORDER			*netrw-r* *netrw-reverse*
@@ -994,20 +1055,20 @@ q map to list both the bookmarks and history. (see |netrw-q|)
 
 BROWSING WITH A VERTICALLY SPLIT WINDOW				*netrw-v*
 
-Normally one enters a file or directory using the <cr>.  However, the "v"
-map allows one to open a new window to hold the new directory listing or
-file.  A vertical split is used.  (for horizontal splitting, see |netrw-o|)
+Normally one enters a file or directory using the <cr>.  However, the "v" map
+allows one to open a new window to hold the new directory listing or file.  A
+vertical split is used.  (for horizontal splitting, see |netrw-o|)
 
-Normally, the v key splits the window vertically with the new window
-and cursor at the left.  To change to splitting the window vertically
-with the new window and cursor at the right, have
+Normally, the v key splits the window vertically with the new window and
+cursor at the left.  To change to splitting the window vertically with the new
+window and cursor at the right, have
 
 	let g:netrw_altv = 1
 
 in your <.vimrc>.
 
 
-CUSTOMIZING BROWSING WITH A USER FUNCTION		*netrw-x* *netrw-handler*
+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.  The special
@@ -1016,24 +1077,24 @@ handler varies:
   * 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.
+  * 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.
+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
+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 ->
-                  NetrwFileHandler_html("scp://user@host/some/path/mypgm.html")
+                  netrwFileHandler_html("scp://user@host/some/path/mypgm.html")
 <
-See the <plugin/NetrwFileHandlers.vim> for an example of how to handle an html
+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
+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.
 
@@ -1046,12 +1107,12 @@ g:netrw_keepdir to 0 (say, in your <.vimrc>) will tell netrw to have the
 currently browsed directory be the current directory.
 
 With the default setting for g:netrw_keepdir, in order to make the two
-directories the same, use the "c" map (just type c).  That map will set
-the current directory to the current browsing directory.
+directories the same, use the "c" map (just type c).  That map will set the
+current directory to the current browsing directory.
 
 
 BOOKMARKING A DIRECTORY		*netrw-b* *netrw-bookmark* *netrw-bookmarks*
-
+							*netrw-Nb*
 One may easily "bookmark" a directory by using >
 
 	{cnt}b
@@ -1060,15 +1121,21 @@ 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.
 
+When wide listing is in use (see |netrw-i|), then the b map is not available;
+instead, use {cnt}Nb.
 
-CHANGING TO A BOOKMARKED DIRECTORY				*netrw-B*
+
+CHANGING TO A BOOKMARKED DIRECTORY			*netrw-NB* *netrw-B*
 
 To change directory back to a bookmarked directory, use
 
 	{cnt}B
 
-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.
+Any count may be used to reference any of the bookmarks.  See |netrw-b| on
+how to bookmark a directory and |netrw-q| on how to list bookmarks.
+
+When wide listing is in use (see |netrw-i|), then the B map is not available;
+instead, use {cnt}NB.
 
 
 LISTING BOOKMARKS AND HISTORY			*netrw-q* *netrw-listbookmark*
@@ -1095,9 +1162,9 @@ 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.
+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.
 
 
 ==============================================================================
@@ -1178,10 +1245,10 @@ which is loaded automatically at startup (assuming :set nocp).
 
 	1. Get the <Decho.vim> script, available as:
 
-		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_scripts
-		as "Decho, a vimL debugging aid"
+	     http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_scripts
+	     as "Decho, a vimL debugging aid"
 	   or
-		http://vim.sourceforge.net/scripts/script.php?script_id=120
+	     http://vim.sourceforge.net/scripts/script.php?script_id=120
 
 	   and put it into your local plugin directory.
 
@@ -1217,9 +1284,45 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 10. History						*netrw-history*
 
-	v64: * Browser functions now use NetOptionSave/Restore; in particular,
+	v73: * bugfix -- scp://host/path/file was getting named incorrectly
+	     * netrw detects use of earlier-than-7.0 version of vim and issues
+	       a pertinent error message.
+	     * netrwSettings.vim is now uses autoloading.  Only
+	       <netrwPlugin.vim> is needed as a pure plugin
+	       (ie. always loaded).
+	v72: * bugfix -- formerly, one could prevent the loading of netrw
+	       by "let g:loaded_netrw=1"; when autoloading became supported,
+	       this feature was lost.  It is now restored.
+	v71: * bugfix -- made some "set nomodifiable"s into setlocal variants
+	       (allows :e somenewfile  to be modifiable as usual)
+	     * NetrwSettings calls a netrw function, thereby assuring that
+	       netrw has loaded.  However, if netrw does not load for whatever
+	       reason, then NetrwSettings will now issue a warning message.
+	     * For what reason I don't recall, when wget and fetch are both
+	       not present, and an attempt to read a http://... url is made,
+	       netrw exited.  It now only returns.
+	     * When ch=1, on the second and subsequent uses of browsing Netrw
+	       would issue a blank line to clear the echo'd messages.  This
+	       caused an annoying "Hit-Enter" prompt; now a blank line message
+	       is echo'd only if &ch>1.
+	v70: * when using |netrw-O|, the "Obtaining filename" message is now
+	       shown using |hl-User9|.  If User9 has not been defined, netrw
+	       will define it.
+	v69: * Bugfix: win95/98 machines were experiencing a
+	       "E121: Undefined variable: g:netrw_win95ftp" message
+	v68: * double-click-leftmouse selects word under mouse
+	v67: * Passwords which contain blanks will now be surrounded by
+	       double-quotes automatically (Yongwei)
+	v66: * Netrw now seems to work with a few more Windows situations
+	     * O now obtains a file: remote browsing file -> local copy,
+	       locally browsing file -> current directory (see :pwd)
+	     * i now cycles between thin, long, and wide listing styles
+	     * NB and Nb are maps that are always available; corresponding
+	       B and b maps are only available when not using wide listing
+	       in order to allow them to be used for motions
+	v65: * Browser functions now use NetOptionSave/Restore; in particular,
 	       netrw now works around the report setting
-	     * Bugfix - browsing a "/" directory (Unix) yielded buffers 
+	v64: * 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)
@@ -1323,7 +1426,7 @@ which is loaded automatically at startup (assuming :set nocp).
 	     * special file viewing with:
 	       (windows) rundll32 url.dll (gnome)   gnome-open (kde)
 	       kfmclient If none of these are on the executable path, then
-	       NetrwFileHandlers.vim is used.
+	       netrwFileHandlers.vim is used.
 	     * directory bookmarking during both local and remote browsing
 	       implemented
 	     * one may view all, use the hiding list to suppress, or use the
@@ -1366,7 +1469,7 @@ which is loaded automatically at startup (assuming :set nocp).
 	Vim editor	by Bram Moolenaar (Thanks, Bram!)
 	dav		support by C Campbell
 	fetch		support by Bram Moolenaar and C Campbell
-	ftp		support by C Campbell <NdrOchip@ScampbellPfamily.AbizM> - NOSPAM
+	ftp		support by C Campbell <NdrOchip@ScampbellPfamily.AbizM>
 	http		support by Bram Moolenaar <bram@moolenaar.net>
 	rcp
 	rsync		support by C Campbell (suggested by Erik Warendorph)
@@ -1376,11 +1479,13 @@ which is loaded automatically at startup (assuming :set nocp).
 	inputsecret(), BufReadCmd, BufWriteCmd contributed by C Campbell
 
 	Jérôme Augé		-- also using new buffer method with ftp+.netrc
-	Bram Moolenaar		-- obviously vim itself, :e and v:cmdarg use, fetch,...
+	Bram Moolenaar		-- obviously vim itself, :e and v:cmdarg use,
+	                           fetch,...
 	Yasuhiro Matsumoto	-- pointing out undo+0r problem and a solution
 	Erik Warendorph		-- for several suggestions (g:netrw_..._cmd
 				   variables, rsync etc)
-	Doug Claar		-- modifications to test for success with ftp operation
+	Doug Claar		-- modifications to test for success with ftp
+	                           operation
 
 ==============================================================================
  vim:tw=78:ts=8:ft=help:norl:fdm=marker

runtime/doc/pi_spec.txt

@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
+*pi_spec.txt*   For Vim version 7.0aa.  Last change: 2005 Oct 03
 
 by Gustavo Niemeyer ~
 
@@ -26,13 +26,13 @@ your maplocalleader key (default is '\') plus 'c'.  If you do not have
 |spec_chglog_format| set, the plugin will ask you for an email address
 to use in this edit session.
 
-Everytime you run the plugin, it will check to see if the last entry
-in the changelog has been written today and by you.  If it's the entry
-mathes, it will just insert a new changelog item, otherwise it will
-create a new changelog entry.  If you are running with
-|spec_chglog_release_info| enabled, it will also check if the name, version
-and release matches.  The plugin is smart enough to ask you if it should
-update the package release, if you have not done so.
+Every time you run the plugin, it will check to see if the last entry in the
+changelog has been written today and by you.  If the entry matches, it will
+just insert a new changelog item, otherwise it will create a new changelog
+entry.  If you are running with |spec_chglog_release_info| enabled, it will
+also check if the name, version and release matches.  The plugin is smart
+enough to ask you if it should update the package release, if you have not
+done so.
 
 Setting a map					*spec-setting-a-map*
 -------------

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 Sep 27
 
 
 		  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 nothing 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 13
 
 
 		  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
+|'omnifunc'|      |'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 Aug 21
+*spell.txt*	For Vim version 7.0aa.  Last change: 2005 Sep 25
 
 
 		  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
@@ -59,17 +60,23 @@ To search for the next misspelled word:
 [S			Like "]S" but search backwards.
 
 
-To add words to your own word list:				*E764*
+To add words to your own word list:
 
 							*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
@@ -145,7 +152,8 @@ z?			For the word under/after the cursor suggest correctly
 			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
@@ -210,6 +218,12 @@ Specific exception: For German these special regions are used:
 	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
@@ -435,8 +449,7 @@ 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, Italian and Hungarian
@@ -514,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.
 
@@ -602,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).
@@ -620,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*
 
@@ -635,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.
@@ -659,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
@@ -701,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> ~
@@ -722,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.
 
@@ -753,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).
@@ -766,6 +815,17 @@ 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
@@ -793,7 +853,7 @@ Example:
 
 This allows for "wordutil" and "wordutils" but not "wordutilize".
 
-						    *spell-affix-PFXPOSTPONE*
+						    *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
@@ -809,7 +869,7 @@ but in lower case.  Thus when the chop string is used to allow the following
 word to start with an upper case letter.
 
 
-WORDS WITH A SLASH					*spell-affix-SLASH*
+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
@@ -824,7 +884,7 @@ 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-affix-KEP*
+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:
@@ -834,7 +894,7 @@ 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:
@@ -847,7 +907,7 @@ 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:
@@ -862,14 +922,20 @@ 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-affix-NEEDAFFIX*
+							*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:
 
 	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:
 
-COMPOUND WORDS						*spell-affix-compound*
+	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
@@ -927,14 +993,27 @@ examples with the sequence of word flags they require:
     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 byte length of a word used for concatenation is specified with
+The minimal character length of a word used for compounding is specified with
 COMPOUNDMIN.  Example:
 	COMPOUNDMIN 5 ~
 
-When omitted a minimal length of 3 bytes is used.  Obviously you could just
-leave out the compound flag from short words instead, this feature is present
-for compatibility with Myspell.
+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
@@ -954,6 +1033,10 @@ with COMPOUNDSYLMAX.  Example:
 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:
@@ -971,6 +1054,17 @@ 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.
@@ -1011,7 +1105,7 @@ lists that support this.
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
-REPLACEMENTS						*spell-affix-REP*
+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
@@ -1023,13 +1117,19 @@ 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.
 
+You can include a space by using an underscore:
 
-SIMILAR CHARACTERS					*spell-affix-MAP*
+	REP the_the the ~
+
+
+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
@@ -1039,13 +1139,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.
@@ -1069,7 +1170,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/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 30
+*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -789,10 +789,11 @@ accordingly.  Vim proceeds in this order:
 
 4. Load the plugin scripts.					*load-plugins*
 	This does the same as the command: >
-		:runtime! plugin/*.vim
+		:runtime! plugin/**/*.vim
 <	The result is that all directories in the 'runtimepath' option will be
 	searched for the "plugin" sub-directory and all files ending in ".vim"
-	will be sourced (in alphabetical order per directory).
+	will be sourced (in alphabetical order per directory), also in
+	subdirectories.
 	Loading plugins won't be done when:
 	- The 'loadplugins' option was reset in a vimrc file.
 	- The |--noplugin| command line argument is used.

runtime/doc/syntax.txt

@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Aug 14
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -454,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: >
@@ -467,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.
@@ -515,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
@@ -533,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
@@ -543,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
@@ -598,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
@@ -610,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
@@ -619,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: >
@@ -686,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.
@@ -696,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:
@@ -706,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: >
@@ -722,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
@@ -733,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: >
@@ -743,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.
@@ -766,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
@@ -786,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
@@ -794,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/
@@ -804,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
@@ -815,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
@@ -834,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
@@ -857,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: >
@@ -881,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
@@ -924,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".
@@ -939,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,
@@ -973,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
@@ -1114,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
@@ -1142,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)
@@ -1165,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
@@ -1174,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
@@ -1218,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.
 
@@ -1291,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:
 
@@ -1312,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.
@@ -1321,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
@@ -1350,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:
 
@@ -1443,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
@@ -1451,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 >
@@ -1460,7 +1460,26 @@ 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*
+LISP						*lisp.vim* *ft-lisp-syntax*
+
+The lisp syntax highlighting provides two options: >
+
+	g:lisp_instring : if it exists, then "(...)" strings are highlighted
+			  as if the contents of the string were lisp.
+			  Useful for AutoLisp.
+	g:lisp_rainbow  : if it exists and is nonzero, then differing levels
+			  of parenthesization will receive different
+			  highlighting.
+<
+The g:lisp_rainbow option provides 10 levels of individual colorization for
+the parentheses and backquoted parentheses.  Because of the quantity of
+colorization levels, unlike non-rainbow highlighting, the rainbow mode
+specifies its highlighting using ctermfg and guifg, thereby bypassing the
+usual colorscheme control using standard highlighting groups.  The actual
+highlighting used depends on the dark/bright setting  (see |'bg'|).
+
+
+LITE						*lite.vim* *ft-lite-syntax*
 
 There are two options for the lite syntax highlighting.
 
@@ -1474,7 +1493,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
@@ -1515,7 +1534,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: >
@@ -1525,7 +1544,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,
@@ -1543,7 +1562,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
@@ -1552,7 +1571,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.
@@ -1577,7 +1596,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: >
@@ -1585,7 +1604,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
@@ -1621,7 +1640,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.
 
@@ -1635,7 +1654,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.
 
@@ -1647,7 +1666,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
@@ -1718,7 +1737,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 >
@@ -1734,7 +1753,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
@@ -1752,7 +1771,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
@@ -1806,7 +1825,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.
 
@@ -1866,7 +1885,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"]
@@ -1919,7 +1938,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
 
@@ -1941,7 +1960,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.
 
@@ -1955,7 +1974,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.
 
@@ -2010,8 +2029,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.
 
@@ -2036,7 +2055,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
@@ -2048,7 +2067,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.
 
@@ -2069,7 +2088,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
@@ -2091,7 +2110,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
@@ -2103,7 +2122,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
@@ -2114,7 +2133,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.
 
@@ -2139,7 +2158,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.
 
@@ -2150,7 +2169,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.
@@ -2170,7 +2189,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 >
@@ -2193,7 +2212,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.
 
@@ -2234,7 +2253,7 @@ vimrc file: >
 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
 
 
-SH			*sh.vim* *sh-syntax* *bash-syntax* *ksh-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.
 
@@ -2285,7 +2304,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:
 
@@ -2317,8 +2336,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
@@ -2328,7 +2347,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.
@@ -2350,7 +2369,7 @@ 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? ~
@@ -2425,7 +2444,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.
 
@@ -2435,7 +2454,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
@@ -2459,7 +2478,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.
@@ -2474,7 +2493,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: >
@@ -2492,7 +2511,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,
@@ -3562,7 +3581,7 @@ You can clear specific sync patterns with: >
 ==============================================================================
 11. Listing syntax items		*:syntax* *:sy* *:syn* *:syn-list*
 
-This commands lists all the syntax items: >
+This command lists all the syntax items: >
 
     :sy[ntax] [list]
 
@@ -3926,6 +3945,14 @@ NonText		'~' and '@' at the end of the window, characters from
 		doesn't fit at the end of the line).
 							*hl-Normal*
 Normal		normal text
+							*hl-Pmenu*
+Pmenu		Popup menu: normal item.
+							*hl-PmenuSel*
+PmenuSel	Popup menu: selected item.
+							*hl-PmenuSbar*
+PmenuSbar	Popup menu: scrollbar.
+							*hl-PmenuThumb*
+PmenuThumb	Popup menu: Thumb of the scrollbar.
 							*hl-Question*
 Question	|hit-enter| prompt and yes/no questions
 							*hl-Search*
@@ -3969,7 +3996,7 @@ WarningMsg	warning messages
 							*hl-WildMenu*
 WildMenu	current match in 'wildmenu' completion
 
-						*hl-User1* *hl-User1..9*
+					*hl-User1* *hl-User1..9* *hl-User9*
 The 'statusline' syntax allows the use of 9 different highlights in the
 statusline and ruler (via 'rulerformat').  The names are User1 to User9.
 

runtime/doc/tags

@@ -120,10 +120,12 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'compatible'	options.txt	/*'compatible'*
 'complete'	options.txt	/*'complete'*
 'completefunc'	options.txt	/*'completefunc'*
+'completeopt'	options.txt	/*'completeopt'*
 'confirm'	options.txt	/*'confirm'*
 'consk'	options.txt	/*'consk'*
 'conskey'	options.txt	/*'conskey'*
 'copyindent'	options.txt	/*'copyindent'*
+'cot'	options.txt	/*'cot'*
 'cp'	options.txt	/*'cp'*
 'cpo'	options.txt	/*'cpo'*
 'cpoptions'	options.txt	/*'cpoptions'*
@@ -608,6 +610,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'numberwidth'	options.txt	/*'numberwidth'*
 'nuw'	options.txt	/*'nuw'*
 'oft'	options.txt	/*'oft'*
+'ofu'	options.txt	/*'ofu'*
+'omnifunc'	options.txt	/*'omnifunc'*
 'op'	vi_diff.txt	/*'op'*
 'open'	vi_diff.txt	/*'open'*
 'optimize'	vi_diff.txt	/*'optimize'*
@@ -1036,6 +1040,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 +comments	various.txt	/*+comments*
 +cryptv	various.txt	/*+cryptv*
 +cscope	various.txt	/*+cscope*
++cursorshape	various.txt	/*+cursorshape*
++debug	various.txt	/*+debug*
 +dialog_con	various.txt	/*+dialog_con*
 +dialog_con_gui	various.txt	/*+dialog_con_gui*
 +dialog_gui	various.txt	/*+dialog_gui*
@@ -1480,6 +1486,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 12.6	usr_12.txt	/*12.6*
 12.7	usr_12.txt	/*12.7*
 12.8	usr_12.txt	/*12.8*
+1gD	pattern.txt	/*1gD*
+1gd	pattern.txt	/*1gd*
 20.1	usr_20.txt	/*20.1*
 20.2	usr_20.txt	/*20.2*
 20.3	usr_20.txt	/*20.3*
@@ -1667,6 +1675,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :abbreviate	map.txt	/*:abbreviate*
 :abbreviate-<buffer>	map.txt	/*:abbreviate-<buffer>*
 :abbreviate-local	map.txt	/*:abbreviate-local*
+:abbreviate-verbose	map.txt	/*:abbreviate-verbose*
 :abc	map.txt	/*:abc*
 :abclear	map.txt	/*:abclear*
 :abo	windows.txt	/*:abo*
@@ -1702,6 +1711,7 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 :aun	gui.txt	/*:aun*
 :aunmenu	gui.txt	/*:aunmenu*
 :autocmd	autocmd.txt	/*:autocmd*
+:autocmd-verbose	autocmd.txt	/*:autocmd-verbose*
 :b	windows.txt	/*:b*
 :bN	windows.txt	/*:bN*
 :bNext	windows.txt	/*:bNext*
@@ -3746,7 +3756,7 @@ E760	spell.txt	/*E760*
 E761	spell.txt	/*E761*
 E762	spell.txt	/*E762*
 E763	spell.txt	/*E763*
-E764	spell.txt	/*E764*
+E764	options.txt	/*E764*
 E765	options.txt	/*E765*
 E766	eval.txt	/*E766*
 E767	eval.txt	/*E767*
@@ -4140,10 +4150,8 @@ a`	motion.txt	/*a`*
 ab	motion.txt	/*ab*
 abandon	editing.txt	/*abandon*
 abbreviations	map.txt	/*abbreviations*
-abel-syntax	syntax.txt	/*abel-syntax*
 abel.vim	syntax.txt	/*abel.vim*
 active-buffer	windows.txt	/*active-buffer*
-ada-syntax	syntax.txt	/*ada-syntax*
 ada.vim	syntax.txt	/*ada.vim*
 add()	eval.txt	/*add()*
 add-filetype-plugin	usr_05.txt	/*add-filetype-plugin*
@@ -4162,6 +4170,7 @@ added-5.8	version5.txt	/*added-5.8*
 added-6.1	version6.txt	/*added-6.1*
 added-6.2	version6.txt	/*added-6.2*
 added-6.3	version6.txt	/*added-6.3*
+added-6.4	version6.txt	/*added-6.4*
 added-BeOS	version5.txt	/*added-BeOS*
 added-Mac	version5.txt	/*added-Mac*
 added-VMS	version5.txt	/*added-VMS*
@@ -4176,11 +4185,9 @@ alt	intro.txt	/*alt*
 alt-input	debugger.txt	/*alt-input*
 alternate-file	editing.txt	/*alternate-file*
 amiga-window	starting.txt	/*amiga-window*
-ant-syntax	syntax.txt	/*ant-syntax*
 ant.vim	syntax.txt	/*ant.vim*
 antialias	gui_x11.txt	/*antialias*
 ap	motion.txt	/*ap*
-apache-syntax	syntax.txt	/*apache-syntax*
 apache.vim	syntax.txt	/*apache.vim*
 append()	eval.txt	/*append()*
 aquote	motion.txt	/*aquote*
@@ -4195,14 +4202,9 @@ arglist-quit	usr_07.txt	/*arglist-quit*
 argument-list	editing.txt	/*argument-list*
 argv()	eval.txt	/*argv()*
 as	motion.txt	/*as*
-asm-syntax	syntax.txt	/*asm-syntax*
 asm.vim	syntax.txt	/*asm.vim*
 asm68k	syntax.txt	/*asm68k*
-asm68k-syntax	syntax.txt	/*asm68k-syntax*
-asmh8300-syntax	syntax.txt	/*asmh8300-syntax*
 asmh8300.vim	syntax.txt	/*asmh8300.vim*
-aspperl-syntax	syntax.txt	/*aspperl-syntax*
-aspvbs-syntax	syntax.txt	/*aspvbs-syntax*
 at	motion.txt	/*at*
 athena-intellimouse	gui.txt	/*athena-intellimouse*
 attr-list	syntax.txt	/*attr-list*
@@ -4254,8 +4256,6 @@ balloon-eval	debugger.txt	/*balloon-eval*
 bar	motion.txt	/*bar*
 bars	help.txt	/*bars*
 base_font_name_list	mbyte.txt	/*base_font_name_list*
-bash-syntax	syntax.txt	/*bash-syntax*
-basic-syntax	syntax.txt	/*basic-syntax*
 basic.vim	syntax.txt	/*basic.vim*
 beep	options.txt	/*beep*
 beos-colors	os_beos.txt	/*beos-colors*
@@ -4318,7 +4318,6 @@ byte2line()	eval.txt	/*byte2line()*
 byteidx()	eval.txt	/*byteidx()*
 bzip2	pi_gzip.txt	/*bzip2*
 c	change.txt	/*c*
-c-syntax	syntax.txt	/*c-syntax*
 c.vim	syntax.txt	/*c.vim*
 cW	change.txt	/*cW*
 c_<BS>	cmdline.txt	/*c_<BS>*
@@ -4392,7 +4391,6 @@ catch-interrupt	eval.txt	/*catch-interrupt*
 catch-order	eval.txt	/*catch-order*
 catch-text	eval.txt	/*catch-text*
 cc	change.txt	/*cc*
-ch-syntax	syntax.txt	/*ch-syntax*
 ch.vim	syntax.txt	/*ch.vim*
 change-list-jumps	motion.txt	/*change-list-jumps*
 change-tabs	change.txt	/*change-tabs*
@@ -4408,9 +4406,8 @@ changed-5.8	version5.txt	/*changed-5.8*
 changed-6.1	version6.txt	/*changed-6.1*
 changed-6.2	version6.txt	/*changed-6.2*
 changed-6.3	version6.txt	/*changed-6.3*
+changed-6.4	version6.txt	/*changed-6.4*
 changelist	motion.txt	/*changelist*
-changelog-plugin	filetype.txt	/*changelog-plugin*
-changelog-syntax	syntax.txt	/*changelog-syntax*
 changelog.vim	syntax.txt	/*changelog.vim*
 changetick	eval.txt	/*changetick*
 changing	change.txt	/*changing*
@@ -4422,7 +4419,6 @@ charconvert_from-variable	eval.txt	/*charconvert_from-variable*
 charconvert_to-variable	eval.txt	/*charconvert_to-variable*
 charset	mbyte.txt	/*charset*
 charset-conversion	mbyte.txt	/*charset-conversion*
-chill-syntax	syntax.txt	/*chill-syntax*
 chill.vim	syntax.txt	/*chill.vim*
 cindent()	eval.txt	/*cindent()*
 cinkeys-format	indent.txt	/*cinkeys-format*
@@ -4445,12 +4441,10 @@ cmdline-window	cmdline.txt	/*cmdline-window*
 cmdline.txt	cmdline.txt	/*cmdline.txt*
 cmdwin	cmdline.txt	/*cmdwin*
 cmdwin-char	cmdline.txt	/*cmdwin-char*
-cobol-syntax	syntax.txt	/*cobol-syntax*
 cobol.vim	syntax.txt	/*cobol.vim*
 codeset	mbyte.txt	/*codeset*
 coding-style	develop.txt	/*coding-style*
 col()	eval.txt	/*col()*
-coldfusion-syntax	syntax.txt	/*coldfusion-syntax*
 coldfusion.vim	syntax.txt	/*coldfusion.vim*
 collapse	tips.txt	/*collapse*
 color-xterm	syntax.txt	/*color-xterm*
@@ -4472,7 +4466,8 @@ compl-filename	insert.txt	/*compl-filename*
 compl-function	insert.txt	/*compl-function*
 compl-generic	insert.txt	/*compl-generic*
 compl-keyword	insert.txt	/*compl-keyword*
-compl-occult	insert.txt	/*compl-occult*
+compl-omni	insert.txt	/*compl-omni*
+compl-omni-filetypes	insert.txt	/*compl-omni-filetypes*
 compl-spelling	insert.txt	/*compl-spelling*
 compl-tag	insert.txt	/*compl-tag*
 compl-vim	insert.txt	/*compl-vim*
@@ -4582,7 +4577,6 @@ cscopequickfix	if_cscop.txt	/*cscopequickfix*
 cscopetag	if_cscop.txt	/*cscopetag*
 cscopetagorder	if_cscop.txt	/*cscopetagorder*
 cscopeverbose	if_cscop.txt	/*cscopeverbose*
-csh-syntax	syntax.txt	/*csh-syntax*
 csh.vim	syntax.txt	/*csh.vim*
 cspc	if_cscop.txt	/*cspc*
 csprg	if_cscop.txt	/*csprg*
@@ -4614,9 +4608,7 @@ cursor_left	intro.txt	/*cursor_left*
 cursor_right	intro.txt	/*cursor_right*
 cursor_up	intro.txt	/*cursor_up*
 cw	change.txt	/*cw*
-cweb-syntax	syntax.txt	/*cweb-syntax*
 cweb.vim	syntax.txt	/*cweb.vim*
-cynlib-syntax	syntax.txt	/*cynlib-syntax*
 cynlib.vim	syntax.txt	/*cynlib.vim*
 d	change.txt	/*d*
 daB	motion.txt	/*daB*
@@ -4627,11 +4619,14 @@ das	motion.txt	/*das*
 dav	pi_netrw.txt	/*dav*
 daw	motion.txt	/*daw*
 dd	change.txt	/*dd*
+debug-gcc	debug.txt	/*debug-gcc*
 debug-highlight	debugger.txt	/*debug-highlight*
 debug-mode	repeat.txt	/*debug-mode*
 debug-scripts	repeat.txt	/*debug-scripts*
 debug-signs	debugger.txt	/*debug-signs*
-debug-vim	intro.txt	/*debug-vim*
+debug-vim	debug.txt	/*debug-vim*
+debug-win32	debug.txt	/*debug-win32*
+debug.txt	debug.txt	/*debug.txt*
 debugger-compilation	debugger.txt	/*debugger-compilation*
 debugger-features	debugger.txt	/*debugger-features*
 debugger-integration	debugger.txt	/*debugger-integration*
@@ -4656,7 +4651,6 @@ design-maintain	develop.txt	/*design-maintain*
 design-multi-platform	develop.txt	/*design-multi-platform*
 design-not	develop.txt	/*design-not*
 design-speed-size	develop.txt	/*design-speed-size*
-desktop-syntax	syntax.txt	/*desktop-syntax*
 desktop.vim	syntax.txt	/*desktop.vim*
 develop-spell	develop.txt	/*develop-spell*
 develop.txt	develop.txt	/*develop.txt*
@@ -4688,7 +4682,6 @@ digraphs-default	digraph.txt	/*digraphs-default*
 digraphs-define	digraph.txt	/*digraphs-define*
 digraphs-use	digraph.txt	/*digraphs-use*
 dip	motion.txt	/*dip*
-dircolors-syntax	syntax.txt	/*dircolors-syntax*
 dircolors.vim	syntax.txt	/*dircolors.vim*
 dis	motion.txt	/*dis*
 disable-menus	gui.txt	/*disable-menus*
@@ -4697,11 +4690,8 @@ diw	motion.txt	/*diw*
 dl	change.txt	/*dl*
 do	diff.txt	/*do*
 doc-file-list	help.txt	/*doc-file-list*
-docbk-syntax	syntax.txt	/*docbk-syntax*
 docbk.vim	syntax.txt	/*docbk.vim*
-docbksgml-syntax	syntax.txt	/*docbksgml-syntax*
 docbksgml.vim	syntax.txt	/*docbksgml.vim*
-docbkxml-syntax	syntax.txt	/*docbkxml-syntax*
 docbkxml.vim	syntax.txt	/*docbkxml.vim*
 docbook	syntax.txt	/*docbook*
 documentation-6	version6.txt	/*documentation-6*
@@ -4718,7 +4708,6 @@ dos-standard-mappings	os_dos.txt	/*dos-standard-mappings*
 dos-temp-files	os_dos.txt	/*dos-temp-files*
 dos16	os_msdos.txt	/*dos16*
 dos32	os_msdos.txt	/*dos32*
-dosbatch-syntax	syntax.txt	/*dosbatch-syntax*
 dosbatch.vim	syntax.txt	/*dosbatch.vim*
 double-click	term.txt	/*double-click*
 download	intro.txt	/*download*
@@ -4726,7 +4715,6 @@ dp	diff.txt	/*dp*
 drag-n-drop	gui.txt	/*drag-n-drop*
 drag-n-drop-win32	gui_w32.txt	/*drag-n-drop-win32*
 drag-status-line	term.txt	/*drag-status-line*
-dtd-syntax	syntax.txt	/*dtd-syntax*
 dtd.vim	syntax.txt	/*dtd.vim*
 dying-variable	eval.txt	/*dying-variable*
 e	motion.txt	/*e*
@@ -4740,7 +4728,6 @@ edit-no-break	usr_25.txt	/*edit-no-break*
 editing.txt	editing.txt	/*editing.txt*
 efm-entries	quickfix.txt	/*efm-entries*
 efm-ignore	quickfix.txt	/*efm-ignore*
-eiffel-syntax	syntax.txt	/*eiffel-syntax*
 eiffel.vim	syntax.txt	/*eiffel.vim*
 emacs-keys	tips.txt	/*emacs-keys*
 emacs-tags	tagsrch.txt	/*emacs-tags*
@@ -4753,7 +4740,6 @@ encryption	editing.txt	/*encryption*
 end	intro.txt	/*end*
 end-of-file	pattern.txt	/*end-of-file*
 enlightened-terminal	syntax.txt	/*enlightened-terminal*
-erlang-syntax	syntax.txt	/*erlang-syntax*
 erlang.vim	syntax.txt	/*erlang.vim*
 errmsg-variable	eval.txt	/*errmsg-variable*
 error-file-format	quickfix.txt	/*error-file-format*
@@ -4926,6 +4912,7 @@ fixed-5.8	version5.txt	/*fixed-5.8*
 fixed-6.1	version6.txt	/*fixed-6.1*
 fixed-6.2	version6.txt	/*fixed-6.2*
 fixed-6.3	version6.txt	/*fixed-6.3*
+fixed-6.4	version6.txt	/*fixed-6.4*
 fname_diff-variable	eval.txt	/*fname_diff-variable*
 fname_in-variable	eval.txt	/*fname_in-variable*
 fname_new-variable	eval.txt	/*fname_new-variable*
@@ -4963,18 +4950,117 @@ font-sizes	gui_x11.txt	/*font-sizes*
 fontset	mbyte.txt	/*fontset*
 foreground()	eval.txt	/*foreground()*
 fork	os_unix.txt	/*fork*
-form-syntax	syntax.txt	/*form-syntax*
 form.vim	syntax.txt	/*form.vim*
 format-bullet-list	tips.txt	/*format-bullet-list*
 format-comments	change.txt	/*format-comments*
 formatting	change.txt	/*formatting*
 formfeed	intro.txt	/*formfeed*
-fortran-indent	indent.txt	/*fortran-indent*
-fortran-plugin	filetype.txt	/*fortran-plugin*
-fortran-syntax	syntax.txt	/*fortran-syntax*
 fortran.vim	syntax.txt	/*fortran.vim*
 french-maillist	intro.txt	/*french-maillist*
 frombook	usr_01.txt	/*frombook*
+ft-abel-syntax	syntax.txt	/*ft-abel-syntax*
+ft-ada-syntax	syntax.txt	/*ft-ada-syntax*
+ft-ant-syntax	syntax.txt	/*ft-ant-syntax*
+ft-apache-syntax	syntax.txt	/*ft-apache-syntax*
+ft-asm-syntax	syntax.txt	/*ft-asm-syntax*
+ft-asm68k-syntax	syntax.txt	/*ft-asm68k-syntax*
+ft-asmh8300-syntax	syntax.txt	/*ft-asmh8300-syntax*
+ft-aspperl-syntax	syntax.txt	/*ft-aspperl-syntax*
+ft-aspvbs-syntax	syntax.txt	/*ft-aspvbs-syntax*
+ft-bash-syntax	syntax.txt	/*ft-bash-syntax*
+ft-basic-syntax	syntax.txt	/*ft-basic-syntax*
+ft-c-omni	insert.txt	/*ft-c-omni*
+ft-c-syntax	syntax.txt	/*ft-c-syntax*
+ft-ch-syntax	syntax.txt	/*ft-ch-syntax*
+ft-changelog-plugin	filetype.txt	/*ft-changelog-plugin*
+ft-changelog-syntax	syntax.txt	/*ft-changelog-syntax*
+ft-chill-syntax	syntax.txt	/*ft-chill-syntax*
+ft-cobol-syntax	syntax.txt	/*ft-cobol-syntax*
+ft-coldfusion-syntax	syntax.txt	/*ft-coldfusion-syntax*
+ft-csh-syntax	syntax.txt	/*ft-csh-syntax*
+ft-css-omni	insert.txt	/*ft-css-omni*
+ft-cweb-syntax	syntax.txt	/*ft-cweb-syntax*
+ft-cynlib-syntax	syntax.txt	/*ft-cynlib-syntax*
+ft-desktop-syntax	syntax.txt	/*ft-desktop-syntax*
+ft-dircolors-syntax	syntax.txt	/*ft-dircolors-syntax*
+ft-docbk-syntax	syntax.txt	/*ft-docbk-syntax*
+ft-docbksgml-syntax	syntax.txt	/*ft-docbksgml-syntax*
+ft-docbkxml-syntax	syntax.txt	/*ft-docbkxml-syntax*
+ft-dosbatch-syntax	syntax.txt	/*ft-dosbatch-syntax*
+ft-dtd-syntax	syntax.txt	/*ft-dtd-syntax*
+ft-eiffel-syntax	syntax.txt	/*ft-eiffel-syntax*
+ft-erlang-syntax	syntax.txt	/*ft-erlang-syntax*
+ft-form-syntax	syntax.txt	/*ft-form-syntax*
+ft-fortran-indent	indent.txt	/*ft-fortran-indent*
+ft-fortran-plugin	filetype.txt	/*ft-fortran-plugin*
+ft-fortran-syntax	syntax.txt	/*ft-fortran-syntax*
+ft-fvwm-syntax	syntax.txt	/*ft-fvwm-syntax*
+ft-groff-syntax	syntax.txt	/*ft-groff-syntax*
+ft-gsp-syntax	syntax.txt	/*ft-gsp-syntax*
+ft-haskell-syntax	syntax.txt	/*ft-haskell-syntax*
+ft-html-omni	insert.txt	/*ft-html-omni*
+ft-html-syntax	syntax.txt	/*ft-html-syntax*
+ft-htmlos-syntax	syntax.txt	/*ft-htmlos-syntax*
+ft-ia64-syntax	syntax.txt	/*ft-ia64-syntax*
+ft-inform-syntax	syntax.txt	/*ft-inform-syntax*
+ft-java-syntax	syntax.txt	/*ft-java-syntax*
+ft-ksh-syntax	syntax.txt	/*ft-ksh-syntax*
+ft-lace-syntax	syntax.txt	/*ft-lace-syntax*
+ft-lex-syntax	syntax.txt	/*ft-lex-syntax*
+ft-lite-syntax	syntax.txt	/*ft-lite-syntax*
+ft-lpc-syntax	syntax.txt	/*ft-lpc-syntax*
+ft-lua-syntax	syntax.txt	/*ft-lua-syntax*
+ft-mail-plugin	filetype.txt	/*ft-mail-plugin*
+ft-mail.vim	syntax.txt	/*ft-mail.vim*
+ft-make-syntax	syntax.txt	/*ft-make-syntax*
+ft-man-plugin	filetype.txt	/*ft-man-plugin*
+ft-maple-syntax	syntax.txt	/*ft-maple-syntax*
+ft-masm-syntax	syntax.txt	/*ft-masm-syntax*
+ft-mathematica-syntax	syntax.txt	/*ft-mathematica-syntax*
+ft-mma-syntax	syntax.txt	/*ft-mma-syntax*
+ft-moo-syntax	syntax.txt	/*ft-moo-syntax*
+ft-msql-syntax	syntax.txt	/*ft-msql-syntax*
+ft-nasm-syntax	syntax.txt	/*ft-nasm-syntax*
+ft-ncf-syntax	syntax.txt	/*ft-ncf-syntax*
+ft-nroff-syntax	syntax.txt	/*ft-nroff-syntax*
+ft-ocaml-syntax	syntax.txt	/*ft-ocaml-syntax*
+ft-papp-syntax	syntax.txt	/*ft-papp-syntax*
+ft-pascal-syntax	syntax.txt	/*ft-pascal-syntax*
+ft-perl-syntax	syntax.txt	/*ft-perl-syntax*
+ft-php-syntax	syntax.txt	/*ft-php-syntax*
+ft-php3-syntax	syntax.txt	/*ft-php3-syntax*
+ft-phtml-syntax	syntax.txt	/*ft-phtml-syntax*
+ft-postscr-syntax	syntax.txt	/*ft-postscr-syntax*
+ft-ppwiz-syntax	syntax.txt	/*ft-ppwiz-syntax*
+ft-printcap-syntax	syntax.txt	/*ft-printcap-syntax*
+ft-progress-syntax	syntax.txt	/*ft-progress-syntax*
+ft-ptcap-syntax	syntax.txt	/*ft-ptcap-syntax*
+ft-python-indent	indent.txt	/*ft-python-indent*
+ft-python-syntax	syntax.txt	/*ft-python-syntax*
+ft-quake-syntax	syntax.txt	/*ft-quake-syntax*
+ft-readline-syntax	syntax.txt	/*ft-readline-syntax*
+ft-rexx-syntax	syntax.txt	/*ft-rexx-syntax*
+ft-ruby-syntax	syntax.txt	/*ft-ruby-syntax*
+ft-scheme-syntax	syntax.txt	/*ft-scheme-syntax*
+ft-sdl-syntax	syntax.txt	/*ft-sdl-syntax*
+ft-sed-syntax	syntax.txt	/*ft-sed-syntax*
+ft-sgml-syntax	syntax.txt	/*ft-sgml-syntax*
+ft-sh-syntax	syntax.txt	/*ft-sh-syntax*
+ft-spec-plugin	filetype.txt	/*ft-spec-plugin*
+ft-spup-syntax	syntax.txt	/*ft-spup-syntax*
+ft-sql-syntax	syntax.txt	/*ft-sql-syntax*
+ft-sqlinformix-syntax	syntax.txt	/*ft-sqlinformix-syntax*
+ft-tcsh-syntax	syntax.txt	/*ft-tcsh-syntax*
+ft-termcap-syntax	syntax.txt	/*ft-termcap-syntax*
+ft-tex-syntax	syntax.txt	/*ft-tex-syntax*
+ft-tf-syntax	syntax.txt	/*ft-tf-syntax*
+ft-vb-syntax	syntax.txt	/*ft-vb-syntax*
+ft-verilog-indent	indent.txt	/*ft-verilog-indent*
+ft-vim-indent	indent.txt	/*ft-vim-indent*
+ft-vim-syntax	syntax.txt	/*ft-vim-syntax*
+ft-xf86conf-syntax	syntax.txt	/*ft-xf86conf-syntax*
+ft-xml-syntax	syntax.txt	/*ft-xml-syntax*
+ft-xpm-syntax	syntax.txt	/*ft-xpm-syntax*
 ftdetect	filetype.txt	/*ftdetect*
 ftp	pi_netrw.txt	/*ftp*
 ftplugin	usr_41.txt	/*ftplugin*
@@ -4990,7 +5076,6 @@ function-list	usr_41.txt	/*function-list*
 function-range-example	eval.txt	/*function-range-example*
 function_key	intro.txt	/*function_key*
 functions	eval.txt	/*functions*
-fvwm-syntax	syntax.txt	/*fvwm-syntax*
 fvwm.vim	syntax.txt	/*fvwm.vim*
 fvwm2rc	syntax.txt	/*fvwm2rc*
 fvwmrc	syntax.txt	/*fvwmrc*
@@ -5003,7 +5088,6 @@ g'a	motion.txt	/*g'a*
 g,	motion.txt	/*g,*
 g0	motion.txt	/*g0*
 g8	various.txt	/*g8*
-g:netrw-a	pi_netrw.txt	/*g:netrw-a*
 g:netrw_alto	pi_netrw.txt	/*g:netrw_alto*
 g:netrw_altv	pi_netrw.txt	/*g:netrw_altv*
 g:netrw_cygwin	pi_netrw.txt	/*g:netrw_cygwin*
@@ -5086,6 +5170,7 @@ getchar()	eval.txt	/*getchar()*
 getcharmod()	eval.txt	/*getcharmod()*
 getcmdline()	eval.txt	/*getcmdline()*
 getcmdpos()	eval.txt	/*getcmdpos()*
+getcmdtype()	eval.txt	/*getcmdtype()*
 getcwd()	eval.txt	/*getcwd()*
 getfontname()	eval.txt	/*getfontname()*
 getfperm()	eval.txt	/*getfperm()*
@@ -5124,7 +5209,6 @@ gr	change.txt	/*gr*
 graphic-option-gone	version4.txt	/*graphic-option-gone*
 greek	options.txt	/*greek*
 grep	quickfix.txt	/*grep*
-groff-syntax	syntax.txt	/*groff-syntax*
 groff.vim	syntax.txt	/*groff.vim*
 group-name	syntax.txt	/*group-name*
 gs	various.txt	/*gs*
@@ -5212,14 +5296,12 @@ hangulin.txt	hangulin.txt	/*hangulin.txt*
 has()	eval.txt	/*has()*
 has-patch	eval.txt	/*has-patch*
 has_key()	eval.txt	/*has_key()*
-haskell-syntax	syntax.txt	/*haskell-syntax*
 haskell.vim	syntax.txt	/*haskell.vim*
 hasmapto()	eval.txt	/*hasmapto()*
 hebrew	hebrew.txt	/*hebrew*
 hebrew.txt	hebrew.txt	/*hebrew.txt*
 help	various.txt	/*help*
 help-context	help.txt	/*help-context*
-help-tags	tags	1
 help-translated	various.txt	/*help-translated*
 help-xterm-window	various.txt	/*help-xterm-window*
 help.txt	help.txt	/*help.txt*
@@ -5227,6 +5309,7 @@ hex-editing	tips.txt	/*hex-editing*
 hidden-buffer	windows.txt	/*hidden-buffer*
 hidden-changed	version5.txt	/*hidden-changed*
 hidden-menus	gui.txt	/*hidden-menus*
+hidden-options	options.txt	/*hidden-options*
 hidden-quit	windows.txt	/*hidden-quit*
 highlight-args	syntax.txt	/*highlight-args*
 highlight-changed	version4.txt	/*highlight-changed*
@@ -5274,6 +5357,10 @@ hl-ModeMsg	syntax.txt	/*hl-ModeMsg*
 hl-MoreMsg	syntax.txt	/*hl-MoreMsg*
 hl-NonText	syntax.txt	/*hl-NonText*
 hl-Normal	syntax.txt	/*hl-Normal*
+hl-Pmenu	syntax.txt	/*hl-Pmenu*
+hl-PmenuSbar	syntax.txt	/*hl-PmenuSbar*
+hl-PmenuSel	syntax.txt	/*hl-PmenuSel*
+hl-PmenuThumb	syntax.txt	/*hl-PmenuThumb*
 hl-Question	syntax.txt	/*hl-Question*
 hl-Scrollbar	syntax.txt	/*hl-Scrollbar*
 hl-Search	syntax.txt	/*hl-Search*
@@ -5289,6 +5376,7 @@ hl-Title	syntax.txt	/*hl-Title*
 hl-Tooltip	syntax.txt	/*hl-Tooltip*
 hl-User1	syntax.txt	/*hl-User1*
 hl-User1..9	syntax.txt	/*hl-User1..9*
+hl-User9	syntax.txt	/*hl-User9*
 hl-VertSplit	syntax.txt	/*hl-VertSplit*
 hl-Visual	syntax.txt	/*hl-Visual*
 hl-VisualNOS	syntax.txt	/*hl-VisualNOS*
@@ -5307,9 +5395,7 @@ howto	howto.txt	/*howto*
 howto.txt	howto.txt	/*howto.txt*
 hpterm	term.txt	/*hpterm*
 hpterm-color	syntax.txt	/*hpterm-color*
-html-syntax	syntax.txt	/*html-syntax*
 html.vim	syntax.txt	/*html.vim*
-htmlos-syntax	syntax.txt	/*htmlos-syntax*
 htmlos.vim	syntax.txt	/*htmlos.vim*
 http	pi_netrw.txt	/*http*
 i	insert.txt	/*i*
@@ -5420,7 +5506,6 @@ i_backspacing	insert.txt	/*i_backspacing*
 i_digraph	digraph.txt	/*i_digraph*
 i_esc	intro.txt	/*i_esc*
 i`	motion.txt	/*i`*
-ia64-syntax	syntax.txt	/*ia64-syntax*
 ia64.vim	syntax.txt	/*ia64.vim*
 ib	motion.txt	/*ib*
 iccf	uganda.txt	/*iccf*
@@ -5460,15 +5545,16 @@ index	index.txt	/*index*
 index()	eval.txt	/*index()*
 index.txt	index.txt	/*index.txt*
 info-message	starting.txt	/*info-message*
-inform-syntax	syntax.txt	/*inform-syntax*
 inform.vim	syntax.txt	/*inform.vim*
 initialization	starting.txt	/*initialization*
 input()	eval.txt	/*input()*
 inputdialog()	eval.txt	/*inputdialog()*
+inputlist()	eval.txt	/*inputlist()*
 inputrestore()	eval.txt	/*inputrestore()*
 inputsave()	eval.txt	/*inputsave()*
 inputsecret()	eval.txt	/*inputsecret()*
 ins-completion	insert.txt	/*ins-completion*
+ins-completion-menu	insert.txt	/*ins-completion-menu*
 ins-expandtab	insert.txt	/*ins-expandtab*
 ins-reverse	rileft.txt	/*ins-reverse*
 ins-smarttab	insert.txt	/*ins-smarttab*
@@ -5511,7 +5597,6 @@ i}	motion.txt	/*i}*
 j	motion.txt	/*j*
 java-cinoptions	indent.txt	/*java-cinoptions*
 java-indenting	indent.txt	/*java-indenting*
-java-syntax	syntax.txt	/*java-syntax*
 java.vim	syntax.txt	/*java.vim*
 join()	eval.txt	/*join()*
 jsbterm-mouse	options.txt	/*jsbterm-mouse*
@@ -5546,10 +5631,8 @@ keypad-plus	intro.txt	/*keypad-plus*
 keypad-point	intro.txt	/*keypad-point*
 keys()	eval.txt	/*keys()*
 known-bugs	todo.txt	/*known-bugs*
-ksh-syntax	syntax.txt	/*ksh-syntax*
 l	motion.txt	/*l*
 l:var	eval.txt	/*l:var*
-lace-syntax	syntax.txt	/*lace-syntax*
 lace.vim	syntax.txt	/*lace.vim*
 lang-variable	eval.txt	/*lang-variable*
 language-mapping	map.txt	/*language-mapping*
@@ -5561,7 +5644,6 @@ left-right-motions	motion.txt	/*left-right-motions*
 len()	eval.txt	/*len()*
 less	various.txt	/*less*
 letter	print.txt	/*letter*
-lex-syntax	syntax.txt	/*lex-syntax*
 lex.vim	syntax.txt	/*lex.vim*
 lhaskell.vim	syntax.txt	/*lhaskell.vim*
 libcall()	eval.txt	/*libcall()*
@@ -5581,7 +5663,6 @@ list-identity	eval.txt	/*list-identity*
 list-index	eval.txt	/*list-index*
 list-modification	eval.txt	/*list-modification*
 list-repeat	windows.txt	/*list-repeat*
-lite-syntax	syntax.txt	/*lite-syntax*
 lite.vim	syntax.txt	/*lite.vim*
 literal-string	eval.txt	/*literal-string*
 lnum-variable	eval.txt	/*lnum-variable*
@@ -5597,9 +5678,7 @@ locale-name	mbyte.txt	/*locale-name*
 localtime()	eval.txt	/*localtime()*
 long-lines	version5.txt	/*long-lines*
 lowercase	change.txt	/*lowercase*
-lpc-syntax	syntax.txt	/*lpc-syntax*
 lpc.vim	syntax.txt	/*lpc.vim*
-lua-syntax	syntax.txt	/*lua-syntax*
 lua.vim	syntax.txt	/*lua.vim*
 m	motion.txt	/*m*
 m'	motion.txt	/*m'*
@@ -5616,13 +5695,10 @@ mac-vimfile	os_mac.txt	/*mac-vimfile*
 macintosh	os_mac.txt	/*macintosh*
 macro	map.txt	/*macro*
 mail-list	intro.txt	/*mail-list*
-mail-plugin	filetype.txt	/*mail-plugin*
 mail.vim	syntax.txt	/*mail.vim*
 maillist	intro.txt	/*maillist*
 maillist-archive	intro.txt	/*maillist-archive*
-make-syntax	syntax.txt	/*make-syntax*
 make.vim	syntax.txt	/*make.vim*
-man-plugin	filetype.txt	/*man-plugin*
 manual-copyright	usr_01.txt	/*manual-copyright*
 map()	eval.txt	/*map()*
 map-<SID>	map.txt	/*map-<SID>*
@@ -5639,7 +5715,7 @@ map-self-destroy	tips.txt	/*map-self-destroy*
 map-typing	map.txt	/*map-typing*
 map-which-keys	map.txt	/*map-which-keys*
 map.txt	map.txt	/*map.txt*
-map_CTRL_C	map.txt	/*map_CTRL_C*
+map_CTRL-C	map.txt	/*map_CTRL-C*
 map_backslash	map.txt	/*map_backslash*
 map_bar	map.txt	/*map_bar*
 map_empty_rhs	map.txt	/*map_empty_rhs*
@@ -5648,14 +5724,12 @@ map_space_in_lhs	map.txt	/*map_space_in_lhs*
 map_space_in_rhs	map.txt	/*map_space_in_rhs*
 maparg()	eval.txt	/*maparg()*
 mapcheck()	eval.txt	/*mapcheck()*
-maple-syntax	syntax.txt	/*maple-syntax*
 maple.vim	syntax.txt	/*maple.vim*
 mapleader	map.txt	/*mapleader*
 maplocalleader	map.txt	/*maplocalleader*
 mapping	map.txt	/*mapping*
 mark	motion.txt	/*mark*
 mark-motions	motion.txt	/*mark-motions*
-masm-syntax	syntax.txt	/*masm-syntax*
 masm.vim	syntax.txt	/*masm.vim*
 match()	eval.txt	/*match()*
 match-highlight	pattern.txt	/*match-highlight*
@@ -5663,7 +5737,6 @@ matchend()	eval.txt	/*matchend()*
 matchit-install	usr_05.txt	/*matchit-install*
 matchlist()	eval.txt	/*matchlist()*
 matchstr()	eval.txt	/*matchstr()*
-mathematica-syntax	syntax.txt	/*mathematica-syntax*
 max()	eval.txt	/*max()*
 mbyte-IME	mbyte.txt	/*mbyte-IME*
 mbyte-XIM	mbyte.txt	/*mbyte-XIM*
@@ -5684,6 +5757,7 @@ menu-priority	gui.txt	/*menu-priority*
 menu-separator	gui.txt	/*menu-separator*
 menu.vim	gui.txt	/*menu.vim*
 menus	gui.txt	/*menus*
+merge	diff.txt	/*merge*
 message-history	message.txt	/*message-history*
 message.txt	message.txt	/*message.txt*
 messages	message.txt	/*messages*
@@ -5693,7 +5767,6 @@ minimal-features	os_msdos.txt	/*minimal-features*
 missing-options	vi_diff.txt	/*missing-options*
 mkdir()	eval.txt	/*mkdir()*
 mlang.txt	mlang.txt	/*mlang.txt*
-mma-syntax	syntax.txt	/*mma-syntax*
 mma.vim	syntax.txt	/*mma.vim*
 mode()	eval.txt	/*mode()*
 mode-Ex	intro.txt	/*mode-Ex*
@@ -5706,7 +5779,6 @@ modeless-selection	gui.txt	/*modeless-selection*
 modeline	options.txt	/*modeline*
 modeline-local	options.txt	/*modeline-local*
 modeline-version	options.txt	/*modeline-version*
-moo-syntax	syntax.txt	/*moo-syntax*
 moo.vim	syntax.txt	/*moo.vim*
 more-compatible	version5.txt	/*more-compatible*
 more-prompt	message.txt	/*more-prompt*
@@ -5731,7 +5803,6 @@ msdos-mode	gui_w32.txt	/*msdos-mode*
 msdos-problems	os_msdos.txt	/*msdos-problems*
 msdos-termcap	os_msdos.txt	/*msdos-termcap*
 msdos-versions	os_msdos.txt	/*msdos-versions*
-msql-syntax	syntax.txt	/*msql-syntax*
 msql.vim	syntax.txt	/*msql.vim*
 mswin.vim	gui_w32.txt	/*mswin.vim*
 multi-byte	mbyte.txt	/*multi-byte*
@@ -5759,7 +5830,6 @@ mzscheme-vim	if_mzsch.txt	/*mzscheme-vim*
 mzscheme-vimext	if_mzsch.txt	/*mzscheme-vimext*
 mzscheme-window	if_mzsch.txt	/*mzscheme-window*
 n	pattern.txt	/*n*
-nasm-syntax	syntax.txt	/*nasm-syntax*
 nasm.vim	syntax.txt	/*nasm.vim*
 navigation	motion.txt	/*navigation*
 nb-commands	netbeans.txt	/*nb-commands*
@@ -5768,7 +5838,6 @@ nb-functions	netbeans.txt	/*nb-functions*
 nb-messages	netbeans.txt	/*nb-messages*
 nb-special	netbeans.txt	/*nb-special*
 nb-terms	netbeans.txt	/*nb-terms*
-ncf-syntax	syntax.txt	/*ncf-syntax*
 ncf.vim	syntax.txt	/*ncf.vim*
 netbeans	netbeans.txt	/*netbeans*
 netbeans-commands	netbeans.txt	/*netbeans-commands*
@@ -5789,9 +5858,13 @@ netrw	pi_netrw.txt	/*netrw*
 netrw--	pi_netrw.txt	/*netrw--*
 netrw-B	pi_netrw.txt	/*netrw-B*
 netrw-D	pi_netrw.txt	/*netrw-D*
+netrw-NB	pi_netrw.txt	/*netrw-NB*
+netrw-Nb	pi_netrw.txt	/*netrw-Nb*
+netrw-O	pi_netrw.txt	/*netrw-O*
 netrw-R	pi_netrw.txt	/*netrw-R*
 netrw-S	pi_netrw.txt	/*netrw-S*
 netrw-U	pi_netrw.txt	/*netrw-U*
+netrw-a	pi_netrw.txt	/*netrw-a*
 netrw-activate	pi_netrw.txt	/*netrw-activate*
 netrw-b	pi_netrw.txt	/*netrw-b*
 netrw-bookmark	pi_netrw.txt	/*netrw-bookmark*
@@ -5920,6 +5993,7 @@ new-multi-byte	version5.txt	/*new-multi-byte*
 new-multi-lang	version6.txt	/*new-multi-lang*
 new-netrw-explore	version7.txt	/*new-netrw-explore*
 new-network-files	version6.txt	/*new-network-files*
+new-omni-completion	version7.txt	/*new-omni-completion*
 new-operator-mod	version6.txt	/*new-operator-mod*
 new-options-5.2	version5.txt	/*new-options-5.2*
 new-options-5.4	version5.txt	/*new-options-5.4*
@@ -5955,7 +6029,6 @@ not-edited	editing.txt	/*not-edited*
 notation	intro.txt	/*notation*
 notepad	gui_w32.txt	/*notepad*
 nr2char()	eval.txt	/*nr2char()*
-nroff-syntax	syntax.txt	/*nroff-syntax*
 nroff.vim	syntax.txt	/*nroff.vim*
 numbered-function	eval.txt	/*numbered-function*
 o	insert.txt	/*o*
@@ -5966,7 +6039,6 @@ object-motions	motion.txt	/*object-motions*
 object-select	motion.txt	/*object-select*
 objects	index.txt	/*objects*
 obtaining-exted	netbeans.txt	/*obtaining-exted*
-ocaml-syntax	syntax.txt	/*ocaml-syntax*
 ocaml.vim	syntax.txt	/*ocaml.vim*
 ole-activation	if_ole.txt	/*ole-activation*
 ole-eval	if_ole.txt	/*ole-eval*
@@ -6009,10 +6081,8 @@ page-up	intro.txt	/*page-up*
 page_down	intro.txt	/*page_down*
 page_up	intro.txt	/*page_up*
 pager	message.txt	/*pager*
-papp-syntax	syntax.txt	/*papp-syntax*
 papp.vim	syntax.txt	/*papp.vim*
 paragraph	motion.txt	/*paragraph*
-pascal-syntax	syntax.txt	/*pascal-syntax*
 pascal.vim	syntax.txt	/*pascal.vim*
 pattern	pattern.txt	/*pattern*
 pattern-atoms	pattern.txt	/*pattern-atoms*
@@ -6044,7 +6114,6 @@ perl-compiling	if_perl.txt	/*perl-compiling*
 perl-editing	if_perl.txt	/*perl-editing*
 perl-overview	if_perl.txt	/*perl-overview*
 perl-patterns	pattern.txt	/*perl-patterns*
-perl-syntax	syntax.txt	/*perl-syntax*
 perl-using	if_perl.txt	/*perl-using*
 perl.vim	syntax.txt	/*perl.vim*
 pexpr-option	print.txt	/*pexpr-option*
@@ -6052,11 +6121,8 @@ pfn-option	print.txt	/*pfn-option*
 pheader-option	print.txt	/*pheader-option*
 photon-fonts	os_qnx.txt	/*photon-fonts*
 photon-gui	os_qnx.txt	/*photon-gui*
-php-syntax	syntax.txt	/*php-syntax*
 php.vim	syntax.txt	/*php.vim*
-php3-syntax	syntax.txt	/*php3-syntax*
 php3.vim	syntax.txt	/*php3.vim*
-phtml-syntax	syntax.txt	/*phtml-syntax*
 phtml.vim	syntax.txt	/*phtml.vim*
 pi_gzip.txt	pi_gzip.txt	/*pi_gzip.txt*
 pi_netrw.txt	pi_netrw.txt	/*pi_netrw.txt*
@@ -6075,14 +6141,12 @@ ports-6	version6.txt	/*ports-6*
 posix	vi_diff.txt	/*posix*
 posix-compliance	vi_diff.txt	/*posix-compliance*
 posix-screen-size	vi_diff.txt	/*posix-screen-size*
-postscr-syntax	syntax.txt	/*postscr-syntax*
 postscr.vim	syntax.txt	/*postscr.vim*
 postscript-cjk-printing	print.txt	/*postscript-cjk-printing*
 postscript-print-encoding	print.txt	/*postscript-print-encoding*
 postscript-print-trouble	print.txt	/*postscript-print-trouble*
 postscript-print-util	print.txt	/*postscript-print-util*
 postscript-printing	print.txt	/*postscript-printing*
-ppwiz-syntax	syntax.txt	/*ppwiz-syntax*
 ppwiz.vim	syntax.txt	/*ppwiz.vim*
 press-enter	message.txt	/*press-enter*
 press-return	message.txt	/*press-return*
@@ -6092,7 +6156,6 @@ prevnonblank()	eval.txt	/*prevnonblank()*
 print-intro	print.txt	/*print-intro*
 print-options	print.txt	/*print-options*
 print.txt	print.txt	/*print.txt*
-printcap-syntax	syntax.txt	/*printcap-syntax*
 printf()	eval.txt	/*printf()*
 printing	print.txt	/*printing*
 printing-formfeed	print.txt	/*printing-formfeed*
@@ -6100,9 +6163,7 @@ profile	repeat.txt	/*profile*
 profiling	repeat.txt	/*profiling*
 profiling-variable	eval.txt	/*profiling-variable*
 progname-variable	eval.txt	/*progname-variable*
-progress-syntax	syntax.txt	/*progress-syntax*
 progress.vim	syntax.txt	/*progress.vim*
-ptcap-syntax	syntax.txt	/*ptcap-syntax*
 ptcap.vim	syntax.txt	/*ptcap.vim*
 pterm-mouse	options.txt	/*pterm-mouse*
 put	change.txt	/*put*
@@ -6116,11 +6177,9 @@ python-current	if_pyth.txt	/*python-current*
 python-error	if_pyth.txt	/*python-error*
 python-eval	if_pyth.txt	/*python-eval*
 python-examples	if_pyth.txt	/*python-examples*
-python-indent	indent.txt	/*python-indent*
 python-input	if_pyth.txt	/*python-input*
 python-output	if_pyth.txt	/*python-output*
 python-range	if_pyth.txt	/*python-range*
-python-syntax	syntax.txt	/*python-syntax*
 python-vim	if_pyth.txt	/*python-vim*
 python-window	if_pyth.txt	/*python-window*
 python-windows	if_pyth.txt	/*python-windows*
@@ -6133,7 +6192,6 @@ qnx	os_qnx.txt	/*qnx*
 qnx-compiling	os_qnx.txt	/*qnx-compiling*
 qnx-general	os_qnx.txt	/*qnx-general*
 qnx-terminal	os_qnx.txt	/*qnx-terminal*
-quake-syntax	syntax.txt	/*quake-syntax*
 quake.vim	syntax.txt	/*quake.vim*
 quickfix	quickfix.txt	/*quickfix*
 quickfix-6	version6.txt	/*quickfix-6*
@@ -6188,7 +6246,6 @@ read-messages	insert.txt	/*read-messages*
 read-only-share	editing.txt	/*read-only-share*
 read-stdin	version5.txt	/*read-stdin*
 readfile()	eval.txt	/*readfile()*
-readline-syntax	syntax.txt	/*readline-syntax*
 readline.vim	syntax.txt	/*readline.vim*
 recording	repeat.txt	/*recording*
 recover.txt	recover.txt	/*recover.txt*
@@ -6221,13 +6278,13 @@ repeat.txt	repeat.txt	/*repeat.txt*
 repeating	repeat.txt	/*repeating*
 replacing	change.txt	/*replacing*
 replacing-ex	insert.txt	/*replacing-ex*
+reselect-Visual	visual.txt	/*reselect-Visual*
 resolve()	eval.txt	/*resolve()*
 restore-position	tips.txt	/*restore-position*
 restricted-mode	starting.txt	/*restricted-mode*
 retab-example	change.txt	/*retab-example*
 rethrow	eval.txt	/*rethrow*
 reverse()	eval.txt	/*reverse()*
-rexx-syntax	syntax.txt	/*rexx-syntax*
 rexx.vim	syntax.txt	/*rexx.vim*
 rgb.txt	gui_w32.txt	/*rgb.txt*
 rgview	starting.txt	/*rgview*
@@ -6257,7 +6314,6 @@ ruby-evaluate	if_ruby.txt	/*ruby-evaluate*
 ruby-globals	if_ruby.txt	/*ruby-globals*
 ruby-message	if_ruby.txt	/*ruby-message*
 ruby-set_option	if_ruby.txt	/*ruby-set_option*
-ruby-syntax	syntax.txt	/*ruby-syntax*
 ruby-vim	if_ruby.txt	/*ruby-vim*
 ruby-window	if_ruby.txt	/*ruby-window*
 ruby.vim	syntax.txt	/*ruby.vim*
@@ -6297,7 +6353,6 @@ s<CR>	change.txt	/*s<CR>*
 sandbox	eval.txt	/*sandbox*
 save-file	editing.txt	/*save-file*
 save-settings	starting.txt	/*save-settings*
-scheme-syntax	syntax.txt	/*scheme-syntax*
 scheme.vim	syntax.txt	/*scheme.vim*
 scp	pi_netrw.txt	/*scp*
 script	usr_41.txt	/*script*
@@ -6318,7 +6373,7 @@ scroll.txt	scroll.txt	/*scroll.txt*
 scrollbind-quickadj	scroll.txt	/*scrollbind-quickadj*
 scrollbind-relative	scroll.txt	/*scrollbind-relative*
 scrolling	scroll.txt	/*scrolling*
-sdl-syntax	syntax.txt	/*sdl-syntax*
+scrollstart-variable	eval.txt	/*scrollstart-variable*
 sdl.vim	syntax.txt	/*sdl.vim*
 search()	eval.txt	/*search()*
 search-commands	pattern.txt	/*search-commands*
@@ -6326,9 +6381,9 @@ search-offset	pattern.txt	/*search-offset*
 search-pattern	pattern.txt	/*search-pattern*
 search-range	pattern.txt	/*search-range*
 search-replace	change.txt	/*search-replace*
+searchdecl()	eval.txt	/*searchdecl()*
 searchpair()	eval.txt	/*searchpair()*
 section	motion.txt	/*section*
-sed-syntax	syntax.txt	/*sed-syntax*
 sed.vim	syntax.txt	/*sed.vim*
 self	eval.txt	/*self*
 send-money	sponsor.txt	/*send-money*
@@ -6349,9 +6404,7 @@ setreg()	eval.txt	/*setreg()*
 setting-guifont	gui.txt	/*setting-guifont*
 setwinvar()	eval.txt	/*setwinvar()*
 sftp	pi_netrw.txt	/*sftp*
-sgml-syntax	syntax.txt	/*sgml-syntax*
 sgml.vim	syntax.txt	/*sgml.vim*
-sh-syntax	syntax.txt	/*sh-syntax*
 sh.vim	syntax.txt	/*sh.vim*
 shell-window	tips.txt	/*shell-window*
 shell_error-variable	eval.txt	/*shell_error-variable*
@@ -6382,7 +6435,6 @@ soundfold()	eval.txt	/*soundfold()*
 space	intro.txt	/*space*
 spec-customizing	pi_spec.txt	/*spec-customizing*
 spec-how-to-use-it	pi_spec.txt	/*spec-how-to-use-it*
-spec-plugin	filetype.txt	/*spec-plugin*
 spec-setting-a-map	pi_spec.txt	/*spec-setting-a-map*
 spec_chglog_format	pi_spec.txt	/*spec_chglog_format*
 spec_chglog_prepend	pi_spec.txt	/*spec_chglog_prepend*
@@ -6390,35 +6442,38 @@ spec_chglog_release_info	pi_spec.txt	/*spec_chglog_release_info*
 special-buffers	windows.txt	/*special-buffers*
 speed-up	tips.txt	/*speed-up*
 spell	spell.txt	/*spell*
+spell-BAD	spell.txt	/*spell-BAD*
 spell-CMP	spell.txt	/*spell-CMP*
 spell-COMPOUNDFLAG	spell.txt	/*spell-COMPOUNDFLAG*
 spell-COMPOUNDFLAGS	spell.txt	/*spell-COMPOUNDFLAGS*
 spell-COMPOUNDMAX	spell.txt	/*spell-COMPOUNDMAX*
 spell-COMPOUNDMIN	spell.txt	/*spell-COMPOUNDMIN*
 spell-COMPOUNDSYLMAX	spell.txt	/*spell-COMPOUNDSYLMAX*
+spell-FLAG	spell.txt	/*spell-FLAG*
+spell-FOL	spell.txt	/*spell-FOL*
+spell-KEP	spell.txt	/*spell-KEP*
+spell-LOW	spell.txt	/*spell-LOW*
+spell-MAP	spell.txt	/*spell-MAP*
+spell-NEEDAFFIX	spell.txt	/*spell-NEEDAFFIX*
+spell-NEEDCOMPOUND	spell.txt	/*spell-NEEDCOMPOUND*
+spell-NOBREAK	spell.txt	/*spell-NOBREAK*
+spell-PFX	spell.txt	/*spell-PFX*
+spell-PFXPOSTPONE	spell.txt	/*spell-PFXPOSTPONE*
+spell-RAR	spell.txt	/*spell-RAR*
+spell-REP	spell.txt	/*spell-REP*
+spell-SAL	spell.txt	/*spell-SAL*
+spell-SFX	spell.txt	/*spell-SFX*
+spell-SLASH	spell.txt	/*spell-SLASH*
+spell-SOFOFROM	spell.txt	/*spell-SOFOFROM*
+spell-SOFOTO	spell.txt	/*spell-SOFOTO*
 spell-SYLLABLE	spell.txt	/*spell-SYLLABLE*
-spell-affix-BAD	spell.txt	/*spell-affix-BAD*
-spell-affix-FOL	spell.txt	/*spell-affix-FOL*
-spell-affix-KEP	spell.txt	/*spell-affix-KEP*
-spell-affix-LOW	spell.txt	/*spell-affix-LOW*
-spell-affix-MAP	spell.txt	/*spell-affix-MAP*
-spell-affix-NEEDAFFIX	spell.txt	/*spell-affix-NEEDAFFIX*
-spell-affix-PFX	spell.txt	/*spell-affix-PFX*
-spell-affix-PFXPOSTPONE	spell.txt	/*spell-affix-PFXPOSTPONE*
-spell-affix-RAR	spell.txt	/*spell-affix-RAR*
-spell-affix-REP	spell.txt	/*spell-affix-REP*
-spell-affix-SAL	spell.txt	/*spell-affix-SAL*
-spell-affix-SFX	spell.txt	/*spell-affix-SFX*
-spell-affix-SLASH	spell.txt	/*spell-affix-SLASH*
-spell-affix-SOFOFROM	spell.txt	/*spell-affix-SOFOFROM*
-spell-affix-SOFOTO	spell.txt	/*spell-affix-SOFOTO*
-spell-affix-UPP	spell.txt	/*spell-affix-UPP*
+spell-UPP	spell.txt	/*spell-UPP*
 spell-affix-chars	spell.txt	/*spell-affix-chars*
-spell-affix-compound	spell.txt	/*spell-affix-compound*
 spell-affix-mbyte	spell.txt	/*spell-affix-mbyte*
 spell-affix-nocomp	spell.txt	/*spell-affix-nocomp*
 spell-affix-rare	spell.txt	/*spell-affix-rare*
 spell-affix-vim	spell.txt	/*spell-affix-vim*
+spell-compound	spell.txt	/*spell-compound*
 spell-dic-format	spell.txt	/*spell-dic-format*
 spell-double-scoring	spell.txt	/*spell-double-scoring*
 spell-file-format	spell.txt	/*spell-file-format*
@@ -6428,6 +6483,7 @@ spell-midword	spell.txt	/*spell-midword*
 spell-mkspell	spell.txt	/*spell-mkspell*
 spell-quickstart	spell.txt	/*spell-quickstart*
 spell-remarks	spell.txt	/*spell-remarks*
+spell-russian	spell.txt	/*spell-russian*
 spell-syntax	spell.txt	/*spell-syntax*
 spell-wordlist-format	spell.txt	/*spell-wordlist-format*
 spell-yiddish	spell.txt	/*spell-yiddish*
@@ -6441,11 +6497,8 @@ sponsor	sponsor.txt	/*sponsor*
 sponsor-faq	sponsor.txt	/*sponsor-faq*
 sponsor.txt	sponsor.txt	/*sponsor.txt*
 spoon	os_unix.txt	/*spoon*
-spup-syntax	syntax.txt	/*spup-syntax*
 spup.vim	syntax.txt	/*spup.vim*
-sql-syntax	syntax.txt	/*sql-syntax*
 sql.vim	syntax.txt	/*sql.vim*
-sqlinformix-syntax	syntax.txt	/*sqlinformix-syntax*
 sqlinformix.vim	syntax.txt	/*sqlinformix.vim*
 sscanf	eval.txt	/*sscanf*
 standard-plugin	usr_05.txt	/*standard-plugin*
@@ -6692,6 +6745,7 @@ tag-search	tagsrch.txt	/*tag-search*
 tag-security	tagsrch.txt	/*tag-security*
 tag-skip-file	tagsrch.txt	/*tag-skip-file*
 tag-stack	tagsrch.txt	/*tag-stack*
+tagfiles()	eval.txt	/*tagfiles()*
 taglist()	eval.txt	/*taglist()*
 tags	tagsrch.txt	/*tags*
 tags-and-searches	tagsrch.txt	/*tags-and-searches*
@@ -6743,7 +6797,6 @@ tcl-window-expr	if_tcl.txt	/*tcl-window-expr*
 tcl-window-height	if_tcl.txt	/*tcl-window-height*
 tcl-window-option	if_tcl.txt	/*tcl-window-option*
 tcsh-style	cmdline.txt	/*tcsh-style*
-tcsh-syntax	syntax.txt	/*tcsh-syntax*
 tcsh.vim	syntax.txt	/*tcsh.vim*
 tear-off-menus	gui.txt	/*tear-off-menus*
 telnet-CTRL-]	tagsrch.txt	/*telnet-CTRL-]*
@@ -6758,7 +6811,6 @@ termcap-changed	version4.txt	/*termcap-changed*
 termcap-colors	term.txt	/*termcap-colors*
 termcap-cursor-color	term.txt	/*termcap-cursor-color*
 termcap-cursor-shape	term.txt	/*termcap-cursor-shape*
-termcap-syntax	syntax.txt	/*termcap-syntax*
 termcap-title	term.txt	/*termcap-title*
 terminal-colors	os_unix.txt	/*terminal-colors*
 terminal-info	term.txt	/*terminal-info*
@@ -6771,11 +6823,9 @@ tex-math	syntax.txt	/*tex-math*
 tex-runon	syntax.txt	/*tex-runon*
 tex-slow	syntax.txt	/*tex-slow*
 tex-style	syntax.txt	/*tex-style*
-tex-syntax	syntax.txt	/*tex-syntax*
 tex.vim	syntax.txt	/*tex.vim*
 text-objects	motion.txt	/*text-objects*
 text-objects-changed	version5.txt	/*text-objects-changed*
-tf-syntax	syntax.txt	/*tf-syntax*
 tf.vim	syntax.txt	/*tf.vim*
 this_session-variable	eval.txt	/*this_session-variable*
 throw-catch	eval.txt	/*throw-catch*
@@ -6909,6 +6959,7 @@ v:prevcount	eval.txt	/*v:prevcount*
 v:profiling	eval.txt	/*v:profiling*
 v:progname	eval.txt	/*v:progname*
 v:register	eval.txt	/*v:register*
+v:scrollstart	eval.txt	/*v:scrollstart*
 v:servername	eval.txt	/*v:servername*
 v:shell_error	eval.txt	/*v:shell_error*
 v:statusmsg	eval.txt	/*v:statusmsg*
@@ -7028,10 +7079,8 @@ various	various.txt	/*various*
 various-cmds	various.txt	/*various-cmds*
 various-motions	motion.txt	/*various-motions*
 various.txt	various.txt	/*various.txt*
-vb-syntax	syntax.txt	/*vb-syntax*
 vb.vim	syntax.txt	/*vb.vim*
 verbose	starting.txt	/*verbose*
-verilog-indent	indent.txt	/*verilog-indent*
 version-5.1	version5.txt	/*version-5.1*
 version-5.2	version5.txt	/*version-5.2*
 version-5.3	version5.txt	/*version-5.3*
@@ -7043,6 +7092,7 @@ version-5.8	version5.txt	/*version-5.8*
 version-6.1	version6.txt	/*version-6.1*
 version-6.2	version6.txt	/*version-6.2*
 version-6.3	version6.txt	/*version-6.3*
+version-6.4	version6.txt	/*version-6.4*
 version-variable	eval.txt	/*version-variable*
 version4.txt	version4.txt	/*version4.txt*
 version5.txt	version5.txt	/*version5.txt*
@@ -7061,14 +7111,12 @@ vim-announce	intro.txt	/*vim-announce*
 vim-arguments	starting.txt	/*vim-arguments*
 vim-default-editor	gui_w32.txt	/*vim-default-editor*
 vim-dev	intro.txt	/*vim-dev*
-vim-indent	indent.txt	/*vim-indent*
 vim-kpart	gui_x11.txt	/*vim-kpart*
 vim-mac	intro.txt	/*vim-mac*
 vim-modes	intro.txt	/*vim-modes*
 vim-modes-intro	intro.txt	/*vim-modes-intro*
 vim-multibyte	intro.txt	/*vim-multibyte*
 vim-script-intro	usr_41.txt	/*vim-script-intro*
-vim-syntax	syntax.txt	/*vim-syntax*
 vim-variable	eval.txt	/*vim-variable*
 vim.vim	syntax.txt	/*vim.vim*
 vim:	options.txt	/*vim:*
@@ -7211,7 +7259,6 @@ x-resources	version5.txt	/*x-resources*
 x11-clientserver	remote.txt	/*x11-clientserver*
 x11-cut-buffer	gui_x11.txt	/*x11-cut-buffer*
 x11-selection	gui_x11.txt	/*x11-selection*
-xf86conf-syntax	syntax.txt	/*xf86conf-syntax*
 xf86conf.vim	syntax.txt	/*xf86conf.vim*
 xfontset	mbyte.txt	/*xfontset*
 xfree-xterm	syntax.txt	/*xfree-xterm*
@@ -7219,9 +7266,7 @@ xim	mbyte.txt	/*xim*
 xim-input-style	mbyte.txt	/*xim-input-style*
 xiterm	syntax.txt	/*xiterm*
 xml-folding	syntax.txt	/*xml-folding*
-xml-syntax	syntax.txt	/*xml-syntax*
 xml.vim	syntax.txt	/*xml.vim*
-xpm-syntax	syntax.txt	/*xpm-syntax*
 xpm.vim	syntax.txt	/*xpm.vim*
 xterm-8-bit	term.txt	/*xterm-8-bit*
 xterm-8bit	term.txt	/*xterm-8bit*
@@ -7292,6 +7337,13 @@ zf	fold.txt	/*zf*
 zg	spell.txt	/*zg*
 zh	scroll.txt	/*zh*
 zi	fold.txt	/*zi*
+zip	zip.txt	/*zip*
+zip-contents	zip.txt	/*zip-contents*
+zip-copyright	zip.txt	/*zip-copyright*
+zip-history	zip.txt	/*zip-history*
+zip-manual	zip.txt	/*zip-manual*
+zip-usage	zip.txt	/*zip-usage*
+zip.txt	zip.txt	/*zip.txt*
 zj	fold.txt	/*zj*
 zk	fold.txt	/*zk*
 zl	scroll.txt	/*zl*

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 Aug 21
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Oct 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,23 +30,31 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Spelling:
-- New hunspell home page: http://hunspell.sourceforge.net/
+ccomplete:
+- When an option is set: In completion mode and the user types (identifier)
+  characters, advance to the first match instead of removing the popup menu.
+  If there is no match remove the selection. (Yegappan Lakshmanan)
+- When completing something that is a structure, add the "." or "->".
+- When a typedef or struct is local to a file only use it in that file?
 
-- Implement multiple flags for compound words and CMP item?
-  Await comments from other spell checking authors.
-
-Help tags: something to make it easy to find help about a certain filetype?
-    use ft-c-syntax ft-c-ftplugin etc.?
-
-Mac GUI: pasting lines results in ^M instead of line breaks. (Benjamin Esham)
+spelling:
+- When a recognized word ends in a . don't have 'spellcapcheck" match it.
+- Use KEEPCASE instead of "KEP".  applies to affixes too.
+- Look into hungarian dictionary:
+  http://magyarispell.sourceforge.net/rc3-beta2.zip
 
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
+- Command-key mappings do not work. (Alan Schmitt)
+- Add default key mappings for the command key (Alan Schmitt)
+    use http://macvim.org/OSX/files/gvimrc
+- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
+  (Alan Schmitt)
 
 Win32: Use the free downloadable compiler 7.1.  Figure out how to do debugging
 (with Agide?) and describe it. (George Reilly)
+Try out using the free MS compiler and debugger, using Make_mvc.mak.
 
 Autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
@@ -59,6 +67,8 @@ Autoload:
     helpfile doc/myscript.txt
   For the "helpfile" item ":helptags" is run.
 
+Add ":smap", Select mode mapping?
+
 Awaiting response:
 -   Win32: tearoff menu window should have a scrollbar when it's taller than
     the screen.
@@ -67,27 +77,31 @@ Awaiting response:
 
 PLANNED FOR VERSION 7.0:
 
--   Occult completion: Understands the programming language and finds matches
+-   Omni 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.
+    mechanism.  Use CTRL-X CTRL-O and 'omnifunc'.  Set 'omnifunc' 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.
 
-    First cleanup the Insert-mode completion.
-
     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).
+    - GUI implementation of the popup menu.
+    - When using tags, show match in preview window (function prototype,
+      struct member, etc.).
+      Or use one window for matches, another for context/info (Doug Kearns,
+      2005 Sep 13)
+    - Ideas on: http://www.wholetomato.com/
+
 
     Completion logic:
-	Use something like 'completefunc'?
-	runtime/complete/{filetype}.vim files?
+	Use runtime/autoload/{filetype}complete.vim files.
+
 	In function arguments suggest variables of expected type.
+	Tags file has "signature" field.
+
 	List of completions is a Dictionary with items:
 	    complist[0]['text'] = completion text
 	    complist[0]['type'] = type of completion (e.g. function, var, arg)
@@ -95,14 +109,24 @@ PLANNED FOR VERSION 7.0:
 	    complist[0]['helpfunc'] = function that shows help text
 	    etc.
 
+	Can CTRL-] (jump to tag) include the "." and "->" to restrict the
+	number of possible matches? (Flemming Madsen)
+
+	In general: Besides completion, figure out the type of a variable
+	and use it for information.
+
 	Ideas from others:
 	http://www.vim.org/scripts/script.php?script_id=747
 	    http://sourceforge.net/projects/insenvim
-		of http://insenvim.sourceforge.net
+		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
+	    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').
@@ -192,6 +216,8 @@ PLANNED FOR VERSION 7.0:
 8   Support four composing/combining characters, needed for Hebrew. (Ron Aaron)
     Add the 'maxcombining' option to set the nr. of composing characters.
     At the same time support more colors (use two bytes when necessary).
+8   Searching for a composing character by itself should work.  Perhaps "."
+    with a composing char should work too.
 -   Add a few more things to 'diffopt': "horizontal", "vertical",
     "foldcolumn". (Benji Fisher, 2004 Jun 21)
 -   FileChangedShellPost autocommand event: after (not) reloading a changed
@@ -481,6 +507,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.
@@ -560,8 +589,7 @@ Win32 GUI known bugs:
     Opposite of 'linespace': 'columnspace'.
 7   At the hit-enter prompt scrolling now no longer works.  Need to use the
     keyboard to get around this.  Pretend <CR> was hit when the user tries to
-    scroll?  Need to be able to get out of hit-enter prompt with the mouse
-    anyway.
+    scroll?
 7   Scrollbar width doesn't change when selecting other windows appearance.
     Also background color of Toolbar and rectangle below vert. scrollbar.
 7   "!start /min cmd" should run in a minimized window, instead of using
@@ -763,7 +791,7 @@ MSDOS, OS/2 and Win32:
 8   OS/2: Add Extended Attributes support and define HAVE_ACL.
 8   OS/2: When editing a file name "foo.txt" that is actually called FOO.txt,
     writing uses "foo.txt".  Should obtain the real file name.
-8   Should $USERPROFILE be used instead of $HOMEDRIVE/$HOMEPATH?
+8   Should $USERPROFILE be preferred above $HOMEDRIVE/$HOMEPATH?
 8   Win32 console: <M-Up> and <M-Down> don't work. (Geddes)  We don't have
     special keys for these.  Should use modifier + key.
 8   Win32 console: caps-lock makes non-alpha keys work like with shift.
@@ -828,6 +856,7 @@ Amiga:
 
 
 Macintosh:
+7   Implement "undercurl".
 7   Patch to add 'transparency' option.  Disadvantage: it's slow. (Eckehard
     Berns, 2004 May 9) http://ecki.to/vim/TransBack-2004-05-09.diff
     Needs more work.  Add when someone really wants it.
@@ -1303,6 +1332,44 @@ 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/
+    - Version 1.1.0 is out now, look into that.
+    - 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
@@ -1432,6 +1499,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
@@ -1665,7 +1736,6 @@ Built-in script language:
 	filecopy(from, to)	Copy a file
 	shorten(fname)		shorten a file name, like home_replace()
 	perl(cmd)		call Perl and return string
-	input(prompt, complete)	like input() but do specified completion
 	inputrl()		like input() but right-to-left
 	virtualmode()		add argument to obtain whether "$" was used in
 				Visual block mode.
@@ -3582,6 +3652,11 @@ From vile:
 
 
 Far future and "big" extensions:
+-   Instead of using a Makefile and autoconf, use a simple shell script to
+    find the C compiler and do everything with C code.  Translate something
+    like an Aap recipe and configure.in to C.  Avoids depending on Python,
+    thus will work everywhere.  With batch file to find the C compiler it
+    would also work on MS-Windows.
 -   Make it easy to setup Vim for groups of users: novice vi users, novice
     Vim users, C programmers, xterm users, GUI users,...
 -   Change layout of blocks in swap file: Text at the start, with '\n' in

runtime/doc/usr_05.txt

@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.0aa.  Last change: 2005 Feb 08
+*usr_05.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 04
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -327,6 +327,11 @@ Example for Unix (assuming you didn't have a plugin directory yet): >
 That's all!  Now you can use the commands defined in this plugin to justify
 text.
 
+Instead of putting plugins directly into the plugin/ directory, you may
+better organize them by putting them into subdirectories under plugin/.
+As an example, consider using "~/.vim/plugin/perl/*.vim" for all your Perl
+plugins.
+
 
 FILETYPE PLUGINS			*add-filetype-plugin* *ftplugins*
 

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.
@@ -487,10 +489,11 @@ N  *+X11*		Unix only: can restore window title |X11|
 
 							*:verbose-cmd*
 When 'verbose' is non-zero, listing the value of a Vim option or a key map or
-a user-defined function or a command or a highlight group 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.
+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*

runtime/doc/version6.txt

@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 18
+*version6.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -80,6 +80,11 @@ Changed					|changed-6.3|
 Added					|added-6.3|
 Fixed					|fixed-6.3|
 
+VERSION 6.4			|version-6.4|
+Changed					|changed-6.4|
+Added					|added-6.4|
+Fixed					|fixed-6.4|
+
 ==============================================================================
 INCOMPATIBLE CHANGES				*incompatible-6*
 
@@ -13841,4 +13846,630 @@ Problem:    After Visually selecting four characters, changing it to other
 Solution:   Don't store the size of the Visual area when redo is active.
 Files:	    src/normal.c
 
+==============================================================================
+VERSION 6.4						*version-6.4*
+
+This section is about improvements made between version 6.3 and 6.4.
+
+This is a bug-fix release.  There are also a few new features.  The major
+number of new items is in the runtime files and translations.
+
+The big MS-Windows version now uses:
+	Ruby version 1.8.3
+	Perl version 5.8.7
+	Python version 2.4.2
+
+
+Changed							*changed-6.4*
+-------
+
+Nothing relevant.
+
+
+Added							*added-6.4*
+-----
+
+Netrc syntax file. (Nikolai Weibull)
+Sudoers syntax file. (Nikolai Weibull)
+SMTPrc syntax file. (Kornel Kielczewski)
+Esterel syntax file. (Maurizio Tranchero)
+
+
+Fixed							*fixed-6.4*
+-----
+
+"dFxd;" deleted the character under the cursor, "d;" didn't remember the
+exclusiveness of the motion.
+
+When using "set laststatus=2 cmdheight=2" in the .gvimrc you may only get one
+line for the cmdline. (Christian Robinson)  Invoke command_height() after the
+GUI has started up.
+
+Gcc would warn "dereferencing type-punned pointer will break strict -aliasing
+rules".  Avoid using typecasts for variable pointers.
+
+Patch 6.3.001
+Problem:    ":browse split" gives the file selection dialog twice. (Gordon
+	    Bazeley)  Same problem for ":browse diffpatch".
+Solution:   Reset cmdmod.browse before calling do_ecmd().
+Files:	    src/diff.c, src/ex_docmd.c
+
+Patch 6.3.002
+Problem:    When using translated help files with non-ASCII latin1 characters
+	    in the first line the utf-8 detection is wrong.
+Solution:   Properly detect utf-8 characters.  When a mix of encodings is
+	    detected continue with the next language and avoid a "no matches"
+	    error because of "got_int" being set.  Add the directory name to
+	    the error message for a duplicate tag.
+Files:	    src/ex_cmds.c
+
+Patch 6.3.003
+Problem:    Crash when using a console dialog and the first choice does not
+	    have a default button. (Darin Ohashi)
+Solution:   Allocate two more characters for the [] around the character for
+	    the default choice.
+Files:	    src/message.c
+
+Patch 6.3.004
+Problem:    When searching for a long string (140 chars in a 80 column
+	    terminal) get three hit-enter prompts. (Robert Webb)
+Solution:   Avoid the hit-enter prompt when giving the message for wrapping
+	    around the end of the buffer.  Don't give that message again when
+	    the string was not found.
+Files:	    src/message.c, src/search.c
+
+Patch 6.3.005
+Problem:    Crash when searching for a pattern with a character offset and
+	    starting in a closed fold. (Frank Butler)
+Solution:   Check for the column to be past the end of the line.  Also fix
+	    that a pattern with a character offset relative to the end isn't
+	    read back from the viminfo properly.
+Files:	    src/search.c
+
+Patch 6.3.006
+Problem:    ":breakadd file *foo" prepends the current directory to the file
+	    pattern. (Hari Krishna Dara)
+Solution:   Keep the pattern as-is.
+Files:	    src/ex_cmds2.c
+
+Patch 6.3.007
+Problem:    When there is a buffer with 'buftype' set to "nofile" and using a
+	    ":cd" command, the swap file is not deleted when exiting.
+Solution:   Use the full path of the swap file also for "nofile" buffers.
+Files:	    src/fileio.c
+
+Patch 6.3.008
+Problem:    Compiling fails under OS/2.
+Solution:   Include "e_screenmode" also for OS/2. (David Sanders)
+Files:	    src/globals.h
+
+Patch 6.3.009 (after 6.3.006)
+Problem:    ":breakadd file /path/foo.vim" does not match when a symbolic link
+	    is involved.  (Servatius Brandt)
+Solution:   Do expand the pattern when it does not start with "*".
+Files:	    runtime/doc/repeat.txt, src/ex_cmds2.c
+
+Patch 6.3.010
+Problem:    When writing to a named pipe there is an error for fsync()
+	    failing.
+Solution:   Ignore the fsync() error for devices.
+Files:	    src/fileio.c
+
+Patch 6.3.011
+Problem:    Crash when the completion function of a user-command uses a
+	    "normal :cmd" command.  (Hari Krishna Dara)
+Solution:   Save the command line when invoking the completion function.
+Files:	    src/ex_getln.c
+
+Patch 6.3.012
+Problem:    Internal lalloc(0) error when using a complicated multi-line
+	    pattern in a substitute command. (Luc Hermitte)
+Solution:   Avoid going past the end of a line.
+Files:	    src/ex_cmds.c
+
+Patch 6.3.013
+Problem:    Crash when editing a command line and typing CTRL-R = to evaluate
+	    a function that uses "normal :cmd". (Hari Krishna Dara)
+Solution:   Save and restore the command line when evaluating an expression
+	    for CTRL-R =.
+Files:	    src/ex_getln.c, src/ops.c, src/proto/ex_getln.pro,
+	    src/proto/ops.pro
+
+Patch 6.3.014
+Problem:    When using Chinese or Taiwanese the default for 'helplang' is
+	    wrong. (Simon Liang)
+Solution:   Use the part of the locale name after "zh_".
+Files:	    src/option.c
+
+Patch 6.3.015
+Problem:    The string that winrestcmd() returns may end in garbage.
+Solution:   NUL-terminate the string. (Walter Briscoe)
+Files:	    src/eval.c
+
+Patch 6.3.016
+Problem:    The default value for 'define' has "\s" before '#'.
+Solution:   Add a star after "\s". (Herculano de Lima Einloft Neto)
+Files:	    src/option.c
+
+Patch 6.3.017
+Problem:    "8zz" may leave the cursor beyond the end of the line. (Niko
+	    Maatjes)
+Solution:   Correct the cursor column after moving to another line.
+Files:	    src/normal.c
+
+Patch 6.3.018
+Problem:    ":0argadd zero" added the argument after the first one, instead of
+	    before it. (Adri Verhoef)
+Solution:   Accept a zero range for ":argadd".
+Files:	    src/ex_cmds.h
+
+Patch 6.3.019
+Problem:    Crash in startup for debug version. (David Rennals)
+Solution:   Move the call to nbdebug_wait() to after allocating NameBuff.
+Files:	    src/main.c
+
+Patch 6.3.020
+Problem:    When 'encoding' is "utf-8" and 'delcombine' is set, "dw" does not
+	    delete a word but only a combining character of the first
+	    character, if there is one. (Raphael Finkel)
+Solution:   Correctly check that one character is being deleted.
+Files:	    src/misc1.c
+
+Patch 6.3.021
+Problem:    When the last character of a file name is a multi-byte character
+	    and the last byte is a path separator, the file cannot be edited.
+Solution:   Check for the last byte to be part of a multi-byte character.
+	    (Taro Muraoka)
+Files:	    src/fileio.c
+
+Patch 6.3.022 (extra)
+Problem:    Win32: When the last character of a file name is a multi-byte
+	    character and the last byte is a path separator, the file cannot
+	    be written.  A trail byte that is a space makes that a file cannot
+	    be opened from the command line.
+Solution:   Recognize double-byte characters when parsing the command line.
+	    In mch_stat() check for the last byte to be part of a multi-byte
+	    character.  (Taro Muraoka)
+Files:	    src/gui_w48.c, src/os_mswin.c
+
+Patch 6.3.023
+Problem:    When the "to" part of a mapping starts with its "from" part,
+	    abbreviations for the same characters is not possible.  For
+	    example, when <Space> is mapped to something that starts with a
+	    space, typing <Space> does not expand abbreviations.
+Solution:   Only disable expanding abbreviations when a mapping is not
+	    remapped, don't disable it when the RHS of a mapping starts with
+	    the LHS.
+Files:	    src/getchar.c, src/vim.h
+
+Patch 6.3.024
+Problem:    In a few places a string in allocated memory is not terminated
+	    with a NUL.
+Solution:   Add ga_append(NUL) in script_get(), gui_do_findrepl() and
+	    serverGetVimNames().
+Files:	    src/ex_getln.c, src/gui.c, src/if_xcmdsrv.c, src/os_mswin.c
+
+Patch 6.3.025 (extra)
+Problem:    Missing NUL for list of server names.
+Solution:   Add ga_append(NUL) in serverGetVimNames().
+Files:	    src/os_mswin.c
+
+Patch 6.3.026
+Problem:    When ~/.vim/after/syntax/syncolor.vim contains a command that
+	    reloads the colors an enless loop and/or a crash may occur.
+Solution:   Only free the old value of an option when it was originally
+	    allocated.  Limit recursiveness of init_highlight() to 5 levels.
+Files:	    src/option.c, src/syntax.c
+
+Patch 6.3.027
+Problem:    VMS: Writing a file may insert extra CR characters.  Not all
+	    terminals are recognized correctly.  Vt320 doesn't support colors.
+	    Environment variables are not expanded correctly.
+Solution:   Use another method to write files.  Add vt320 termcap codes for
+	    colors.  (Zoltan Arpadffy)
+Files:	    src/fileio.c, src/misc1.c, src/os_unix.c, src/structs.h,
+	    src/term.c
+
+Patch 6.3.028
+Problem:    When appending to a file the BOM marker may be written.  (Alex
+	    Jakushev)
+Solution:   Do not write the BOM marker when appending.
+Files:	    src/fileio.c
+
+Patch 6.3.029
+Problem:    Crash when inserting a line break. (Walter Briscoe)
+Solution:   In the syntax highlighting code, don't use an old state after a
+	    change was made, current_col may be past the end of the line.
+Files:	    src/syntax.c
+
+Patch 6.3.030
+Problem:    GTK 2: Crash when sourcing a script that deletes the menus, sets
+	    'encoding' to "utf-8" and loads the menus again.  GTK error
+	    message when tooltip text is in a wrong encoding.
+Solution:   Don't copy characters from the old screen to the new screen when
+	    switching 'encoding' to utf-8, they may be invalid.  Only set the
+	    tooltip when it is valid utf-8.
+Files:	    src/gui_gtk.c, src/mbyte.c, src/proto/mbyte.pro, src/screen.c
+
+Patch 6.3.031
+Problem:    When entering a mapping and pressing Tab halfway the command line
+	    isn't redrawn properly. (Adri Verhoef)
+Solution:   Reposition the cursor after drawing over the "..." of the
+	    completion attempt.
+Files:	    src/ex_getln.c
+
+Patch 6.3.032
+Problem:    Using Python 2.3 with threads doesn't work properly.
+Solution:   Release the lock after initialization.
+Files:	    src/if_python.c
+
+Patch 6.3.033
+Problem:    When a mapping ends in a Normal mode command of more than one
+	    character Vim doesn't return to Insert mode.
+Solution:   Check that the mapping has ended after obtaining all characters of
+	    the Normal mode command.
+Files:	    src/normal.c
+
+Patch 6.3.034
+Problem:    VMS: crash when using ":help". 
+Solution:   Avoid using "tags-??", some Open VMS systems can't handle the "?"
+	    wildcard.  (Zoltan Arpadffy)
+Files:	    src/tag.c
+
+Patch 6.3.035 (extra)
+Problem:    RISC OS: Compile errors.
+Solution:   Change e_screnmode to e_screenmode.  Change the way
+	    __riscosify_control is set.  Improve the makefile.  (Andy Wingate)
+Files:	    src/os_riscos.c, src/search.c, src/Make_ro.mak
+
+Patch 6.3.036
+Problem:    ml_get errors when the whole file is a fold, switching
+	    'foldmethod' and doing "zj". (Christian J. Robinson) Was not
+	    deleting the fold but creating a fold with zero lines.
+Solution:   Delete the fold properly.
+Files:	    src/fold.c
+
+Patch 6.3.037 (after 6.3.032)
+Problem:    Warning for unused variable.
+Solution:   Change the #ifdefs for the saved thread stuff.
+Files:	    src/if_python.c
+
+Patch 6.3.038 (extra)
+Problem:    Win32: When the "file changed" dialog pops up after a click that
+	    gives gvim focus and not moving the mouse after that, the effect
+	    of the click may occur when moving the mouse later. (Ken Clark)
+	    Happened because the release event was missed.
+Solution:   Clear the s_button_pending variable when any input is received.
+Files:	    src/gui_w48.c
+
+Patch 6.3.039
+Problem:    When 'number' is set and inserting lines just above the first
+	    displayed line (in another window on the same buffer), the line
+	    numbers are not updated.  (Hitier Sylvain)
+Solution:   When 'number' is set and lines are inserted/deleted redraw all
+	    lines below the change.
+Files:	    src/screen.c
+
+Patch 6.3.040
+Problem:    Error handling does not always work properly and may cause a
+	    buffer to be marked as if it's viewed in a window while it isn't.
+	    Also when selecting "Abort" at the attention prompt.
+Solution:   Add enter_cleanup() and leave_cleanup() functions to move
+	    saving/restoring things for error handling to one place.
+	    Clear a buffer read error when it's unloaded.
+Files:	    src/buffer.c, src/ex_docmd.c, src/ex_eval.c,
+	    src/proto/ex_eval.pro, src/structs.h, src/vim.h
+
+Patch 6.3.041 (extra)
+Problem:    Win32: When the path to a file has Russian characters, ":cd %:p:h"
+	    doesn't work. (Valery Kondakoff)
+Solution:   Use a wide function to change directory.
+Files:	    src/os_mswin.c
+
+Patch 6.3.042
+Problem:    When there is a closed fold at the top of the window, CTRL-X
+	    CTRL-E in Insert mode reduces the size of the fold instead of
+	    scrolling the text up. (Gautam)
+Solution:   Scroll over the closed fold.
+Files:	    src/move.c
+
+Patch 6.3.043
+Problem:    'hlsearch' highlighting sometimes disappears when inserting text
+	    in PHP code with syntax highlighting. (Marcel Svitalsky)
+Solution:   Don't use pointers to remember where a match was found, use an
+	    index.  The pointers may become invalid when searching in other
+	    lines.
+Files:	    src/screen.c
+
+Patch 6.3.044 (extra)
+Problem:    Mac: When 'linespace' is non-zero the Insert mode cursor leaves
+	    pixels behind. (Richard Sandilands)
+Solution:   Erase the character cell before drawing the text when needed.
+Files:	    src/gui_mac.c
+
+
+Patch 6.3.045
+Problem:    Unusual characters in an option value may cause unexpected
+	    behavior, especially for a modeline. (Ciaran McCreesh)
+Solution:   Don't allow setting termcap options or 'printdevice' in a
+	    modeline.  Don't list options for "termcap" and "all" in a
+	    modeline.  Don't allow unusual characters in 'filetype', 'syntax',
+	    'backupext', 'keymap', 'patchmode' and 'langmenu'.
+Files:	    src/option.c, runtime/doc/options.txt
+
+Patch 6.3.046
+Problem:    ":registers" doesn't show multi-byte characters properly.
+	    (Valery Kondakoff)
+Solution:   Get the length of each character before displaying it.
+Files:	    src/ops.c
+
+Patch 6.3.047 (extra)
+Problem:    Win32 with Borland C 5.5 on Windows XP: A new file is created with
+	    read-only attributes. (Tony Mechelynck)
+Solution:   Don't use the _wopen() function for Borland.
+Files:	    src/os_win32.c
+
+Patch 6.3.048 (extra)
+Problem:    Build problems with VMS on IA64.
+Solution:   Add dependencies to the build file. (Zoltan Arpadffy)
+Files:	    src/Make_vms.mms
+
+Patch 6.3.049 (after 6.3.045)
+Problem:    Compiler warning for "char" vs "char_u" mixup. (Zoltan Arpadffy)
+Solution:   Add a typecast.
+Files:	    src/option.c
+
+Patch 6.3.050
+Problem:    When SIGHUP is received while busy exiting, non-reentrant
+	    functions such as free() may cause a crash.
+Solution:   Ignore SIGHUP when exiting because of an error. (Scott Anderson)
+Files:	    src/misc1.c, src/main.c
+
+Patch 6.3.051
+Problem:    When 'wildmenu' is set and completed file names contain multi-byte
+	    characters Vim may crash.
+Solution:   Reserve room for multi-byte characters. (Yasuhiro Matsumoto)
+Files:	    src/screen.c
+
+Patch 6.3.052 (extra)
+Problem:    Windows 98: typed keys that are not ASCII may not work properly.
+	    For example with a Russian input method. (Jiri Jezdinsky)
+Solution:   Assume that the characters arrive in the current codepage instead
+	    of UCS-2.  Perform conversion based on that.
+Files:	    src/gui_w48.c
+
+Patch 6.3.053
+Problem:    Win32: ":loadview" cannot find a file with non-ASCII characters.
+	    (Valerie Kondakoff)
+Solution:   Use mch_open() instead of open() to open the file.
+Files:	    src/ex_cmds2.c
+
+Patch 6.3.054
+Problem:    When 'insertmode' is set <C-L>4ixxx<C-L> hangs Vim. (Jens Paulus)
+	    Vim is actually still working but redraw is disabled.
+Solution:   When stopping Insert mode with CTRL-L don't put an Esc in the redo
+	    buffer but a CTRL-L.
+Files:	    src/edit.c
+
+Patch 6.3.055 (after 6.3.013)
+Problem:    Can't use getcmdline(), getcmdpos() or setcmdpos() with <C-R>=
+	    when editing a command line.  Using <C-\>e may crash Vim. (Peter
+	    Winters)
+Solution:   When moving ccline out of the way for recursive use, make it
+	    available to the functions that need it.  Also save and restore
+	    ccline when calling get_expr_line().  Make ccline.cmdbuf NULL at
+	    the end of getcmdline().
+Files:	    src/ex_getln.c
+
+Patch 6.3.056
+Problem:    The last characters of a multi-byte file name may not be displayed
+	    in the window title.
+Solution:   Avoid to remove a multi-byte character where the last byte looks
+	    like a path separator character. (Yasuhiro Matsumoto)
+Files:	    src/buffer.c, src/ex_getln.c
+
+Patch 6.3.057
+Problem:    When filtering lines folds are not updated. (Carl Osterwisch)
+Solution:   Update folds for filtered lines.
+Files:	    src/ex_cmds.c
+
+Patch 6.3.058
+Problem:    When 'foldcolumn' is equal to the window width and 'wrap' is on
+	    Vim may crash.  Disabling the vertical split feature breaks
+	    compiling.  (Peter Winters)
+Solution:   Check for zero room for wrapped text.  Make compiling without
+	    vertical splits possible.
+Files:	    src/move.c, src/quickfix.c, src/screen.c, src/netbeans.c
+
+Patch 6.3.059
+Problem:    Crash when expanding an ":edit" command containing several spaces
+	    with the shell. (Brian Hirt)
+Solution:   Allocate enough space for the quotes.
+Files:	    src/os_unix.c
+
+Patch 6.3.060
+Problem:    Using CTRL-R CTRL-O in Insert mode with an invalid register name
+	    still causes something to be inserted.
+Solution:   Check the register name for being valid.
+Files:	    src/edit.c
+
+Patch 6.3.061
+Problem:    When editing a utf-8 file in an utf-8 xterm and there is a
+	    multi-byte character in the last column, displaying is messed up.
+	    (Jo<4A>l Rio)
+Solution:   Check for a multi-byte character, not a multi-column character.
+Files:	    src/screen.c
+
+Patch 6.3.062
+Problem:    ":normal! gQ" hangs.
+Solution:   Quit getcmdline() and do_exmode() when out of typeahead.
+Files:	    src/ex_getln.c, src/ex_docmd.c
+
+Patch 6.3.063
+Problem:    When a CursorHold autocommand changes to another window
+	    (temporarily) 'mousefocus' stops working.
+Solution:   Call gui_mouse_correct() after triggering CursorHold.
+Files:	    src/gui.c
+
+Patch 6.3.064
+Problem:    line2byte(line("$") + 1) sometimes returns the wrong number.
+	    (Charles Campbell)
+Solution:   Flush the cached line before counting the bytes.
+Files:	    src/memline.c
+
+Patch 6.3.065
+Problem:    The euro digraph doesn't always work.
+Solution:   Add an "e=" digraph for Unicode euro character and adjust the
+	    help files.
+Files:	    src/digraph.c, runtime/doc/digraph.txt
+
+Patch 6.3.066
+Problem:    Backup file may get wrong permissions.
+Solution:   Use permissions of original file for backup file in more places.
+Files:	    src/fileio.c
+
+Patch 6.3.067 (after 6.3.066)
+Problem:    Newly created file gets execute permission.
+Solution:   Check for "perm" to be negative before using it.
+Files:	    src/fileio.c
+
+Patch 6.3.068
+Problem:    When editing a compressed file xxx.gz which is a symbolic link to
+	    the actual file a ":write" renames the link.
+Solution:   Resolve the link, so that the actual file is renamed and
+	    compressed.
+Files:	    runtime/plugin/gzip.vim
+
+Patch 6.3.069
+Problem:    When converting text with illegal characters Vim may crash.
+Solution:   Avoid that too much is subtracted from the length. (Da Woon Jung)
+Files:	    src/mbyte.c
+
+Patch 6.3.070
+Problem:    After ":set number linebreak wrap" and a vertical split, moving
+	    the vertical separator far left will crash Vim. (Georg Dahn)
+Solution:   Avoid dividing by zero.
+Files:	    src/charset.c
+
+Patch 6.3.071
+Problem:    The message for CTRL-X mode is still displayed after an error for
+	    'thesaurus' or 'dictionary' being empty.
+Solution:   Clear "edit_submode".
+Files:	    src/edit.c
+
+Patch 6.3.072
+Problem:    Crash in giving substitute message when language is Chinese and
+	    encoding is utf-8. (Yongwei)
+Solution:   Make the msg_buf size larger when using multi-byte.
+Files:	    src/vim.h
+
+Patch 6.3.073
+Problem:    Win32 GUI: When the Vim window is partly above or below the
+	    screen, scrolling causes display errors when the taskbar is not on
+	    that side.
+Solution:   Use the SW_INVALIDATE flag when the Vim window is partly below or
+	    above the screen.
+Files:	    src/gui_w48.c
+
+Patch 6.3.074
+Problem:    When mswin.vim is used and 'insertmode' is set, typing text in
+	    Select mode and then using CTRL-V results in <SNR>99_Pastegi.
+	    (Georg Dahn)
+Solution:   When restart_edit is set use "d" instead of "c" to remove the
+	    selected text to avoid calling edit() twice.
+Files:	    src/normal.c
+
+Patch 6.3.075
+Problem:    After unloading another buffer, syntax highlighting in the current
+	    buffer may be wrong when it uses "containedin". (Eric Arnold)
+Solution:   Use "buf" intead of "curbuf" in syntax_clear().
+Files:	    src/syntax.c
+
+Patch 6.3.076
+Problem:    Crash when using cscope and there is a parse error (e.g., line too
+	    long). (Alexey I. Froloff)
+Solution:   Pass the actual number of matches to cs_manage_matches() and
+	    correctly handle the error situation.
+Files:	    src/if_cscope.c
+
+Patch 6.3.077 (extra)
+Problem:    VMS: First character input after ESC was not recognized.
+Solution:   Added TRM$M_TM_TIMED in vms_read().  (Zoltan Arpadffy)
+Files:	    src/os_vms.c
+
+Patch 6.3.078 (extra, after 6.3.077)
+Problem:    VMS: Performance issue after patch 6.3.077
+Solution:   Add a timeout in the itemlist.  (Zoltan Arpadffy)
+Files:	    src/os_vms.c
+
+Patch 6.3.079
+Problem:    Crash when executing a command in the command line window while
+	    syntax highlighting is enabled. (Pero Brbora)
+Solution:   Don't use a pointer to a buffer that has been deleted.
+Files:	    src/syntax.c
+
+Patch 6.3.080 (extra)
+Problem:    Win32: With 'encoding' set to utf-8 while the current codepage is
+	    Chinese editing a file with some specific characters in the name
+	    fails.
+Solution:   Use _wfullpath() instead of _fullpath() when necessary.
+Files:	    src/os_mswin.c
+
+Patch 6.3.081
+Problem:    Unix: glob() may execute a shell command when it's not wanted.
+	    (Georgi Guninski)
+Solution:   Verify the sandbox flag is not set.
+Files:	    src/os_unix.c
+
+Patch 6.3.082 (after 6.3.081)
+Problem:    Unix: expand() may execute a shell command when it's not wanted.
+	    (Georgi Guninski)
+Solution:   A more generic solution than 6.3.081.
+Files:	    src/os_unix.c
+
+Patch 6.3.083
+Problem:    VMS: The vt320 termcap entry is incomplete.
+Solution:   Add missing function keys.  (Zoltan Arpadffy)
+Files:	    src/term.c
+
+Patch 6.3.084 (extra)
+Problem:    Cygwin: compiling with DEBUG doesn't work.  Perl path was ignored.
+	    Failure when $(OUTDIR) already exists.  "po" makefile is missing.
+Solution:   Use changes tested in Vim 7. (Tony Mechelynck)
+Files:	    src/Make_cyg.mak, src/po/Make_cyg.mak
+
+Patch 6.3.085
+Problem:    Crash in syntax highlighting code. (Marc Espie)
+Solution:   Prevent current_col going past the end of the line.
+Files:	    src/syntax.c
+
+Patch 6.3.086 (extra)
+Problem:    Can't produce message translation file with msgfmt that checks
+	    printf strings.
+Solution:   Fix the Russian translation.
+Files:	    src/po/ru.po, src/po/ru.cp1251.po
+
+Patch 6.3.087
+Problem:    MS-DOS: Crash. (Jason Hood)
+Solution:   Don't call fname_case() with a NULL pointer.
+Files:	    src/ex_cmds.c
+
+Patch 6.3.088
+Problem:    Editing ".in" causes error E218. (Stefan Karlsson)
+Solution:   Require some characters before ".in".  Same for ".orig" and others.
+Files:	    runtime/filetype.vim
+
+Patch 6.3.089
+Problem:    A session file doesn't work when created while the current
+	    directory contains a space or the directory of the session files
+	    contains a space. (Paolo Giarrusso)
+Solution:   Escape spaces with a backslash.
+Files:	    src/ex_docmd.c
+
+Patch 6.3.090
+Problem:    A very big value for 'columns' or 'lines' may cause a crash.
+Solution:   Limit the values to 10000 and 1000.
+Files:	    src/option.c
+
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/version7.txt

@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Aug 16
+*version7.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -20,6 +20,7 @@ NEW FEATURES				|new-7|
 
 Vim script enhancements			|new-vim-script|
 Spell checking				|new-spell|
+Omni completion				|new-omni-completion|
 KDE support				|new-KDE|
 MzScheme interface			|new-MzScheme|
 Printing multi-byte text		|new-print-multi-byte|
@@ -119,6 +120,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*
 
@@ -172,6 +181,27 @@ highlighting.
 Much more info here: |spell|.
 
 
+Omni completion					*new-omni-completion*
+-----------------
+
+This could also be called "intellisense", but that is a trademark.  It is a
+smart kind of completion.  The text in front of the cursor is inspected to
+figure out what could be following.  This considers struct and class members,
+unions, etc.
+
+Use CTRL-X CTRL-O in Insert mode to start the completion.  |i_CTRL-X_CTRL-O|
+
+The 'omnifunc' option is set by filetype plugins to define the function that
+figures out the completion.
+
+Currently supported languages:
+	C	|ft-c-omni|
+	XHTML	|ft-html-omni|
+
+When the 'completeopt' option contains "menu" then matches for Insert mode
+completion are displayed in a popup menu.
+
+
 KDE support						*new-KDE*
 -----------
 
@@ -323,7 +353,7 @@ 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.
@@ -341,6 +371,8 @@ Options: ~
 'completefunc'		The name of a function used for user-specified Insert
 			mode completion.  CTRL-X CTRL-U can be used in Insert
 			mode to do any kind of completion.  (Taro Muraoka)
+'completeopt'		Enable popup menu for Insert mode completion.
+'omnifunc'		The name of a function used for omni completion.
 'quoteescape'		Characters used to escape quotes inside a string.
 			Used for the a", a' and a` text objects. |a'|
 'numberwidth'		Minimal width of the space used for the 'number'
@@ -421,11 +453,14 @@ New functions: ~
 |get()|			get an item from a List or Dictionary
 |getbufline()|		get a list of lines from a specified buffer
 			(Yegappan Lakshmanan)
+|getcmdtype()|		return the current command-line type
+			(Yegappan Lakshmanan)
 |getfontname()| 	get actual font name being used
 |getfperm()|		get file permission string (Nikolai Weibull)
 |getftype()|		get type of file (Nikolai Weibull)
 |getline()|		with second argument: get List with buffer lines
 |has_key()|		check whether a key appears in a Dictionary
+|inputlist()|		select an entry from a list
 |insert()|		insert an item somewhere in a List
 |items()|		get List of Dictionary key-value pairs
 |join()|		join List items into a String
@@ -441,6 +476,7 @@ New functions: ~
 |remove()|		remove one or more items from a List or Dictionary
 |repeat()| 		repeat "expr" "count" times (Christophe Poucet)
 |reverse()|		reverse the order of a List
+|searchdecl()|		search for declaration of variable
 |setqflist()|		create a quickfix list (Yegappan Lakshmanan)
 |sort()|		sort a List
 |soundfold()|		get the sound-a-like equivalent of a word
@@ -561,8 +597,20 @@ For xterm most combinations of modifiers with function keys are recognized.
 
 When 'verbose' is set the output of ":highlight" will show where a highlight
 item was last set.
-When 'verbose' is set the output of ":map", ":command" and ":function"
-commands will show where it was last defined. (Yegappan Lakshmanan)
+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.
+
+"1gd" can be used like "gd" but ignores matches in a {} block that ends before
+the cursor position.  Likewise for "1gD" and "gD".
+
+'scrolljump' can be set to a negative number to scroll a percentage of the
+window height.
+
+The |v:scrollstart| variable has been added to help finding the location in
+your script that causes the hit-enter prompt.
 
 ==============================================================================
 IMPROVEMENTS						*improvements-7*
@@ -708,7 +756,7 @@ To count items (pattern matches) without changing the buffer the 'n' flag has
 been added to |:substitute|.  See |count-items|.
 
 The "screen.linux" $TERM name is recognized to set the default for
-'background' to "dark". (Ciaran McCreesh)  Also for "cygwin".
+'background' to "dark". (Ciaran McCreesh)  Also for "cygwin" and "putty".
 
 The |FileChangedShell| autocommand event can now use the |v:fcs_reason|
 variable that specifies what triggered the event.  |v:fcs_choice| can be used
@@ -767,6 +815,37 @@ 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)
+
+When 'foldcolumn' is one then put as much info in it as possible.  This allows
+closing a fold with the mouse by clicking on the '-'.
+
+input() takes an optional completion argument to specify the type of
+completion supported for the input. (Yegappan Lakshmanan)
+
+"dp" works with more than two buffers in diff mode if there is only one where
+'modifiable' is set.
+
+When the 'include' option contains \zs the file name found is what is being
+matched from \zs to the end or \ze.  Useful to pass more to 'includeexpr'.
+
+Loading plugins on startup now supports subdirectories in the plugin
+directory. |load-plugins|
+
+In the foldcolumn always show the '+' for a closed fold, so that it can be
+opened easily.  It may overwrite another character, esp. if 'foldcolumn' is 1.
+
+It is now possible to get the W10 message again by setting 'readonly'.  Useful
+in the FileChangedRO autocommand when checking out the file fails.
+
+Unix: When open() returns EFBIG give an appropriate message.
+
 ==============================================================================
 COMPILE TIME CHANGES					*compile-changes-7*
 
@@ -798,6 +877,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*
 
@@ -991,10 +1074,6 @@ doing that a SIGHUP may arrive and disturbe us, thus ignore it. (Scott
 Anderson)  Also postpone SIGHUP, SIGQUIT and SIGTERM until it's safe to
 handle.  Added handle_signal().
 
-When using "set laststatus=2 cmdheight=2" in the .gvimrc you may only get one
-line for the cmdline. (Christian Robinson)  Invoke command_height() after the
-GUI has started up.
-
 When completing a file name on the command line backslashes are required for
 white space.  Was only done for a space, not for a Tab.
 
@@ -1297,4 +1376,23 @@ 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.
+
+Output of ":function" could leave some of the typed text behind. (Yegappan
+Lakshmanan)
+
+When the command line history has only a few lines the command line window
+would be opened with these lines above the first window line.
+
+When using a command line window for search strings ":qa" would result in
+searching for "qa" instead of quitting all windows.
+
+GUI: When scrolling with the scrollbar and there is a line that doesn't fit
+redrawing may fail.  Make sure w_skipcol is valid before redrawing.
+
+Limit the values of 'columns' and 'lines' to avoid an overflow in Rows *
+Columns.  Fixed bad effects when running out of memory (command line would be
+reversed, ":qa!" resulted in ":!aq").
+
  vim:tw=78:ts=8:ft=help:norl:

runtime/doc/visual.txt

@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 01
+*visual.txt*    For Vim version 7.0aa.  Last change: 2005 Oct 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -86,7 +86,7 @@ Visual		    Normal	   blockwise Visual	  linewise Visual
 blockwise Visual    Visual	   Normal		  linewise Visual
 linewise Visual     Visual	   blockwise Visual	  Normal
 
-							*gv* *v_gv*
+						*gv* *v_gv* *reselect-Visual*
 gv			Start Visual mode with the same area as the previous
 			area and the same mode.
 			In Visual mode the current and the previous Visual

runtime/doc/zip.txt

@@ -0,0 +1,31 @@
+*zip.txt*	Zip File Interface				Sep 16, 2005
+
+Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
+	  (remove NOSPAM from Campbell's email first)
+Copyright:    Copyright (C) 2005 Charles E. Campbell, Jr. {{{1 *zip-copyright*
+              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,
+	      zip.vim and zipPlugin.vim are 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.
+
+==============================================================================
+1. Contents					*zip* *zip-contents*
+   1. Contents..................................................|zip-contents|
+   2. Usage.....................................................|zip-usage|
+   3. History...................................................|zip-history|
+
+==============================================================================
+2. Usage					*zip-usage* *zip-manual*
+
+==============================================================================
+3. History					*zip-history*
+   v2 Sep 16, 2005 * silenced some commands (avoiding hit-enter prompt)
+                   * began testing under Windows; works thus far
+		   * filetype detection fixed
+   v1 Sep 15, 2005 * Initial release, had browsin, reading, and writing
+
+==============================================================================
+vim:tw=78:ts=8:ft=help

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Aug 17
+" Last Change:	2005 Oct 12
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -16,7 +16,7 @@ set cpo&vim
 augroup filetypedetect
 
 " Ignored extensions
-au BufNewFile,BufRead *.orig,*.bak,*.old,*.new,*.rpmsave,*.rpmnew
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.rpmsave,?\+.rpmnew
 	\ exe "doau filetypedetect BufRead " . expand("<afile>:r")
 au BufNewFile,BufRead *~
 	\ let s:name = expand("<afile>") |
@@ -26,7 +26,7 @@ au BufNewFile,BufRead *~
 	\ endif |
 	\ unlet s:name |
 	\ unlet s:short
-au BufNewFile,BufRead *.in
+au BufNewFile,BufRead ?\+.in
 	\ if expand("<afile>:t") != "configure.in" |
 	\   exe "doau filetypedetect BufRead " . expand("<afile>:r") |
 	\ endif
@@ -285,6 +285,9 @@ au BufNewFile,BufRead */.calendar/*,
 " C#
 au BufNewFile,BufRead *.cs			setf cs
 
+" Cfengine
+au BufNewFile,BufRead cfengine.conf		setf cfengine
+
 " Comshare Dimension Definition Language
 au BufNewFile,BufRead *.cdl			setf cdl
 
@@ -629,8 +632,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 +648,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
@@ -1198,7 +1203,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 +1230,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
@@ -1667,6 +1672,9 @@ au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
 " TPP - Text Presentation Program
 au BufNewFile,BufReadPost *.tpp			setf tpp
 
+" Trustees
+au BufNewFile,BufRead trustees.conf		setf trustees
+
 " TSS - Geometry
 au BufNewFile,BufReadPost *.tssgm		setf tssgm
 
@@ -1880,6 +1888,9 @@ au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
 " Most of these should call s:StarSetf() to avoid names ending in .gz and the
 " like are used.
 
+" Asterisk config file
+au BufNewFile,BufRead *asterisk/*.conf*         call s:StarSetf('asterisk')
+
 " BIND zone
 au BufNewFile,BufRead /var/named/*		call s:StarSetf('bindzone')
 

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/eruby.vim

@@ -0,0 +1,79 @@
+" Vim filetype plugin
+" Language:	eRuby
+" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.sourceforge.net
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+" Only do this when not done yet for this buffer
+if (exists("b:did_ftplugin"))
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "Ruby Files (*.rb)\t*.rb\n" .
+		   \ "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
+		   \ "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+unlet b:did_ftplugin
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+    unlet b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+    unlet b:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words
+    unlet b:match_words
+endif
+
+runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim
+let b:did_ftplugin = 1
+
+" Combine the new set of values with those previously included.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+endif
+if exists ("b:browsefilter")
+    let s:browsefilter = b:browsefilter . s:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words . ',' . s:match_words
+endif
+
+" Change the browse dialog on Win32 to show mainly eRuby-related files
+if has("gui_win32")
+    let  b:browsefilter="eRuby Files (*.rhtml)\t*.rhtml\n" . s:browsefilter
+endif
+
+" Load the combined list of match_words for matchit.vim
+if exists("loaded_matchit")
+    let b:match_words = s:match_words
+endif
+
+" TODO: comments=
+setlocal commentstring=<%#%s%>
+
+let b:undo_ftplugin = "setl cms< "
+      \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+
+let &cpo = s:save_cpo
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:

runtime/ftplugin/html.vim

@@ -14,6 +14,8 @@ set cpo-=C
 
 setlocal commentstring=<!--%s-->
 
+setlocal omnifunc=htmlcomplete#CompleteTags
+
 " HTML:  thanks to Johannes Zellner and Benji Fisher.
 if exists("loaded_matchit")
     let b:match_ignorecase = 1

runtime/ftplugin/jsp.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	jsp
 " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
-" Last Changed: 2004 Jul 08
+" Last Changed: 2005 Oct 10
 " URL:		http://mywebpage.netscape.com/sharppeople/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
@@ -46,7 +46,7 @@ if exists ("b:browsefilter")
     let s:browsefilter = b:browsefilter . s:browsefilter
 endif
 if exists("b:match_words")
-    let s:match_words = b:match_words . ',' . s:matchwords
+    let s:match_words = b:match_words . ',' . s:match_words
 endif
 
 " Load the combined list of match_words for matchit.vim

runtime/ftplugin/pascal.vim

@@ -1,14 +1,14 @@
 " Vim filetype plugin file
 " Language:	pascal
 " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
-" Last Changed: 2003 Sep 29
+" Last Changed: 2005 Sep 05
 " URL:		http://mywebpage.netscape.com/sharppeople/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 if exists("loaded_matchit")
-    let b:match_words='\<begin\>:\<end\>'
+    let b:match_words='\<\%(begin\|case\|try\)\>:\<end\>'
 endif
 
 " Undo the stuff we changed.

runtime/ftplugin/php.vim

@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	php
 " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
-" Last Changed: 2004 Jul 08
+" Last Changed: 2005 Sep 05
 " URL:		http://mywebpage.netscape.com/sharppeople/vim/ftplugin
 
 if exists("b:did_ftplugin") | finish | endif
@@ -41,7 +41,7 @@ endif
 setlocal include=\\\(require\\\|include\\\)\\\(_once\\\)\\\?
 setlocal iskeyword+=$
 if exists("loaded_matchit")
-    let b:match_words = '\<switch\>:\<endswitch\>,' .
+    let b:match_words = '<php?:?>,\<switch\>:\<endswitch\>,' .
 		      \ '\<if\>:\<elseif\>:\<else\>:\<endif\>,' .
 		      \ '\<while\>:\<endwhile\>,' .
 		      \ '\<do\>:\<while\>,' .

runtime/ftplugin/ruby.vim

@@ -1,14 +1,126 @@
 " Vim filetype plugin
-" Language:     Ruby
-" Maintainer:   Gavin Sinclair <gsinclair@soyabean.com.au>
-" Last Change:  2002/08/12
-" URL: www.soyabean.com.au/gavin/vim/index.html
+" Language:	Ruby
+" Maintainer:	Gavin Sinclair <gsinclair at soyabean.com.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.sourceforge.net
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+"
+" Original matchit support thanks to Ned Konz.	See his ftplugin/ruby.vim at
+"   http://bike-nomad.com/vim/ruby.vim.
+" ----------------------------------------------------------------------------
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
-    finish
+  finish
 endif
 let b:did_ftplugin = 1
 
-" There are no known setting particularly appropriate for Ruby.  Please
-" contact the maintainer if you think of some.
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Matchit support
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+
+ " TODO: improve optional do loops
+ let b:match_words =
+    \ '\%(' .
+    \	  '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(class\|module\|begin\|def\|case\|for\|do\)\>' .
+    \	'\|' .
+    \	  '\%(\%(^\|\.\.\.\=\|[\,;=([<>~\*/%!&^|+-]\)\s*\)\@<=\%(if\|unless\|until\|while\)\>' .
+    \ '\)' .
+    \ ':' .
+    \ '\%(' .
+    \	  '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<\%(else\|elsif\|ensure\|when\)\>' .
+    \	'\|' .
+    \	  '\%(\%(^\|;\)\s*\)\@<=\<rescue\>' .
+    \ '\)' .
+    \ ':' .
+    \ '\%(\%(\.\|\:\:\)\s*\|\:\)\@<!\<end\>'
+
+  let b:match_skip =
+     \ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" .
+     \ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Interpolation\\|" .
+     \ "NoInterpolation\\|Escape\\|Comment\\|Documentation\\)\\>'"
+
+endif
+
+setlocal formatoptions-=t formatoptions+=croql
+
+setlocal include=^\\s*\\<\\(load\\\|\w*require\\)\\>
+setlocal includeexpr=substitute(substitute(v:fname,'::','/','g'),'$','.rb','')
+setlocal suffixesadd=.rb
+
+" TODO:
+"setlocal define=^\\s*def
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+
+if !exists("s:rubypath")
+  if executable("ruby")
+    let s:code = "print ($: + begin; require %q{rubygems}; Gem.all_load_paths.sort.uniq; rescue LoadError; []; end).join(%q{,})"
+    if &shellxquote == "'"
+      let s:rubypath = system('ruby -e "' . s:code . '"')
+    else
+      let s:rubypath = system("ruby -e '" . s:code . "'")
+    endif
+    let s:rubypath = '.,' . substitute(s:rubypath, '\%(^\|,\)\.\%(,\|$\)', ',,', '')
+  else
+    " If we can't call ruby to get its path, just default to using the
+    " current directory and the directory of the current file.
+    let s:rubypath = ".,,"
+  endif
+endif
+
+let &l:path = s:rubypath
+
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< inc< inex< sua< def< com< cms< path< "
+      \ "| unlet! b:browsefilter b:match_ignorecase b:match_words b:match_skip"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+"
+" Instructions for enabling "matchit" support:
+"
+" 1. Look for the latest "matchit" plugin at
+"
+"	  http://www.vim.org/scripts/script.php?script_id=39
+"
+"    It is also packaged with Vim, in the $VIMRUNTIME/macros directory.
+"
+" 2. Copy "matchit.txt" into a "doc" directory (e.g. $HOME/.vim/doc).
+"
+" 3. Copy "matchit.vim" into a "plugin" directory (e.g. $HOME/.vim/plugin).
+"
+" 4. Ensure this file (ftplugin/ruby.vim) is installed.
+"
+" 5. Ensure you have this line in your $HOME/.vimrc:
+"	  filetype plugin on
+"
+" 6. Restart Vim and create the matchit documentation:
+"
+"	  :helptags ~/.vim/doc
+"
+"    Now you can do ":help matchit", and you should be able to use "%" on Ruby
+"    keywords.	Try ":echo b:match_words" to be sure.
+"
+" Thanks to Mark J. Reed for the instructions.	See ":help vimrc" for the
+" locations of plugin directories, etc., as there are several options, and it
+" differs on Windows.  Email gsinclair@soyabean.com.au if you need help.
+"
+
+" vim: nowrap sw=2 sts=2 ts=8 ff=unix:

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/eruby.vim

@@ -0,0 +1,20 @@
+" Vim indent file
+" Language:	Ruby
+" Maintainer:	Doug Kearns <djkea2 at gus.gscit.monash.edu.au>
+" Info:		$Id$
+" URL:		http://vim-ruby.rubyforge.org/
+" Anon CVS:	See above site
+" Licence:	GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/html.vim

runtime/indent/ocaml.vim

@@ -1,16 +1,16 @@
 " Vim indent file
 " Language:     OCaml
-" Maintainers:  Jean-Francois Yuen  <jfyuen@happycoders.org>
-"               Mike Leary          <leary@nwlink.com>
-"               Markus Mottl        <markus@oefai.at>
-" URL:          http://www.oefai.at/~markus/vim/indent/ocaml.vim
-" Last Change:  2004 Apr 11 - Added indent for 'class' (JY)
-"               2003 Sep 16 - Added 'private' as keyword (JY)
-"               2003 Mar 29 - Fixed bug with 'if' and 'else' (JY)
+" Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
+"               Mike Leary           <leary@nwlink.com>
+"               Markus Mottl         <markus.mottl@gmail.com>
+" URL:          http://www.ocaml.info/vim/indent/ocaml.vim
+" Last Change:  2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
+"               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
+"               2005 Apr 11 - Fixed an indentation bug concerning "let" (MM)
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
-  finish
+ finish
 endif
 let b:did_indent = 1
 
@@ -22,14 +22,16 @@ setlocal nosmartindent
 setlocal textwidth=80
 
 " Comment formatting
-if (has("comments"))
-  setlocal comments=sr:(*,mb:*,ex:*)
-  setlocal fo=cqort
+if !exists("no_ocaml_comments")
+ if (has("comments"))
+   setlocal comments=sr:(*,mb:*,ex:*)
+   setlocal fo=cqort
+ endif
 endif
 
 " Only define the function once.
 if exists("*GetOCamlIndent")
-  finish
+ finish
 endif
 
 " Define some patterns:
@@ -42,254 +44,209 @@ let s:obj = '^\s*\(constraint\|inherit\|initializer\|method\|val\)\>\|\<\(object
 let s:type = '^\s*\%(class\|let\|type\)\>.*='
 
 " Skipping pattern, for comments
-function s:SkipPattern(lnum, pat)
-  let def = prevnonblank(a:lnum - 1)
-  while def > 0 && getline(def) =~ a:pat
-    let def = prevnonblank(def - 1)
-  endwhile
-  return def
+function s:GetLineWithoutFullComment(lnum)
+ let lnum = prevnonblank(a:lnum - 1)
+ let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
+ while lline =~ '^\s*$' && lnum > 0
+   let lnum = prevnonblank(lnum - 1)
+   let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
+ endwhile
+ return lnum
 endfunction
 
 " Indent for ';;' to match multiple 'let'
 function s:GetInd(lnum, pat, lim)
-  let llet = search(a:pat, 'bW')
-  let old = indent(a:lnum)
-  while llet > 0
-    let old = indent(llet)
-    let nb = s:SkipPattern(llet, '^\s*(\*.*\*)\s*$')
-    if getline(nb) =~ a:lim
-      return old
-    endif
-    let llet = search(a:pat, 'bW')
-  endwhile
-  return old
+ let llet = search(a:pat, 'bW')
+ let old = indent(a:lnum)
+ while llet > 0
+   let old = indent(llet)
+   let nb = s:GetLineWithoutFullComment(llet)
+   if getline(nb) =~ a:lim
+     return old
+   endif
+   let llet = search(a:pat, 'bW')
+ endwhile
+ return old
 endfunction
 
 " Indent pairs
 function s:FindPair(pstart, pmid, pend)
-  call search(a:pend, 'bW')
-  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+ call search(a:pend, 'bW')
+ return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
 endfunction
 
 " Indent 'let'
 function s:FindLet(pstart, pmid, pend)
-  call search(a:pend, 'bW')
-  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet'))
+ call search(a:pend, 'bW')
+ return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet'))
 endfunction
 
 function GetOCamlIndent()
-  " Find a non-blank line above the current line.
-  let lnum = prevnonblank(v:lnum - 1)
+ " Find a non-commented line above the current line.
+ let lnum = s:GetLineWithoutFullComment(v:lnum)
 
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
+ " At the start of the file use zero indent.
+ if lnum == 0
+   return 0
+ endif
 
-  let ind = indent(lnum)
-  let lline = getline(lnum)
+ let ind = indent(lnum)
+ let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
 
-  " Return double 'shiftwidth' after lines matching:
-  if lline =~ '^\s*|.*->\s*$'
-    return ind + &sw + &sw
-  endif
+ " Return double 'shiftwidth' after lines matching:
+ if lline =~ '^\s*|.*->\s*$'
+   return ind + &sw + &sw
+ endif
 
-  let line = getline(v:lnum)
+ let line = getline(v:lnum)
 
-  " Indent if current line begins with 'end':
-  if line =~ '^\s*end\>'
-    return s:FindPair(s:module, '','\<end\>')
+ " Indent if current line begins with 'end':
+ if line =~ '^\s*end\>'
+   return s:FindPair(s:module, '','\<end\>')
 
-  " Indent if current line begins with 'done' for 'do':
-  elseif line =~ '^\s*done\>'
-    return s:FindPair('\<do\>', '','\<done\>')
+ " Indent if current line begins with 'done' for 'do':
+ elseif line =~ '^\s*done\>'
+   return s:FindPair('\<do\>', '','\<done\>')
 
-  " Indent if current line begins with '}' or '>}':
-  elseif line =~ '^\s*\(\|>\)}'
-    return s:FindPair('{', '','}')
+ " Indent if current line begins with '}' or '>}':
+ elseif line =~ '^\s*\(\|>\)}'
+   return s:FindPair('{', '','}')
 
-  " Indent if current line begins with ']', '|]' or '>]':
-  elseif line =~ '^\s*\(\||\|>\)\]'
-    return s:FindPair('\[', '','\]')
+ " Indent if current line begins with ']', '|]' or '>]':
+ elseif line =~ '^\s*\(\||\|>\)\]'
+   return s:FindPair('\[', '','\]')
 
-  " Indent if current line begins with ')':
-  elseif line =~ '^\s*)'
-    return s:FindPair('(', '',')')
+ " Indent if current line begins with ')':
+ elseif line =~ '^\s*)'
+   return s:FindPair('(', '',')')
 
-  " Indent if current line begins with 'let':
-  elseif line =~ '^\s*let\>'
-    if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet
-      return s:FindLet(s:type, '','\<let\s*$')
-    else return ind
-    endif
+ " Indent if current line begins with 'let':
+ elseif line =~ '^\s*let\>'
+   if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet
+     return s:FindLet(s:type, '','\<let\s*$')
+   endif
 
-  " Indent if current line begins with 'class' or 'type':
-  elseif line =~ '^\s*\(class\|type\)\>'
-    if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim
-      return s:FindLet(s:type, '','\<\(class\|type\)\s*$')
-    else return ind
-    endif
+ " Indent if current line begins with 'class' or 'type':
+ elseif line =~ '^\s*\(class\|type\)\>'
+   if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim
+     return s:FindLet(s:type, '','\<\(class\|type\)\s*$')
+   endif
 
-  " Indent for pattern matching:
-  elseif line =~ '^\s*|'
-    if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|parser\|private\|with\)\s*$'
-      call search('|', 'bW')
-      return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|parser\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"'))
-    else return ind
-    endif
+ " Indent for pattern matching:
+ elseif line =~ '^\s*|'
+   if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|parser\|private\|with\)\s*$'
+     call search('|', 'bW')
+     return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|parser\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"'))
+   endif
 
-  " Indent if current line begins with ';;':
-  elseif line =~ '^\s*;;'
-    if lline !~ ';;\s*$'
-      return s:GetInd(v:lnum, s:letpat, s:letlim)
-    else return ind
-    endif
+ " Indent if current line begins with ';;':
+ elseif line =~ '^\s*;;'
+   if lline !~ ';;\s*$'
+     return s:GetInd(v:lnum, s:letpat, s:letlim)
+   endif
 
-  " Indent if current line begins with 'in':
-  elseif line =~ '^\s*in\>'
-    if lline !~ '^\s*\(let\|and\)\>'
-      return s:FindPair('\<let\>', '', '\<in\>')
-    else return ind
-    endif
+ " Indent if current line begins with 'in':
+ elseif line =~ '^\s*in\>'
+   if lline !~ '^\s*\(let\|and\)\>'
+     return s:FindPair('\<let\>', '', '\<in\>')
+   endif
 
-  " Indent if current line begins with 'else':
-  elseif line =~ '^\s*else\>'
-    if lline !~ '^\s*\(if\|then\)\>'
-      return s:FindPair('\<if\>', '', '\<else\>')
-    else return ind
-    endif
+ " Indent if current line begins with 'else':
+ elseif line =~ '^\s*else\>'
+   if lline !~ '^\s*\(if\|then\)\>'
+     return s:FindPair('\<if\>', '', '\<else\>')
+   endif
 
-  " Indent if current line begins with 'then':
-  elseif line =~ '^\s*then\>'
-    if lline !~ '^\s*\(if\|else\)\>'
-      return s:FindPair('\<if\>', '', '\<then\>')
-    else return ind
-    endif
+ " Indent if current line begins with 'then':
+ elseif line =~ '^\s*then\>'
+   if lline !~ '^\s*\(if\|else\)\>'
+     return s:FindPair('\<if\>', '', '\<then\>')
+   endif
 
-  " Indent if current line begins with 'and':
-  elseif line =~ '^\s*and\>'
-    if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$'
-      return ind - &sw
-    else return ind
-    endif
+ " Indent if current line begins with 'and':
+ elseif line =~ '^\s*and\>'
+   if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$'
+     return ind - &sw
+   endif
 
-  " Indent if current line begins with 'with':
-  elseif line =~ '^\s*with\>'
-    if lline !~ '^\s*\(match\|try\)\>'
-      return s:FindPair('\<\%(match\|try\)\>', '','\<with\>')
-    else return ind
-    endif
+ " Indent if current line begins with 'with':
+ elseif line =~ '^\s*with\>'
+   if lline !~ '^\s*\(match\|try\)\>'
+     return s:FindPair('\<\%(match\|try\)\>', '','\<with\>')
+   endif
 
-  " Indent if current line begins with 'exception':
-  elseif line =~ '^\s*exception\>'
-    if lline !~ s:lim . '\|' . s:letlim
-      return indent(search('^\s*\(\(external\|include\|open\|type\)\>\|val\>.*:\)', 'bW'))
-    else return ind
-    endif
+ " Indent if current line begins with 'exception', 'external', 'include' or
+ " 'open':
+ elseif line =~ '^\s*\(exception\|external\|include\|open\)\>'
+   if lline !~ s:lim . '\|' . s:letlim
+     call search(line)
+     return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW'))
+   endif
 
-  " Indent if current line begins with 'external':
-  elseif line =~ '^\s*external\>'
-    if lline !~ s:lim . '\|' . s:letlim
-      return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW'))
-    else return ind
-    endif
+ " Indent if current line begins with 'val':
+ elseif line =~ '^\s*val\>'
+   if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim
+     return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW'))
+   endif
 
-  " Indent if current line begins with 'include':
-  elseif line =~ '^\s*include\>'
-    if lline !~ s:lim . '\|' . s:letlim
-      return indent(search('^\s*\(\(exception\|external\|open\|type\)\>\|val\>.*:\)', 'bW'))
-    else return ind
-    endif
+ " Indent if current line begins with 'constraint', 'inherit', 'initializer'
+ " or 'method':
+ elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>'
+   if lline !~ s:obj
+     return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw
+   endif
 
-  " Indent if current line begins with 'open':
-  elseif line =~ '^\s*open\>'
-    if lline !~ s:lim . '\|' . s:letlim
-      return indent(search('^\s*\(\(exception\|external\|include\|type\)\>\|val\>.*:\)', 'bW'))
-    else return ind
-    endif
+ endif
 
-  " Indent if current line begins with 'val':
-  elseif line =~ '^\s*val\>'
-    if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim
-      return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW'))
-    else return ind
-    endif
+ " Add a 'shiftwidth' after lines ending with:
+ if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$'
+   let ind = ind + &sw
 
-  " Indent if current line begins with 'constraint':
-  elseif line =~ '^\s*constraint\>'
-    if lline !~ s:obj
-      return indent(search('^\s*\(inherit\|initializer\|method\|val\)\>', 'bW'))
-    else return ind
-    endif
+ " Back to normal indent after lines ending with ';;':
+ elseif lline =~ ';;\s*$' && lline !~ '^\s*;;'
+   let ind = s:GetInd(v:lnum, s:letpat, s:letlim)
 
-  " Indent if current line begins with 'inherit':
-  elseif line =~ '^\s*inherit\>'
-    if lline !~ s:obj
-      return indent(search('^\s*\(constraint\|initializer\|method\|val\)\>', 'bW'))
-    else return ind
-    endif
+ " Back to normal indent after lines ending with 'end':
+ elseif lline =~ '\<end\s*$'
+   let ind = s:FindPair(s:module, '','\<end\>')
 
-  " Indent if current line begins with 'inherit':
-  elseif line =~ '^\s*initializer\>'
-    if lline !~ s:obj
-      return indent(search('^\s*\(constraint\|inherit\|method\|val\)\>', 'bW'))
-    else return ind
-    endif
+ " Back to normal indent after lines ending with 'in':
+ elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>'
+   let ind = s:FindPair('\<let\>', '', '\<in\>')
 
-  " Indent if current line begins with 'method':
-  elseif line =~ '^\s*method\>'
-    if lline !~ s:obj
-      return indent(search('^\s*\(\(constraint\|inherit\|initializer\|val\)\>\|method\>.*\(:\|=\)\)', 'bW'))
-    else return ind
-    endif
+ " Back to normal indent after lines ending with 'done':
+ elseif lline =~ '\<done\s*$'
+   let ind = s:FindPair('\<do\>', '','\<done\>')
 
-  endif
+ " Back to normal indent after lines ending with '}' or '>}':
+ elseif lline =~ '\(\|>\)}\s*$'
+   let ind = s:FindPair('{', '','}')
 
-  " Add a 'shiftwidth' after lines ending with:
-  if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$'
-    let ind = ind + &sw
+ " Back to normal indent after lines ending with ']', '|]' or '>]':
+ elseif lline =~ '\(\||\|>\)\]\s*$'
+   let ind = s:FindPair('\[', '','\]')
 
-  " Back to normal indent after lines ending with ';;':
-  elseif lline =~ ';;\s*$' && lline !~ '^\s*;;'
-    let ind = s:GetInd(v:lnum, s:letpat, s:letlim)
+ " Back to normal indent after comments:
+ elseif lline =~ '\*)\s*$'
+   call search('\*)', 'bW')
+   let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"'))
 
-  " Back to normal indent after lines ending with 'end':
-  elseif lline =~ '\<end\s*$'
-    let ind = s:FindPair(s:module, '','\<end\>')
+ " Back to normal indent after lines ending with ')':
+ elseif lline =~ ')\s*$'
+   let ind = s:FindPair('(', '',')')
 
-  " Back to normal indent after lines ending with 'in':
-  elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>'
-    let ind = s:FindPair('\<let\>', '', '\<in\>')
+ " If this is a multiline comment then align '*':
+ elseif lline =~ '^\s*(\*' && line =~ '^\s*\*'
+   let ind = ind + 1
 
-  " Back to normal indent after lines ending with 'done':
-  elseif lline =~ '\<done\s*$'
-    let ind = s:FindPair('\<do\>', '','\<done\>')
+ endif
 
-  " Back to normal indent after lines ending with '}' or '>}':
-  elseif lline =~ '\(\|>\)}\s*$'
-    let ind = s:FindPair('{', '','}')
+ " Subtract a 'shiftwidth' after lines matching 'match ... with parser':
+ if lline =~ '\<match\>.*\<with\>\s*\<parser\s*$'
+   let ind = ind - &sw
+ endif
 
-  " Back to normal indent after lines ending with ']', '|]' or '>]':
-  elseif lline =~ '\(\||\|>\)\]\s*$'
-    let ind = s:FindPair('\[', '','\]')
-
-  " Back to normal indent after comments:
-  elseif lline =~ '\*)\s*$'
-    call search('\*)', 'bW')
-    let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"'))
-
-  " Back to normal indent after lines ending with ')':
-  elseif lline =~ ')\s*$'
-    let ind = s:FindPair('(', '',')')
-
-  endif
-
-  " Subtract a 'shiftwidth' after lines matching 'match ... with parser':
-  if lline =~ '^\s*match\>.*\<with\>\s*\<parser\s*$'
-    let ind = ind - &sw
-  endif
-
-  return ind
+ return ind
 
 endfunction
 

runtime/indent/perl.vim

@@ -2,7 +2,7 @@
 " Language:	Perl
 " Author:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
 " URL:		http://rgarciasuarez.free.fr/vim/indent/perl.vim
-" Last Change:	2005 Jul 15
+" Last Change:	2005 Sep 07
 
 " Suggestions and improvements by :
 "   Aaron J. Sherman (use syntax for hints)
@@ -26,7 +26,7 @@ endif
 let b:did_indent = 1
 
 " Is syntax highlighting active ?
-let b:indent_use_syntax = has("syntax") && &syntax == "perl"
+let b:indent_use_syntax = has("syntax")
 
 setlocal indentexpr=GetPerlIndent()
 setlocal indentkeys+=0=,0),0=or,0=and

runtime/indent/ruby.vim

@@ -1,11 +1,20 @@
 " Vim indent file
-" Language:	Ruby
-" Maintainer:	Gavin Sinclair <gsinclair@soyabean.com.au>
-" Last Change:	2003 May 11
-" URL: www.soyabean.com.au/gavin/vim/index.html
-" Changes: (since vim 6.1)
-"  - indentation after a line ending in comma, etc, (even in a comment) was
-"    broken, now fixed (2002/08/14)
+" Language:     Ruby
+" Maintainer:   Gavin Sinclair <gsinclair at soyabean.com.au>
+" Developer:    Nikolai Weibull <source at pcppopper.org>
+" Info:         $Id$
+" URL:          http://vim-ruby.rubyforge.org/
+" Anon CVS:     See above site
+" Licence:      GPL (http://www.gnu.org)
+" Disclaimer:
+"    This program is distributed in the hope that it will be useful,
+"    but WITHOUT ANY WARRANTY; without even the implied warranty of
+"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"    GNU General Public License for more details.
+" ----------------------------------------------------------------------------
+
+" 0. Initialization {{{1
+" =================
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -13,55 +22,356 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
+" Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetRubyIndent()
-setlocal nolisp
-setlocal nosmartindent
-setlocal autoindent
-setlocal indentkeys+==end,=else,=elsif,=when,=ensure,=rescue
+setlocal indentkeys=0{,0},0),0],!^F,o,O,e
+setlocal indentkeys+==end,=elsif,=when,=ensure,=rescue,==begin,==end
 
 " Only define the function once.
 if exists("*GetRubyIndent")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
+" 1. Variables {{{1
+" ============
+
+" Regex of syntax group names that are or delimit string or are comments.
+let s:syng_strcom = '\<ruby\%(String\|StringDelimiter\|ASCIICode' .
+      \ '\|Interpolation\|NoInterpolation\|Escape\|Comment\|Documentation\)\>'
+
+" Regex of syntax group names that are strings or comments.
+let s:syng_strcom2 = '\<ruby\%(String' .
+      \ '\|Interpolation\|NoInterpolation\|Escape\|Comment\|Documentation\)\>'
+
+" Regex of syntax group names that are strings.
+let s:syng_string =
+      \ '\<ruby\%(String\|Interpolation\|NoInterpolation\|Escape\)\>'
+
+" Regex of syntax group names that are strings or documentation.
+let s:syng_stringdoc =
+  \'\<ruby\%(String\|Interpolation\|NoInterpolation\|Escape\|Documentation\)\>'
+
+" Expression used to check whether we should skip a match with searchpair().
+let s:skip_expr =
+      \ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '".s:syng_strcom."'"
+
+" Regex used for words that, at the start of a line, add a level of indent.
+let s:ruby_indent_keywords = '^\s*\zs\<\%(module\|class\|def\|if\|for' .
+      \ '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure' .
+      \ '\|rescue\)\>' .
+      \ '\|\%([*+/,=:-]\|<<\|>>\)\s*\zs' .
+      \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\)\>'
+
+" Regex used for words that, at the start of a line, remove a level of indent.
+let s:ruby_deindent_keywords =
+      \ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|end\)\>'
+
+" Regex that defines the start-match for the 'end' keyword.
+"let s:end_start_regex = '\%(^\|[^.]\)\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\|do\)\>'
+" TODO: the do here should be restricted somewhat (only at end of line)?
+let s:end_start_regex = '^\s*\zs\<\%(module\|class\|def\|if\|for' .
+      \ '\|while\|until\|case\|unless\|begin\)\>' .
+      \ '\|\%([*+/,=:-]\|<<\|>>\)\s*\zs' .
+      \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\)\>' .
+      \ '\|\<do\>'
+
+" Regex that defines the middle-match for the 'end' keyword.
+let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue\>\|when\|elsif\)\>'
+
+" Regex that defines the end-match for the 'end' keyword.
+let s:end_end_regex = '\%(^\|[^.:]\)\@<=\<end\>'
+
+" Expression used for searchpair() call for finding match for 'end' keyword.
+let s:end_skip_expr = s:skip_expr .
+      \ ' || (expand("<cword>") == "do"' .
+      \ ' && getline(".") =~ "^\\s*\\<while\\|until\\|for\\>")'
+
+" Regex that defines continuation lines, not including (, {, or [.
+let s:continuation_regex = '\%([\\*+/.,=:-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+
+" Regex that defines continuation lines.
+" TODO: this needs to deal with if ...: and so on
+let s:continuation_regex2 =
+      \ '\%([\\*+/.,=:({[-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+
+" Regex that defines blocks.
+let s:block_regex =
+      \ '\%(\<do\>\|{\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=\s*\%(#.*\)\=$'
+
+" 2. Auxiliary Functions {{{1
+" ======================
+
+" Check if the character at lnum:col is inside a string, comment, or is ascii.
+function s:IsInStringOrComment(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_strcom
+endfunction
+
+" Check if the character at lnum:col is inside a string or comment.
+function s:IsInStringOrComment2(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_strcom2
+endfunction
+
+" Check if the character at lnum:col is inside a string.
+function s:IsInString(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_string
+endfunction
+
+" Check if the character at lnum:col is inside a string or documentation.
+function s:IsInStringOrDocumentation(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 0), 'name') =~ s:syng_stringdoc
+endfunction
+
+" Find line above 'lnum' that isn't empty, in a comment, or in a string.
+function s:PrevNonBlankNonString(lnum)
+  let in_block = 0
+  let lnum = prevnonblank(a:lnum)
+  while lnum > 0
+    " Go in and out of blocks comments as necessary.
+    " If the line isn't empty (with opt. comment) or in a string, end search.
+    let line = getline(lnum)
+    if line =~ '^=begin$'
+      if in_block
+        let in_block = 0
+      else
+        break
+      endif
+    elseif !in_block && line =~ '^=end$'
+      let in_block = 1
+    elseif !in_block && line !~ '^\s*#.*$' && !(s:IsInStringOrComment(lnum, 1)
+          \ && s:IsInStringOrComment(lnum, strlen(line)))
+      break
+    endif
+    let lnum = prevnonblank(lnum - 1)
+  endwhile
+  return lnum
+endfunction
+
+" Find line above 'lnum' that started the continuation 'lnum' may be part of.
+function s:GetMSL(lnum)
+  " Start on the line we're at and use its indent.
+  let msl = a:lnum
+  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
+  while lnum > 0
+    " If we have a continuation line, or we're in a string, use line as MSL.
+    " Otherwise, terminate search as we have found our MSL already.
+    let line = getline(lnum)
+    let col = match(line, s:continuation_regex2) + 1
+    if (col > 0 && !s:IsInStringOrComment(lnum, col))
+          \ || s:IsInString(lnum, strlen(line))
+      let msl = lnum
+    else
+      break
+    endif
+    let lnum = s:PrevNonBlankNonString(lnum - 1)
+  endwhile
+  return msl
+endfunction
+
+" Check if line 'lnum' has more opening brackets than closing ones.
+function s:LineHasOpeningBrackets(lnum)
+  let open_0 = 0
+  let open_2 = 0
+  let open_4 = 0
+  let line = getline(a:lnum)
+  let pos = match(line, '[][(){}]', 0)
+  while pos != -1
+    if !s:IsInStringOrComment(a:lnum, pos + 1)
+      let idx = stridx('(){}[]', line[pos])
+      if idx % 2 == 0
+        let open_{idx} = open_{idx} + 1
+      else
+        let open_{idx - 1} = open_{idx - 1} - 1
+      endif
+    endif
+    let pos = match(line, '[][(){}]', pos + 1)
+  endwhile
+  return (open_0 > 0) . (open_2 > 0) . (open_4 > 0)
+endfunction
+
+function s:Match(lnum, regex)
+  let col = match(getline(a:lnum), a:regex) + 1
+  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
+endfunction
+
+function s:MatchLast(lnum, regex)
+  let line = getline(a:lnum)
+  let col = match(line, '.*\zs' . a:regex)
+  while col != -1 && s:IsInStringOrComment(a:lnum, col)
+    let line = strpart(line, 0, col)
+    let col = match(line, '.*' . a:regex)
+  endwhile
+  return col + 1
+endfunction
+
+" 3. GetRubyIndent Function {{{1
+" =========================
+
 function GetRubyIndent()
-  " Find a non-blank line above the current line.
-  let lnum = prevnonblank(v:lnum - 1)
+  " 3.1. Setup {{{2
+  " ----------
+
+  " Set up variables for restoring position in file.  Could use v:lnum here.
+  let vcol = col('.')
+
+  " 3.2. Work on the current line {{{2
+  " -----------------------------
+
+  " Get the current line.
+  let line = getline(v:lnum)
+  let ind = -1
+
+  " If we got a closing bracket on an empty line, find its match and indent
+  " according to it.  For parentheses we indent to its column - 1, for the
+  " others we indent to the containing line's MSL's level.  Return -1 if fail.
+  let col = matchend(line, '^\s*[]})]')
+  if col > 0 && !s:IsInStringOrComment(v:lnum, col)
+    call cursor(v:lnum, col)
+    let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
+    if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
+      let ind = line[col-1]==')' ? virtcol('.')-1 : indent(s:GetMSL(line('.')))
+    endif
+    return ind
+  endif
+
+  " If we have a =begin or =end set indent to first column.
+  if match(line, '^\s*\%(=begin\|=end\)$') != -1
+    return 0
+  endif
+
+  " If we have a deindenting keyword, find its match and indent to its level.
+  " TODO: this is messy
+  if s:Match(v:lnum, s:ruby_deindent_keywords)
+    call cursor(v:lnum, 1)
+    if searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
+            \ s:end_skip_expr) > 0
+      let line = getline('.')
+      if strpart(line, 0, col('.') - 1) =~ '=\s*$' &&
+       \ strpart(line, col('.') - 1, 2) !~ 'do'
+        let ind = virtcol('.') - 1
+      else
+        let ind = indent('.')
+      endif
+    endif
+    return ind
+  endif
+
+  " If we are in a multi-line string or line-comment, don't do anything to it.
+  if s:IsInStringOrDocumentation(v:lnum, matchend(line, '^\s*') + 1)
+    return indent('.')
+  endif
+
+  " 3.3. Work on the previous line. {{{2
+  " -------------------------------
+
+  " Find a non-blank, non-multi-line string line above the current line.
+  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
 
   " At the start of the file use zero indent.
   if lnum == 0
     return 0
   endif
 
-  " If the line trailed with [*+,.(] - but not in a comment - trust the user
-  if getline(lnum) =~ '\(\[^#\].*\)?\(\*\|\.\|+\|,\|(\)\(\s*#.*\)\=$'
-    return -1
-  endif
-
-  " Add a 'shiftwidth' after lines beginning with:
-  " module, class, dev, if, for, while, until, else, elsif, case, when, {
+  " Set up variables for current line.
+  let line = getline(lnum)
   let ind = indent(lnum)
-  let flag = 0
-  if getline(lnum) =~ '^\s*\(module\>\|class\>\|def\>\|if\>\|for\>\|while\>\|until\>\|else\>\|elsif\>\|case\>\|when\>\|unless\|begin\|ensure\>\|rescue\>\)'
-	\ || getline(lnum) =~ '{\s*$'
-	\ || getline(lnum) =~ '\({\|\<do\>\).*|.*|\s*$'
-	\ || getline(lnum) =~ '\<do\>\(\s*#.*\)\=$'
-    let ind = ind + &sw
-    let flag = 1
+
+  " If the previous line ended with a block opening, add a level of indent.
+  if s:Match(lnum, s:block_regex)
+    return indent(s:GetMSL(lnum)) + &sw
   endif
 
-  " Subtract a 'shiftwidth' after lines ending with
-  " "end" when they begin with while, if, for, until
-  if flag == 1 && getline(lnum) =~ '\<end\>\(\s*#.*\)\=$'
-    let ind = ind - &sw
+  " If the previous line contained an opening bracket, and we are still in it,
+  " add indent depending on the bracket type.
+  if line =~ '[[({]'
+    let counts = s:LineHasOpeningBrackets(lnum)
+    if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
+      return virtcol('.')
+    elseif counts[1] == '1' || counts[2] == '1'
+      return ind + &sw
+    else
+      call cursor(v:lnum, vcol)
+    end
   endif
 
-  " Subtract a 'shiftwidth' on end, else and, elsif, when and }
-  if getline(v:lnum) =~ '^\s*\(end\>\|else\>\|elsif\>\|when\>\|ensure\>\|rescue\>\|}\)'
-    let ind = ind - &sw
+  " If the previous line ended with an "end", match that "end"s beginning's
+  " indent.
+  let col = s:Match(lnum, '\%(^\|[^.]\)\<end\>\s*\%(#.*\)\=$')
+  if col > 0
+    call cursor(lnum, col)
+    if searchpair(s:end_start_regex, '', s:end_end_regex, 'bW',
+                \ s:end_skip_expr) > 0
+      let n = line('.')
+      let ind = indent('.')
+      let msl = s:GetMSL(n)
+      if msl != n
+        let ind = indent(msl)
+      end
+      return ind
+    endif
+  end
+
+  let col = s:Match(lnum, s:ruby_indent_keywords)
+  if col > 0
+    call cursor(lnum, col)
+    let ind = virtcol('.') - 1 + &sw
+"    let ind = indent(lnum) + &sw
+    " TODO: make this better (we need to count them) (or, if a searchpair
+    " fails, we know that something is lacking an end and thus we indent a
+    " level
+    if s:Match(lnum, s:end_end_regex)
+      let ind = indent('.')
+    endif
+    return ind
   endif
 
+  " 3.4. Work on the MSL line. {{{2
+  " --------------------------
+
+  " Set up variables to use and search for MSL to the previous line.
+  let p_lnum = lnum
+  let lnum = s:GetMSL(lnum)
+
+  " If the previous line wasn't a MSL and is continuation return its indent.
+  " TODO: the || s:IsInString() thing worries me a bit.
+  if p_lnum != lnum
+    if s:Match(p_lnum,s:continuation_regex)||s:IsInString(p_lnum,strlen(line))
+      return ind
+    endif
+  endif
+
+  " Set up more variables, now that we know we wasn't continuation bound.
+  let line = getline(lnum)
+  let msl_ind = indent(lnum)
+
+  " If the MSL line had an indenting keyword in it, add a level of indent.
+  " TODO: this does not take into account contrived things such as
+  " module Foo; class Bar; end
+  if s:Match(lnum, s:ruby_indent_keywords)
+    let ind = msl_ind + &sw
+    if s:Match(lnum, s:end_end_regex)
+      let ind = ind - &sw
+    endif
+    return ind
+  endif
+
+  " If the previous line ended with [*+/.-=], indent one extra level.
+  if s:Match(lnum, s:continuation_regex)
+    if lnum == p_lnum
+      let ind = msl_ind + &sw
+    else
+      let ind = msl_ind
+    endif
+  endif
+
+  " }}}2
+
   return ind
 endfunction
 
-" vim:sw=2
+" }}}1
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

runtime/indent/sml.vim

@@ -0,0 +1,215 @@
+" Vim indent file
+" Language:     SML
+" Maintainer:	Saikat Guha <sg266@cornell.edu>
+" 				Hubert Chao <hc85@cornell.edu>
+" Original OCaml Version:
+" 				Jean-Francois Yuen  <jfyuen@ifrance.com>
+"               Mike Leary          <leary@nwlink.com>
+"               Markus Mottl        <markus@oefai.at>
+" OCaml URL:    http://www.oefai.at/~markus/vim/indent/ocaml.vim
+" Last Change:  2003 Jan 04	- Adapted to SML
+" 				2002 Nov 06 - Some fixes (JY)
+"               2002 Oct 28 - Fixed bug with indentation of ']' (MM)
+"               2002 Oct 22 - Major rewrite (JY)
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal expandtab
+setlocal indentexpr=GetSMLIndent()
+setlocal indentkeys+=0=and,0=else,0=end,0=handle,0=if,0=in,0=let,0=then,0=val,0=fun,0=\|,0=*),0)
+setlocal nolisp
+setlocal nosmartindent
+setlocal textwidth=80
+setlocal shiftwidth=2
+
+" Comment formatting
+if (has("comments"))
+  set comments=sr:(*,mb:*,ex:*)
+  set fo=cqort
+endif
+
+" Only define the function once.
+"if exists("*GetSMLIndent")
+"finish
+"endif
+
+" Define some patterns:
+let s:beflet = '^\s*\(initializer\|method\|try\)\|\(\<\(begin\|do\|else\|in\|then\|try\)\|->\|;\)\s*$'
+let s:letpat = '^\s*\(let\|type\|module\|class\|open\|exception\|val\|include\|external\)\>'
+let s:letlim = '\(\<\(sig\|struct\)\|;;\)\s*$'
+let s:lim = '^\s*\(exception\|external\|include\|let\|module\|open\|type\|val\)\>'
+let s:module = '\<\%(let\|sig\|struct\)\>'
+let s:obj = '^\s*\(constraint\|inherit\|initializer\|method\|val\)\>\|\<\(object\|object\s*(.*)\)\s*$'
+let s:type = '^\s*\%(let\|type\)\>.*='
+let s:val = '^\s*\(val\|external\)\>.*:'
+
+" Skipping pattern, for comments
+function! s:SkipPattern(lnum, pat)
+  let def = prevnonblank(a:lnum - 1)
+  while def > 0 && getline(def) =~ a:pat
+    let def = prevnonblank(def - 1)
+  endwhile
+  return def
+endfunction
+
+" Indent for ';;' to match multiple 'let'
+function! s:GetInd(lnum, pat, lim)
+  let llet = search(a:pat, 'bW')
+  let old = indent(a:lnum)
+  while llet > 0
+    let old = indent(llet)
+    let nb = s:SkipPattern(llet, '^\s*(\*.*\*)\s*$')
+    if getline(nb) =~ a:lim
+      return old
+    endif
+    let llet = search(a:pat, 'bW')
+  endwhile
+  return old
+endfunction
+
+" Indent pairs
+function! s:FindPair(pstart, pmid, pend)
+  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+  let lno = searchpair(a:pstart, a:pmid, a:pend, 'bW', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
+  if lno == -1
+	return indent(lno)
+  else
+	return col(".") - 1
+  endif
+endfunction
+
+function! s:FindLet(pstart, pmid, pend)
+  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+  let lno = searchpair(a:pstart, a:pmid, a:pend, 'bW', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
+  let moduleLine = getline(lno)
+  if lno == -1 || moduleLine =~ '^\s*\(fun\|structure\|signature\)\>'
+	return indent(lno)
+  else
+	return col(".") - 1
+  endif
+endfunction
+
+" Indent 'let'
+"function! s:FindLet(pstart, pmid, pend)
+"  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ "^\\s*let\\>.*=\\s*$\\|" . s:beflet'))
+"endfunction
+
+function! GetSMLIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+  let lline = getline(lnum)
+
+	" Return double 'shiftwidth' after lines matching:
+	if lline =~ '^\s*|.*=>\s*$'
+		return ind + &sw + &sw
+	elseif lline =~ '^\s*val\>.*=\s*$'
+		return ind + &sw
+	endif
+
+  let line = getline(v:lnum)
+
+	" Indent lines starting with 'end' to matching module
+	if line =~ '^\s*end\>'
+		return s:FindLet(s:module, '', '\<end\>')
+
+	" Match 'else' with 'if'
+	elseif line =~ '^\s*else\>'
+	  	if lline !~ '^\s*\(if\|else\|then\)\>'
+				return s:FindPair('\<if\>', '', '\<then\>')
+	  	else return ind
+		endif
+
+	" Match 'then' with 'if'
+	elseif line =~ '^\s*then\>'
+  	if lline !~ '^\s*\(if\|else\|then\)\>'
+		  return s:FindPair('\<if\>', '', '\<then\>')
+	else return ind
+	endif
+
+	" Indent if current line begins with ']'
+	elseif line =~ '^\s*\]'
+		return s:FindPair('\[','','\]')
+
+  " Indent current line starting with 'in' to last matching 'let'
+	elseif line =~ '^\s*in\>'
+		let ind = s:FindLet('\<let\>','','\<in\>')
+
+	" Indent from last matching module if line matches:
+	elseif line =~ '^\s*\(fun\|val\|open\|structure\|and\|datatype\|type\|exception\)\>'
+		cursor(lnum,1)
+  		let lastModule = indent(searchpair(s:module, '', '\<end\>', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+		if lastModule == -1
+			return 0
+		else
+			return lastModule + &sw
+		endif
+
+	" Indent lines starting with '|' from matching 'case', 'handle'
+	elseif line =~ '^\s*|'
+		" cursor(lnum,1)
+		let lastSwitch = search('\<\(case\|handle\|fun\|datatype\)\>','bW')
+		let switchLine = getline(lastSwitch)
+		let switchLineIndent = indent(lastSwitch)
+		if lline =~ '^\s*|'
+		  return ind
+		endif
+		if switchLine =~ '\<case\>'
+			return col(".") + 2
+		elseif switchLine =~ '\<handle\>'
+			return switchLineIndent + &sw
+		elseif switchLine =~ '\<datatype\>'
+			call search('=')
+			return col(".") - 1
+		else
+			return switchLineIndent + 2
+		endif
+
+
+  " Indent if last line ends with 'sig', 'struct', 'let', 'then', 'else',
+  " 'in'
+  elseif lline =~ '\<\(sig\|struct\|let\|in\|then\|else\)\s*$'
+		let ind = ind + &sw
+
+  " Indent if last line ends with 'of', align from 'case'
+  elseif lline =~ '\<\(of\)\s*$'
+		call search('\<case\>',"bW")
+		let ind = col(".")+4
+
+	" Indent if current line starts with 'of'
+  elseif line =~ '^\s*of\>'
+		call search('\<case\>',"bW")
+		let ind = col(".")+1
+
+
+	" Indent if last line starts with 'fun', 'case', 'fn'
+	elseif lline =~ '^\s*\(fun\|fn\|case\)\>'
+		let ind = ind + &sw
+
+	endif
+
+	" Don't indent 'let' if last line started with 'fun', 'fn'
+	if line =~ '^\s*let\>'
+		if lline =~ '^\s*\(fun\|fn\)'
+			let ind = ind - &sw
+		endif
+  endif
+
+  return ind
+
+endfunction
+
+" vim:sw=2

runtime/keymap/tamil_tscii.vim

@@ -0,0 +1,572 @@
+" Keymap file for the editing Tamil language files in TSCII encoding.
+"
+" Maintainer: Yegappan Lakshmanan (yegappan AT yahoo DOT com)
+" Last updated: August 4, 2005
+"
+" You will need a fixed width TSCII font to use this encoding.  The
+" Avarangal TSCII fixed width font (TSC_AvarangalFxd) is used to test
+" this keymap.
+"
+" Visit http://www.tscii.org for more information about the TSCII
+" encoding.
+" 
+let b:keymap_name = "tamil_tscii"
+
+loadkeymap
+
+" Uyir (Vowels) letters
+a      <char-171>
+aa     <char-172>
+A      <char-172>
+i      <char-173>
+ii     <char-174>
+I      <char-174>
+u      <char-175>
+uu     <char-176>
+U      <char-176>
+e      <char-177>
+ee     <char-178>
+E      <char-178>
+ai     <char-179>
+o      <char-180>
+oo     <char-181>
+O      <char-181>
+au     <char-182>
+q      <char-183>
+
+" mey (Consonants) letters
+k      <char-236>
+ka     <char-184>
+kaa    <char-184><char-161>
+kA     <char-184><char-161>
+ki     <char-184><char-162>
+kii    <char-184><char-163>
+kI     <char-184><char-163>
+ku     <char-204>
+kuu    <char-220>
+kU     <char-220>
+ke     <char-166><char-184>
+kee    <char-167><char-184>
+kE     <char-167><char-184>
+kai    <char-168><char-184>
+ko     <char-166><char-184><char-161>
+koo    <char-167><char-184><char-161>
+kO     <char-167><char-184><char-161>
+kau    <char-166><char-184><char-199>
+
+g      <char-236>
+ga     <char-184>
+gaa    <char-184><char-161>
+gA     <char-184><char-161>
+gi     <char-184><char-162>
+gii    <char-184><char-163>
+gI     <char-184><char-163>
+gu     <char-204>
+guu    <char-220>
+gU     <char-220>
+ge     <char-166><char-184>
+gee    <char-167><char-184>
+gE     <char-167><char-184>
+gai    <char-168><char-184>
+go     <char-166><char-184><char-161>
+goo    <char-167><char-184><char-161>
+gO     <char-167><char-184><char-161>
+gau    <char-166><char-184><char-199>
+
+ng     <char-237>
+nga    <char-185>
+ngaa   <char-185><char-161>
+ngA    <char-185><char-161>
+ngi    <char-185><char-162>
+ngii   <char-185><char-163>
+ngI    <char-185><char-163>
+ngu    <char-153>
+nguu   <char-155>
+ngU    <char-155>
+nge    <char-166><char-185>
+ngee   <char-167><char-185>
+ngE    <char-167><char-185>
+ngai   <char-168><char-185>
+ngo    <char-166><char-185><char-161>
+ngoo   <char-167><char-185><char-161>
+ngO    <char-167><char-185><char-161>
+ngau   <char-166><char-185><char-199>
+
+ch     <char-238>
+cha    <char-186>
+chaa   <char-186><char-161>
+chA    <char-186><char-161>
+chi    <char-186><char-162>
+chii   <char-186><char-163>
+chI    <char-186><char-163>
+chu    <char-204>
+chuu   <char-221>
+chU    <char-221>
+che    <char-166><char-186>
+chee   <char-167><char-186>
+chE    <char-167><char-186>
+chai   <char-168><char-186>
+cho    <char-166><char-186><char-161>
+choo   <char-167><char-186><char-161>
+chO    <char-167><char-186><char-161>
+chau   <char-166><char-186><char-199>
+
+s      <char-238>
+sa     <char-186>
+saa    <char-186><char-161>
+sA     <char-186><char-161>
+si     <char-186><char-162>
+sii    <char-186><char-163>
+sI     <char-186><char-163>
+su     <char-204>
+suu    <char-221>
+sU     <char-221>
+se     <char-166><char-186>
+see    <char-167><char-186>
+sE     <char-167><char-186>
+sai    <char-168><char-186>
+so     <char-166><char-186><char-161>
+soo    <char-167><char-186><char-161>
+sO     <char-167><char-186><char-161>
+sau    <char-166><char-186><char-199>
+
+nj     <char-239>
+nja    <char-187>
+njaa   <char-187><char-161>
+njA    <char-187><char-161>
+nji    <char-187><char-162>
+njii   <char-187><char-163>
+njI    <char-187><char-163>
+nju    <char-154>
+njuu   <char-156>
+njU    <char-156>
+nje    <char-166><char-187>
+njee   <char-167><char-187>
+njE    <char-167><char-187>
+njai   <char-168><char-187>
+njo    <char-166><char-187><char-161>
+njoo   <char-167><char-187><char-161>
+njO    <char-167><char-187><char-161>
+njau   <char-166><char-187><char-199>
+
+t      <char-240>
+ta     <char-188>
+taa    <char-188><char-161>
+tA     <char-188><char-161>
+ti     <char-202>
+tii    <char-203>
+tI     <char-203>
+tu     <char-206>
+tuu    <char-222>
+tU     <char-222>
+te     <char-166><char-188>
+tee    <char-167><char-188>
+tE     <char-167><char-188>
+tai    <char-168><char-188>
+to     <char-166><char-188><char-161>
+too    <char-167><char-188><char-161>
+tO     <char-167><char-188><char-161>
+tau    <char-166><char-188><char-199>
+
+d      <char-240>
+da     <char-188>
+daa    <char-188><char-161>
+dA     <char-188><char-161>
+di     <char-202>
+dii    <char-203>
+dI     <char-203>
+du     <char-206>
+duu    <char-222>
+dU     <char-222>
+de     <char-166><char-188>
+dee    <char-167><char-188>
+dE     <char-167><char-188>
+dai    <char-168><char-188>
+do     <char-166><char-188><char-161>
+doo    <char-167><char-188><char-161>
+dO     <char-167><char-188><char-161>
+dau    <char-166><char-188><char-199>
+
+N      <char-241>
+Na     <char-189>
+Naa    <char-189><char-161>
+NA     <char-189><char-161>
+Ni     <char-189><char-162>
+Nii    <char-189><char-163>
+NI     <char-189><char-163>
+Nu     <char-207>
+Nuu    <char-223>
+NU     <char-223>
+Ne     <char-166><char-189>
+Nee    <char-167><char-189>
+NE     <char-167><char-189>
+Nai    <char-168><char-189>
+No     <char-166><char-189><char-161>
+Noo    <char-167><char-189><char-161>
+NO     <char-167><char-189><char-161>
+Nau    <char-166><char-189><char-199>
+
+th     <char-242>
+tha    <char-190>
+thaa   <char-190><char-161>
+thA    <char-190><char-161>
+thi    <char-190><char-162>
+thii   <char-190><char-163>
+thI    <char-190><char-163>
+thu    <char-208>
+thuu   <char-224>
+thU    <char-224>
+the    <char-166><char-190>
+thee   <char-167><char-190>
+thE    <char-167><char-190>
+thai   <char-168><char-190>
+tho    <char-166><char-190><char-161>
+thoo   <char-167><char-190><char-161>
+thO    <char-167><char-190><char-161>
+thau   <char-166><char-190><char-199>
+
+w      <char-243>
+wa     <char-191>
+waa    <char-191><char-161>
+wA     <char-191><char-161>
+wi     <char-191><char-162>
+wii    <char-191><char-163>
+wI     <char-191><char-163>
+wu     <char-209>
+wuu    <char-225>
+wU     <char-225>
+we     <char-166><char-191>
+wee    <char-167><char-191>
+wE     <char-167><char-191>
+wai    <char-168><char-191>
+wo     <char-166><char-191><char-161>
+woo    <char-167><char-191><char-161>
+wO     <char-167><char-191><char-161>
+wau    <char-166><char-191><char-199>
+
+n-     <char-243>
+n-a    <char-191>
+n-aa   <char-191><char-161>
+n-A    <char-191><char-161>
+n-i    <char-191><char-162>
+n-ii   <char-191><char-163>
+n-I    <char-191><char-163>
+n-u    <char-209>
+n-uu   <char-225>
+n-U    <char-225>
+n-e    <char-166><char-191>
+n-ee   <char-167><char-191>
+n-E    <char-167><char-191>
+n-ai   <char-168><char-191>
+n-o    <char-166><char-191><char-161>
+n-oo   <char-167><char-191><char-161>
+n-O    <char-167><char-191><char-161>
+n-au   <char-166><char-191><char-199>
+
+p      <char-244>
+pa     <char-192>
+paa    <char-192><char-161>
+pA     <char-192><char-161>
+pi     <char-192><char-162>
+pii    <char-192><char-163>
+pI     <char-192><char-163>
+pu     <char-210>
+puu    <char-226>
+pU     <char-226>
+pe     <char-166><char-192>
+pee    <char-167><char-192>
+pE     <char-167><char-192>
+pai    <char-168><char-192>
+po     <char-166><char-192><char-161>
+poo    <char-167><char-192><char-161>
+pO     <char-167><char-192><char-161>
+pau    <char-166><char-192><char-199>
+
+b      <char-244>
+ba     <char-192>
+baa    <char-192><char-161>
+bA     <char-192><char-161>
+bi     <char-192><char-162>
+bii    <char-192><char-163>
+bI     <char-192><char-163>
+bu     <char-210>
+buu    <char-226>
+bU     <char-226>
+be     <char-166><char-192>
+bee    <char-167><char-192>
+bE     <char-167><char-192>
+bai    <char-168><char-192>
+bo     <char-166><char-192><char-161>
+boo    <char-167><char-192><char-161>
+bO     <char-167><char-192><char-161>
+bau    <char-166><char-192><char-199>
+
+m      <char-245>
+ma     <char-193>
+maa    <char-193><char-161>
+mA     <char-193><char-161>
+mi     <char-193><char-162>
+mii    <char-193><char-163>
+mI     <char-193><char-163>
+mu     <char-211>
+muu    <char-227>
+mU     <char-227>
+me     <char-166><char-193>
+mee    <char-167><char-193>
+mE     <char-167><char-193>
+mai    <char-168><char-193>
+mo     <char-166><char-193><char-161>
+moo    <char-167><char-193><char-161>
+mO     <char-167><char-193><char-161>
+mau    <char-166><char-193><char-199>
+
+y      <char-246>
+ya     <char-194>
+yaa    <char-194><char-161>
+yA     <char-194><char-161>
+yi     <char-194><char-162>
+yii    <char-194><char-163>
+yI     <char-194><char-163>
+yu     <char-212>
+yuu    <char-228>
+yU     <char-228>
+ye     <char-166><char-194>
+yee    <char-167><char-194>
+yE     <char-167><char-194>
+yai    <char-168><char-194>
+yo     <char-166><char-194><char-161>
+yoo    <char-167><char-194><char-161>
+yO     <char-167><char-194><char-161>
+yau    <char-166><char-194><char-199>
+
+r      <char-247>
+ra     <char-195>
+raa    <char-195><char-161>
+rA     <char-195><char-161>
+ri     <char-195><char-162>
+rii    <char-195><char-163>
+rI     <char-195><char-163>
+ru     <char-213>
+ruu    <char-229>
+rU     <char-229>
+re     <char-166><char-195>
+ree    <char-167><char-195>
+rE     <char-167><char-195>
+rai    <char-168><char-195>
+ro     <char-166><char-195><char-161>
+roo    <char-167><char-195><char-161>
+rO     <char-167><char-195><char-161>
+rau    <char-166><char-195><char-199>
+
+l      <char-248>
+la     <char-196>
+laa    <char-196><char-161>
+lA     <char-196><char-161>
+li     <char-196><char-162>
+lii    <char-196><char-163>
+lI     <char-196><char-163>
+lu     <char-214>
+luu    <char-230>
+lU     <char-230>
+le     <char-166><char-196>
+lee    <char-167><char-196>
+lE     <char-167><char-196>
+lai    <char-168><char-196>
+lo     <char-166><char-196><char-161>
+loo    <char-167><char-196><char-161>
+lO     <char-167><char-196><char-161>
+lau    <char-166><char-196><char-199>
+
+v      <char-249>
+va     <char-197>
+vaa    <char-197><char-161>
+vA     <char-197><char-161>
+vi     <char-197><char-162>
+vii    <char-197><char-163>
+vI     <char-197><char-163>
+vu     <char-215>
+vuu    <char-231>
+vU     <char-231>
+ve     <char-166><char-197>
+vee    <char-167><char-197>
+vE     <char-167><char-197>
+vai    <char-168><char-197>
+vo     <char-166><char-197><char-161>
+voo    <char-167><char-197><char-161>
+vO     <char-167><char-197><char-161>
+vau    <char-166><char-197><char-199>
+
+z      <char-250>
+za     <char-198>
+zaa    <char-198><char-161>
+zA     <char-198><char-161>
+zi     <char-198><char-162>
+zii    <char-198><char-163>
+zI     <char-198><char-163>
+zu     <char-216>
+zuu    <char-232>
+zU     <char-232>
+ze     <char-166><char-198>
+zee    <char-167><char-198>
+zE     <char-167><char-198>
+zai    <char-168><char-198>
+zo     <char-166><char-198><char-161>
+zoo    <char-167><char-198><char-161>
+zO     <char-167><char-198><char-161>
+zau    <char-166><char-198><char-199>
+
+L      <char-251>
+La     <char-199>
+Laa    <char-199><char-161>
+LA     <char-199><char-161>
+Li     <char-199><char-162>
+Lii    <char-199><char-163>
+LI     <char-199><char-163>
+Lu     <char-217>
+Luu    <char-233>
+LU     <char-233>
+Le     <char-166><char-199>
+Lee    <char-167><char-199>
+LE     <char-167><char-199>
+Lai    <char-168><char-199>
+Lo     <char-166><char-199><char-161>
+Loo    <char-167><char-199><char-161>
+LO     <char-167><char-199><char-161>
+Lau    <char-166><char-199><char-199>
+
+R      <char-252>
+Ra     <char-200>
+Raa    <char-200><char-161>
+RA     <char-200><char-161>
+Ri     <char-200><char-162>
+Rii    <char-200><char-163>
+RI     <char-200><char-163>
+Ru     <char-218>
+Ruu    <char-234>
+RU     <char-234>
+Re     <char-166><char-200>
+Ree    <char-167><char-200>
+RE     <char-167><char-200>
+Rai    <char-168><char-200>
+Ro     <char-166><char-200><char-161>
+Roo    <char-167><char-200><char-161>
+RO     <char-167><char-200><char-161>
+Rau    <char-166><char-200><char-199>
+
+n      <char-253>
+na     <char-201>
+naa    <char-201><char-161>
+nA     <char-201><char-161>
+ni     <char-201><char-162>
+nii    <char-201><char-163>
+nI     <char-201><char-163>
+nu     <char-219>
+nuu    <char-235>
+nU     <char-235>
+ne     <char-166><char-201>
+nee    <char-167><char-201>
+nE     <char-167><char-201>
+nai    <char-168><char-201>
+no     <char-166><char-201><char-161>
+noo    <char-167><char-201><char-161>
+nO     <char-167><char-201><char-161>
+nau    <char-166><char-201><char-199>
+
+" Grantha letters
+j      <char-136>
+ja     <char-131>
+jaa    <char-131><char-161>
+jA     <char-131><char-161>
+ji     <char-131><char-162>
+jii    <char-131><char-163>
+jI     <char-131><char-163>
+ju     <char-131><char-164>
+juu    <char-131><char-164>
+jU     <char-131><char-165>
+je     <char-166><char-131>
+jee    <char-167><char-131>
+jE     <char-167><char-131>
+jai    <char-168><char-131>
+jo     <char-166><char-131><char-161>
+joo    <char-167><char-131><char-161>
+jO     <char-167><char-131><char-161>
+jau    <char-166><char-131><char-199>
+
+sh     <char-137>
+sha    <char-132>
+shaa   <char-132><char-161>
+shA    <char-132><char-161>
+shi    <char-132><char-162>
+shii   <char-132><char-163>
+shI    <char-132><char-163>
+shu    <char-131><char-164>
+shuu   <char-131><char-164>
+shU    <char-131><char-165>
+she    <char-166><char-132>
+shee   <char-167><char-132>
+shE    <char-167><char-132>
+shai   <char-168><char-132>
+sho    <char-166><char-132><char-161>
+shoo   <char-167><char-132><char-161>
+shO    <char-167><char-132><char-161>
+shau   <char-166><char-132><char-199>
+
+S      <char-138>
+Sa     <char-133>
+Saa    <char-133><char-161>
+SA     <char-133><char-161>
+Si     <char-133><char-162>
+Sii    <char-133><char-163>
+SI     <char-133><char-163>
+Su     <char-133><char-164>
+Suu    <char-133><char-165>
+SU     <char-133><char-165>
+Se     <char-166><char-133>
+See    <char-167><char-133>
+SE     <char-167><char-133>
+Sai    <char-168><char-133>
+So     <char-166><char-133><char-161>
+Soo    <char-167><char-133><char-161>
+SO     <char-167><char-133><char-161>
+Sau    <char-166><char-133><char-199>
+
+h      <char-139>
+ha     <char-134>
+haa    <char-134><char-161>
+hA     <char-134><char-161>
+hi     <char-134><char-162>
+hii    <char-134><char-163>
+hI     <char-134><char-163>
+hu     <char-134><char-164>
+huu    <char-134><char-165>
+hU     <char-134><char-165>
+he     <char-166><char-134>
+hee    <char-167><char-134>
+hE     <char-167><char-134>
+hai    <char-168><char-134>
+ho     <char-166><char-134><char-161>
+hoo    <char-167><char-134><char-161>
+hO     <char-167><char-134><char-161>
+hau    <char-166><char-134><char-199>
+
+x      <char-140>
+xa     <char-135>
+xaa    <char-135><char-161>
+xA     <char-135><char-161>
+xi     <char-135><char-162>
+xii    <char-135><char-163>
+xI     <char-135><char-163>
+xu     <char-135><char-164>
+xuu    <char-135><char-165>
+xU     <char-135><char-165>
+xe     <char-166><char-135>
+xee    <char-167><char-135>
+xE     <char-167><char-135>
+xai    <char-168><char-135>
+xo     <char-166><char-135><char-161>
+xoo    <char-167><char-135><char-161>
+xO     <char-167><char-135><char-161>
+xau    <char-166><char-135><char-199>
+
+sri     <char-130>
+

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/lang/menu_sv_se.latin1.vim

@@ -1,6 +1,6 @@
 " Menu Translations:    Swedish
 " Maintainer:		Johan Svedberg <johan@svedberg.com>
-" Last Change:		2005 April 23
+" Last Change:		2005 Oct 09
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -22,8 +22,8 @@ menutrans &How-to\ links	&Hur-g
 menutrans &Find\.\.\.		&S<EFBFBD>k\.\.\.
 menutrans &Credits		&Tack
 menutrans Co&pying		&Kopieringsr<EFBFBD>ttigheter
-menutrans &Sponsor/Register	&Sponsra/Registrering
-menutrans O&rphans		F&<EFBFBD>r<EFBFBD>lderl<EFBFBD>sa
+menutrans &Sponsor/Register	&Sponsra/Registrera
+menutrans O&rphans		&F<EFBFBD>r<EFBFBD>ldral<EFBFBD>sa
 menutrans &Version		&Version
 menutrans &About		&Om
 
@@ -76,7 +76,7 @@ menutrans Insert\ mode			Infogningsl
 menutrans Block\ and\ Insert		Block\ och\ infogning
 menutrans Always			Alltid
 menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!	V<EFBFBD>xla\ infogningsl<EFBFBD>ge<Tab>:set\ im!
-menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	V<EFBFBD>xla\ Vi-kompatibelitet<Tab>:set\ cp!
+menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!	V<EFBFBD>xla\ Vi-kompabilitet<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\.		S<EFBFBD>kv<EFBFBD>g\.\.\.
 menutrans Ta&g\ Files\.\.\.		Taggfiler\.\.\.
 menutrans Toggle\ &Toolbar		V<EFBFBD>xla\ verktygsrad
@@ -93,8 +93,8 @@ menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	V
 menutrans Toggle\ &expand-tab<Tab>:set\ et!		V<EFBFBD>xla\ tab-expandering<Tab>:set\ et!
 menutrans Toggle\ &auto-indent<Tab>:set\ ai!		V<EFBFBD>xla\ auto-indentering<Tab>:set\ ai!
 menutrans Toggle\ &C-indenting<Tab>:set\ cin!		V<EFBFBD>xla\ C-indentering<Tab>:set\ cin!
-menutrans &Shiftwidth					&Shiftbredd
-menutrans Soft\ &Tabstop				Mjuka\ &Tabbstopp
+menutrans &Shiftwidth					Shiftbredd
+menutrans Soft &Tabstop					Mjuk tab-stopp
 menutrans Te&xt\ Width\.\.\.				Textbredd\.\.\.
 menutrans &File\ Format\.\.\.				Filformat\.\.\.
 
@@ -127,7 +127,7 @@ menutrans &Close\ all\ folds<Tab>zM	St
 menutrans O&pen\ more\ folds<Tab>zr	<09>ppna\ mer\ veck<Tab>zr
 menutrans &Open\ all\ folds<Tab>zR	<09>ppna\ mer\ veck<Tab>zR
 menutrans Fold\ Met&hod			Veckmetod
-menutrans M&anual			Manuell
+menutrans M&anual			Manual
 menutrans I&ndent			Indentering
 menutrans E&xpression			Uttryck
 menutrans S&yntax			Syntax
@@ -221,17 +221,15 @@ if has("toolbar")
 endif
 
 " Syntax menu
-menutrans &Syntax		&Syntax
-menutrans Set\ '&syntax'\ only	S<EFBFBD>tt\ bara\ 'syntax'
-menutrans Set\ '&filetype'\ too	S<EFBFBD>tt\ 'filetype'\ ocks<EFBFBD>
-menutrans &Off			&Av
-menutrans &Manual		&Manual
-menutrans A&utomatic		Automatiskt
+menutrans &Syntax			&Syntax
+menutrans &Show\ filetypes\ in\ menu	&Visa\ filtyper\ i\ meny
+menutrans &Off				&Av
+menutrans &Manual			&Manuellt
+menutrans A&utomatic			Automatiskt
 menutrans on/off\ for\ &This\ file	Av/P<EFBFBD>\ f<EFBFBD>r\ aktuell\ fil
-menutrans Co&lor\ test		F<EFBFBD>rgtest
-menutrans &Highlight\ test	Framh<EFBFBD>vningstest
-menutrans &Convert\ to\ HTML	Konvertera\ till\ &HTML
-menutrans &Show\ individual\ choices	Visa\ individuella\ val
+menutrans Co&lor\ test			F<EFBFBD>rgtest
+menutrans &Highlight\ test		Framh<EFBFBD>vningstest
+menutrans &Convert\ to\ HTML		Konvertera\ till\ &HTML
 
 " dialog texts
 let menutrans_no_file = "[Ingen fil]"

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 Aug 16
+" Last Change:	2005 Oct 01
 
 " 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.
@@ -902,7 +902,7 @@ if has("spell")
     endif
 
     let curcol = col('.')
-    let w = spellbadword()
+    let [w, a] = spellbadword()
     if col('.') > curcol		" don't use word after the cursor
       let w = ''
       call cursor(0, curcol)	" put the cursor back where it was

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 Oct 02
 
 " 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
 
 
@@ -696,12 +698,17 @@ call append("$", "formatlistpat\tpattern to recognize a numbered list")
 call append("$", "\t(local to buffer)")
 call <SID>OptionL("flp")
 if has("insert_expand")
-  call append("$", "complete\tspecifies how Insert mode completion works")
+  call append("$", "complete\tspecifies how Insert mode completion works for CTRL-N and CTRL-P")
   call append("$", "\t(local to buffer)")
   call <SID>OptionL("cpt")
+  call append("$", "completeopt\twhether to use a popup menu for Insert mode completion")
+  call <SID>OptionG("cot", &cot)
   call append("$", "completefunc\tuser defined function for Insert mode completion")
   call append("$", "\t(local to buffer)")
   call <SID>OptionL("cfu")
+  call append("$", "omnifunc\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/NetrwSettings.vim

@@ -1,157 +0,0 @@
-" 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/plugin/netrwPlugin.vim

@@ -1,19 +1,17 @@
-" netrw.vim: Handles file transfer and remote directory listing across a network
+" netrwPlugin.vim: Handles file transfer and remote directory listing across a network
 "            PLUGIN PORTION
-" Last Change:	Aug 17, 2005
+" Date:		Oct 12, 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.
+"               netrw.vim, netrwPlugin.vim, and netrwSettings.vim are 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)
@@ -21,16 +19,12 @@
 
 " ---------------------------------------------------------------------
 " Load Once: {{{1
-if exists("g:loaded_netrw") || &cp
-  finish
-endif
-if v:version < 600
- echoerr "***netrw*** doesn't support Vim version ".v:version
+if exists("g:loaded_netrw")
  finish
 endif
-let g:loaded_netrw  = "v65a"
 if v:version < 700
- let loaded_explorer = 1
+ echohl WarningMsg | echo "***netrw*** you need vim version 7.0 for this version of netrw" | echohl None
+ finish
 endif
 let s:keepcpo= &cpo
 set cpo&vim
@@ -55,8 +49,8 @@ augroup Network
  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>")
+ 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
@@ -65,15 +59,15 @@ com! -range=% -nargs=*	Nwrite		call netrw#NetSavePosn()<bar><line1>,<line2>call
 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>)
+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()
+com! -nargs=0 NetrwSettings :call netrwSettings#NetrwSettings()
 
 " ---------------------------------------------------------------------
 " LocalBrowse: {{{2
@@ -138,7 +132,7 @@ endfun
 "               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
+if has("win95") && exists("g:netrw_win95ftp") && 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>)
@@ -149,8 +143,8 @@ if has("win95") && g:netrw_win95ftp
  endfun
 endif
 
+" ------------------------------------------------------------------------
+" Modelines And Restoration: {{{1
 let &cpo= s:keepcpo
 unlet s:keepcpo
-" ------------------------------------------------------------------------
-" Modelines: {{{1
 " vim:ts=8 fdm=marker

runtime/plugin/tarPlugin.vim

@@ -0,0 +1,33 @@
+" tarPlugin.vim -- a Vim plugin for browsing tarfiles
+" Copyright (c) 2002, Michael C. Toren <mct@toren.net>
+" Distributed under the GNU General Public License.
+"
+" Updates are available from <http://michael.toren.net/code/>.  If you
+" find this script useful, or have suggestions for improvements, please
+" let me know.
+" Also look there for further comments and documentation.
+"
+" This part only sets the autocommands.  The functions are in autoload/tar.vim.
+
+if has("autocmd")
+  augroup tar
+    au!
+    au BufReadCmd   tarfile:*	call tar#Read(expand("<afile>"), 1)
+    au BufReadCmd   tarfile:*/*	call tar#Read(expand("<afile>"), 1)
+    au FileReadCmd  tarfile:*	call tar#Read(expand("<afile>"), 0)
+    au FileReadCmd  tarfile:*/*	call tar#Read(expand("<afile>"), 0)
+
+    au BufWriteCmd  tarfile:*	call tar#Write(expand("<afile>"))
+    au BufWriteCmd  tarfile:*/*	call tar#Write(expand("<afile>"))
+    au FileWriteCmd tarfile:*	call tar#Write(expand("<afile>"))
+    au FileWriteCmd tarfile:*/*	call tar#Write(expand("<afile>"))
+
+    au BufReadCmd   *.tar	call tar#Browse(expand("<afile>"))
+    au BufReadCmd   *.tar.gz	call tar#Browse(expand("<afile>"))
+    au BufReadCmd   *.tar.bz2	call tar#Browse(expand("<afile>"))
+    au BufReadCmd   *.tar.Z	call tar#Browse(expand("<afile>"))
+    au BufReadCmd   *.tgz	call tar#Browse(expand("<afile>"))
+  augroup END
+endif
+
+" vim: ts=8

runtime/plugin/zipPlugin.vim

@@ -0,0 +1,44 @@
+" zipPlugin.vim: Handles browsing zipfiles
+"            PLUGIN PORTION
+" Date:			Sep 14, 2005
+" Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
+" License:		Vim License  (see vim's :help license)
+" Copyright:    Copyright (C) 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,
+"               zipPlugin.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.
+
+" ---------------------------------------------------------------------
+" Initialization: {{{1
+let s:keepcpo= &cpo
+set cpo&vim
+
+" ---------------------------------------------------------------------
+" Public Interface: {{{1
+augroup zip
+ au!
+ au BufReadCmd   zipfile:*	call zip#Read(expand("<afile>"), 1)
+ au FileReadCmd  zipfile:*	call zip#Read(expand("<afile>"), 0)
+ au BufWriteCmd  zipfile:*	call zip#Write(expand("<afile>"))
+ au FileWriteCmd zipfile:*	call zip#Write(expand("<afile>"))
+
+ if has("unix")
+  au BufReadCmd   zipfile:*/*	call zip#Read(expand("<afile>"), 1)
+  au FileReadCmd  zipfile:*/*	call zip#Read(expand("<afile>"), 0)
+  au BufWriteCmd  zipfile:*/*	call zip#Write(expand("<afile>"))
+  au FileWriteCmd zipfile:*/*	call zip#Write(expand("<afile>"))
+ endif
+
+ au BufReadCmd   *.zip		call zip#Browse(expand("<afile>"))
+augroup END
+
+" ------------------------------------------------------------------------
+" Modelines And Restoration: {{{1
+let &cpo= s:keepcpo
+unlet s:keepcpo
+" vim:ts=8 fdm=marker

runtime/scripts.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2005 May 20
+" Last change:	2005 Oct 12
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -138,6 +138,10 @@ if s:line1 =~ "^#!"
   elseif s:name =~ 'scheme'
     set ft=scheme
 
+    " CFEngine scripts
+  elseif s:name =~ 'cfengine'
+    set ft=cfengine
+
   endif
   unlet s:name
 
@@ -182,6 +186,7 @@ else
     " - "Index: <filename>" in the first line (CVS file)
   elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\)'
 	\ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ')
+	\ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ')
 	\ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ')
     set ft=diff
 

runtime/spell/README.txt

@@ -11,6 +11,9 @@ Copyright notices for specific languages are in README_??.txt.  Note that the
 files for different regions are merged, both to save space and to make it
 possible to highlight words for another region different from bad words.
 
+Most of the soundslike mappings come from Aspell ??_phonet.dat files:
+ftp://ftp.gnu.org/gnu/aspell/dict/.  Most go under the GPL or LGPL copyright.
+
 
 GENERATING .SPL FILES
 

runtime/spell/am/am_ET.diff

@@ -0,0 +1,9 @@
+*** am_ET.orig.aff	Mon Aug 22 11:52:57 2005
+--- am_ET.aff	Thu Sep 29 21:56:20 2005
+***************
+*** 24 ****
+--- 24,27 ----
+  SFX c   0     ዎች        
++ 
++ # Aspell has sound folding for Amharic, but it doesn't look right, it uses
++ # different characters than the dictionary.  Therefore it was not included.

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

@@ -1,5 +1,5 @@
-*** bg_BG.orig.aff	Sun Aug 14 18:12:44 2005
---- bg_BG.aff	Sun Aug 14 18:13:12 2005
+*** bg_BG.orig.aff	Sun Aug 28 21:34:44 2005
+--- bg_BG.aff	Thu Sep 29 21:59:31 2005
 ***************
 *** 1,2 ****
 ! SET microsoft-cp1251
@@ -33,10 +33,154 @@
   MAP P<>
 - MAP Y<>
   MAP X<>
---- 1706,1711 ----
+--- 1706,1855 ----
   MAP P<>
   MAP X<>
 + 
 + REP 2
 + REP Y <20>
 + REP <20> Y
++ 
++ #   Bulgarian phonetic transformation rules for use with Aspell
++ #   Copyright (C) 2003 Anton Zinoviev
++ #
++ #   This software may be used and distributed under the same terms as
++ #   the other parts of the bgoffice project.
++ #
++ #   Changelog:
++ #
++ #   19.IX.2003  Anton Zinoviev <zinoviev@debian.org>
++ #               Initial release
++ 
++ SAL version         1
++ SAL followup        0
++ SAL collapse_result 1
++ 
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           <20>
++ SAL <20>                           _
++ SAL <20>                           _
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD><                        <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD><                        <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20>T(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-   <20>
++ SAL <20><>$                         <20>
++ SAL <20>T$                         <20>
++ SAL <20>                           <20>
++ SAL <20><><EFBFBD>                         <20><>
++ SAL <20>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-    <20>
++ SAL <20>$                          <20>
++ SAL <20>                           <20>

runtime/spell/bg/main.aap

@@ -19,7 +19,6 @@ $SPELLDIR/bg.utf-8.spl : $FILES
 
 ../README_bg.txt: README_bg_BG.txt
         :copy $source $target
-        :sys $VIM $target -e -c "set ff=unix" -c wq
 
 #
 # Fetching the files from OpenOffice.org.
@@ -35,8 +34,9 @@ bg_BG.aff bg_BG.dic: {buildcheck=}
         :fetch bg_BG.zip
         :sys $UNZIP bg_BG.zip
         :delete bg_BG.zip
-        :sys $VIM bg_BG.aff -c "set ff=unix" -c "update" -c q
-        :sys $VIM bg_BG.dic -c "set ff=unix" -c "update" -c q
+        :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'):

runtime/spell/cy/cy_GB.diff

@@ -0,0 +1,9 @@
+*** cy_GB.orig.aff	Wed Aug 31 21:44:01 2005
+--- cy_GB.aff	Wed Aug 31 21:44:01 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

@@ -1,16 +1,140 @@
 *** da_DK.orig.aff	Sun Aug 14 20:04:31 2005
---- da_DK.aff	Mon Aug 15 14:03:06 2005
+--- da_DK.aff	Thu Sep 29 22:20:15 2005
 ***************
 *** 6,7 ****
---- 6,16 ----
+--- 6,13 ----
   
 + 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-
+***************
+*** 606,618 ****
+--- 612,735 ----
+  
++ # sound folding from Aspell
++ # Doesn't contain a copyright notice.
++ # version 0.1-2002.12.15-3
++ 
++ SAL AA<                  <20>
++ SAL ACTION               AKSJON
++ SAL AF<                  AV
++ SAL ASIE<                ASJE
++ SAL A                    A
++ 
++ SAL BEDST<               BEST
++ SAL BORD<                BOR
++ SAL BRYST<               BR<42>ST
++ SAL BUREAU               BYRO
++ SAL B                    B
++ 
++ SAL CC<                  KS
++ SAL CK<                  K  
++ SAL CH<                  TJ
++ SAL CI<                  SI
++ SAL CO<                  KO
++ SAL CY<                  SY
++ SAL C<                   S
++ SAL #C                   C
++ 
++ SAL DIG^$                DAJ
++ SAL DIG<                 DI
++ SAL D$                   _
++ SAL D                    D
++ 
++ SAL EAUX<                O
++ SAL EAU<                 O
++ SAL EJ$<                 AJ
++ SAL EU<                  <20>V
++ SAL E                    E
++ 
++ SAL <20>                    E
++ 
++ SAL <20>                    E
++ 
++ SAL FEDT<                FET
++ SAL F                    F
++ 
++ SAL G                    G
++ 
++ SAL HJ^<                 J
++ SAL H<>RD<                H<>R
++ SAL H<>ND<                H<>N
++ SAL H                    H
++ 
++ SAL ION<                 JON
++ SAL IND^<                IN
++ SAL I                    I
++ 
++ SAL J                    J
++ 
++ SAL K                    K
++ 
++ # Stumt G
++ SAL LIG<                 LI
++ SAL L                    L
++ 
++ SAL MAND<                MAN
++ SAL MIG^$                MAJ
++ SAL M                    M
++ 
++ SAL N                    N
++ 
++ SAL OST                  <20>ST
++ SAL O                    O
++ 
++ SAL <20>                    O
++ 
++ SAL PH<                  F
++ SAL P                    P
++ 
++ SAL Q<                   KU
++ 
++ SAL REGN<                REJN
++ SAL RUG<                 RU
++ SAL RYG                  R<>G
++ SAL R                    R
++ 
++ SAL SH<                  SJ
++ SAL SIG^$                SAJ
++ SAL SKIND<               SKIN
++ SAL S'S<$                S
++ SAL S                    S
++ 
++ SAL TION                 SJON
++ SAL TZ<                  TS
++ SAL T                    T
+  
++ SAL U                    U
+  
++ SAL <20><                   Y
+  
++ SAL V                    V
+  
++ SAL W<                   V
+  
++ SAL X'S<                 KS
++ SAL X<                   KS
+  
++ SAL YKK<                 <20>KK
++ SAL YND<                 <20>ND
++ SAL Y                    Y
+  
++ SAL Z'S<                 S
++ SAL Z<                   S
++ SAL #Z                   Z
+  
++ SAL <20>                    <20>
+  
++ SAL <20><                   <20>
+  
++ # eks. Han l<>v en tur (l<>b) 
++ SAL <20>B<                  <20>V
++ SAL <20>                    <20>
+  
++ SAL <20><                   <20>
+  
++ SAL <20>                    <20>

runtime/spell/da/main.aap

@@ -35,6 +35,7 @@ da_DK.aff da_DK.dic: {buildcheck=}
         :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'):

runtime/spell/de/de_19.diff

@@ -1,16 +1,13 @@
-*** de_19.orig.aff	Mon Aug 15 22:45:35 2005
---- de_19.aff	Mon Aug 15 22:54:10 2005
+*** de_19.orig.aff	Thu Aug 25 11:22:08 2005
+--- de_19.aff	Thu Sep 29 11:43:46 2005
 ***************
 *** 3,4 ****
---- 3,24 ----
+--- 3,21 ----
   
 + 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
@@ -24,4 +21,483 @@
 + MAP y<><79>
 + MAP s<>
 + 
+  # (c) copyright by Bjoern Jacke <bjoern@j3e.de>
+***************
+*** 560 ****
+--- 577,1052 ----
   
++ #   German phonetic transformation rules from Aspell
++ #   Copyright (C) 2000 Bj<42>rn Jacke, distributed under LGPL.
++ #   Bj<42>rn Jacke may be reached by email at bjoern.jacke@gmx.de
++ #   Last changed 2000-01-07
++ 
++ SAL followup        1
++ SAL collapse_result 1
++ 
++ SAL <20>ER-                 E
++ SAL <20>U<                  EU
++ SAL <20><                   E
++ SAL <20>                    E
++ SAL <20>ER-                 <20>
++ SAL <20>                    <20>
++ SAL <20>BER^^               IPA
++ SAL <20>ER-                 I
++ SAL <20>                    I
++ SAL <20>                    Z
++ SAL ABELLE$              APL
++ SAL ABELL$               APL
++ SAL ABIENNE$             APIN
++ SAL ACEY$                AZI
++ SAL AEU<                 EU
++ SAL AE2                  E
++ SAL AGNI-^               AKN
++ SAL AGNIE-               ANI
++ SAL AGN(AEOU)-$          ANI
++ SAL AIA2                 AIA
++ SAL AIE$                 E
++ SAL AILL(EOU)-           ALI
++ SAL AINE$                EN
++ SAL AIRE$                ER
++ SAL AIR-                 E
++ SAL AISE$                EZ
++ SAL AISSANCE$            EZANZ
++ SAL AISSE$               EZ
++ SAL AIX$                 EX
++ SAL AJ(A<>EIO<49>U<EFBFBD>)--       A
++ SAL AKTIE                AXIE
++ SAL ALO(IY)^             ALUI
++ SAL AMATEU(RS)-          ANAT<41>
++ SAL ANIELLE$             ANIL
++ SAL ANTI^^               ANTI
++ SAL ANVER^^              ANFA
++ SAL ATIA$                ATIA
++ SAL ATIA(NS)--           ATI
++ SAL ATI(A<>O<EFBFBD>U<EFBFBD>)-         AZI
++ SAL AUAU--               _
++ SAL AUER<                AUA
++ SAL AUF^^                AUF
++ SAL AULT$                U
++ SAL AUSSE$               UZ
++ SAL AUS(ST)-^            AUZ
++ SAL AUS^^                AUZ
++ SAL AUTO^^               AUTU
++ SAL AUX(IY)-             AUX
++ SAL AUX                  U
++ SAL AU                   AU
++ SAL AVIER$               AFIE
++ SAL AYER--<              EI
++ SAL AY(A<>EIO<49>U<EFBFBD>)--       A
++ SAL A(IJY)<              EI
++ SAL A                    A
++ SAL BEA(BCMNRU)-^        PEA
++ SAL BEAT(AEIMORU)-^      PEAT
++ SAL BEIGE^$              PEZ
++ SAL BE(LMNRST)-^         PE
++ SAL BETTE$               PET
++ SAL BIC$                 PIZ
++ SAL BOWL(EI)-            PUL
++ SAL BP(A<>EIO<49>RU<52>Y)-      P
++ SAL BUDGET7              PIKE
++ SAL BUFFET7              PIFE
++ SAL BYLLE$               PILE
++ SAL BYLL$                PIL
++ SAL BYTE<                PEIT
++ SAL B                    P
++ SAL C<>-                  Z
++ SAL C<>$                  ZI
++ SAL CACH(EI)-^           KEZ
++ SAL CAE--                Z
++ SAL CA(IY)$              ZEI
++ SAL CCH                  Z
++ SAL CCE-                 X
++ SAL CE(EIJUY)--          Z
++ SAL CENT<                ZENT
++ SAL CERST(EI)----^       KE
++ SAL CER$                 ZA
++ SAL CE3                  ZE
++ SAL CHAO(ST)-            KAU
++ SAL CHAMPIO-^            ZENPI
++ SAL CHAR(AI)-^           KAR
++ SAL CHAU(CDFSVWXZ)-      ZU
++ SAL CHE(CF)-             ZE
++ SAL CHEM-^               KE
++ SAL CHEQUE<              ZEK
++ SAL CHI(CFGPVW)-         ZI
++ SAL CH(AEUY)-<^          Z
++ SAL CHK-                 _
++ SAL CH(LOR)-<^           K
++ SAL CHST-                X
++ SAL CH(S<>XZ)3            X
++ SAL CH                   K
++ SAL CIER$                ZIE
++ SAL CYB-^                ZEI
++ SAL CY9^                 ZI
++ SAL C(IJY)-3             Z
++ SAL CKST                 XT
++ SAL CK(S<>XZ)3            X
++ SAL C(CK)-               _
++ SAL CLAUDET---           KLU
++ SAL CLAUDINE^$           KLUTIN
++ SAL COLE$                KUL
++ SAL COUCH                KAUZ
++ SAL CQUES$               K
++ SAL CQUE                 K
++ SAL CREAT-^              KREA
++ SAL CST                  XT
++ SAL CS<^                 Z
++ SAL C(S<>X)               X
++ SAL CT(S<>XZ)             X
++ SAL CZ<                  Z
++ SAL C<                   K
++ SAL D'H^                 T
++ SAL D'S3$                Z
++ SAL DAVO(NR)-^$          TAFU
++ SAL DD(SZ)--<            _
++ SAL DEPOT7               TEPU
++ SAL DESIGN               TIZEIN
++ SAL DE(LMNRST)-3^        TE
++ SAL DETTE$               TET
++ SAL DIC$                 TIZ
++ SAL DJ(AEIOU)-^          I
++ SAL DS(CH)--<            T
++ SAL DST                  ZT
++ SAL DT-                  _
++ SAL DUIS-^               TI
++ SAL DURCH^^              TURK
++ SAL DZS(CH)--            T
++ SAL D(S<>Z)               Z
++ SAL D                    T
++ SAL EAULT$               U
++ SAL EAUX$                U
++ SAL EAU                  U
++ SAL EAV                  IF
++ SAL EA(A<>EIO<49><4F>Y)-3       EA
++ SAL EA3$                 EA
++ SAL EA3                  I
++ SAL EBEN^^               EPN
++ SAL EE9                  E
++ SAL EIEI--               _
++ SAL EIH--                E
++ SAL EILLE$               EI
++ SAL EI                   EI
++ SAL EJ$                  EI
++ SAL EL-^                 E
++ SAL EL(DKL)--1           E
++ SAL EL(MNT)--1$          E
++ SAL ELYNE$               ELINE
++ SAL ELYN$                ELIN
++ SAL EL(A<>EIO<49>U<EFBFBD>Y)-1      EL
++ SAL EL-1                 L
++ SAL EM-^                 E
++ SAL EM(DFKMPQT)--1       E
++ SAL EM(A<>EIO<49>U<EFBFBD>Y)--1     E
++ SAL EM-1                 N
++ SAL EN-^                 E
++ SAL EN(CDGKQT)--1        E
++ SAL ENZ(AEIOUY)--1       EN
++ SAL EN(A<>EINO<4E>U<EFBFBD>Y)-1     EN
++ SAL EN-<1                N
++ SAL ERH(A<>EIO<49>U<EFBFBD>)-^      ER
++ SAL ER-^                 E
++ SAL ER(A<>EIO<49>U<EFBFBD>Y)-1      A
++ SAL ER1$                 A
++ SAL ER<1                 A
++ SAL ETI(A<>O<EFBFBD><4F>U)-         EZI
++ SAL EUEU--               _
++ SAL EUILLE$              <20>
++ SAL EUR$                 <20>R
++ SAL EUX                  <20>
++ SAL EUYS$                EUZ
++ SAL EU                   EU
++ SAL EYER<                EIA
++ SAL EY<                  EI
++ SAL E                    E
++ SAL FANS--^$             FE
++ SAL FAN-^$               FE
++ SAL FAULT-               FUL
++ SAL FEE(DL)-             FI
++ SAL FEHLER               FELA
++ SAL FE(LMNRST)-3^        FE
++ SAL FOND7                FUN
++ SAL FRAIN$               FRA
++ SAL FRISEU(RS)-          FRIZ<49>  # x
++ SAL F                    F
++ SAL G'S$                 X
++ SAL GAGS^$               KEX
++ SAL GAG^$                KEK
++ SAL GD                   KT
++ SAL GEGEN^^              KEKN
++ SAL GE(LMNRST)-3^        KE
++ SAL GETTE$               KET
++ SAL G(CK)-               _
++ SAL GG-                  _
++ SAL GI(AO)-^             I
++ SAL GION$                KIUN
++ SAL GIUS-^               IU
++ SAL GMBH^$               GMPH
++ SAL GNAC$                NIAK
++ SAL GNON$                NIUN
++ SAL GN$                  N
++ SAL GONCAL-^             KUNZA
++ SAL GS(CH)--             K
++ SAL GST                  XT
++ SAL G(S<>XZ)              X
++ SAL GUCK-                KU
++ SAL GUI-^                K
++ SAL G                    K
++ SAL HEAD-                E
++ SAL HE(LMNRST)-3^        E
++ SAL HE(LMN)-1            E
++ SAL HEUR1$               <20>R
++ SAL H^                   _
++ SAL IEC$                 IZ
++ SAL IEI-3                _
++ SAL IELL3                IEL
++ SAL IENNE$               IN
++ SAL IERRE$               IER
++ SAL IETTE$               IT
++ SAL IEU                  I<>
++ SAL IE<4                 I
++ SAL IGHT3$               EIT
++ SAL IGNI(EO)-            INI
++ SAL IGN(AEOU)-$          INI
++ SAL IJ(AOU)-             I
++ SAL IJ$                  I
++ SAL IJ<                  EI
++ SAL IKOLE$               IKUL
++ SAL ILLAN(STZ)--         ILIA
++ SAL ILLAR(DT)--          ILIA
++ SAL INVER-               INFE
++ SAL ITI(A<>O<EFBFBD>U<EFBFBD>)-         IZI
++ SAL IVIER$               IFIE
++ SAL I                    I
++ SAL JAVIE---<^           ZA
++ SAL JEAN^$               IA
++ SAL JEAN-^               IA
++ SAL JER-^                IE
++ SAL JE(LMNST)-           IE
++ SAL JOR(GK)^$            I<>RK
++ SAL J                    I
++ SAL KC(<28>EIJ)-            X
++ SAL KE(LMNRST)-3^        KE
++ SAL KH<^                 K
++ SAL KIC$                 KIZ
++ SAL KLE(LMNRST)-3^       KLE
++ SAL KOTELE-^             KUTL
++ SAL KREAT-^              KREA
++ SAL KST                  XT
++ SAL K(S<>XZ)              X
++ SAL KTI(AIOU)-3          XI
++ SAL KT(S<>XZ)             X
++ SAL K                    K
++ SAL LARVE-               LARF
++ SAL LEAND-^              LEAN
++ SAL LEL-                 LE
++ SAL LE(MNRST)-3^         LE
++ SAL LETTE$               LET
++ SAL LFGNAG-              LFKAN
++ SAL LIC$                 LIZ
++ SAL LIVE^$               LEIF
++ SAL LUI(GS)--            LU
++ SAL L                    L
++ SAL MASSEU(RS)-          NAZ<41>
++ SAL MAURICE              NURIZ
++ SAL MBH^$                MPH
++ SAL MB(S<>Z)-             N
++ SAL MC9^                 NK
++ SAL MEMOIR-^             NENUA
++ SAL ME(LMNRST)-3^        NE
++ SAL MIGUEL               NIKL
++ SAL MIKE^$               NEIK
++ SAL MN                   N
++ SAL MPJUTE-              NPUT
++ SAL MP(S<>Z)-             N
++ SAL MP(BDJLMNPQRTVW)-    NP
++ SAL M                    N
++ SAL NACH^^               NAK
++ SAL NADINE               NATIN
++ SAL NAIV--               NA
++ SAL NAISE$               NEZE
++ SAL NCOISE$              ZUA
++ SAL NCOIS$               ZUA
++ SAL NEBEN^^              NEPN
++ SAL NE(LMNRST)-3^        NE
++ SAL NEN-3                NE
++ SAL NETTE$               NET
++ SAL NG(BDFJLMNPQRTVW)-   NK
++ SAL NICHTS^^             NIX
++ SAL NICHT^^              NIKT
++ SAL NINE$                NIN
++ SAL NON^^                NUN
++ SAL NOT^^                NUT
++ SAL NTI(AIOU)-3          NZI
++ SAL NTIEL--3             NZI
++ SAL NYLON                NEILUN
++ SAL ND(S<>Z)$             NZ
++ SAL NT(S<>Z)$             NZ
++ SAL ND'S$                NZ
++ SAL NT'S$                NZ
++ SAL NSTS$                NZ
++ SAL N                    N
++ SAL OBER^^               UPA
++ SAL OE2                  <20>
++ SAL OGNIE-               UNI
++ SAL OGN(AEOU)-$          UNI
++ SAL OIE$                 <20>
++ SAL OIR$                 UAR
++ SAL OIX                  UA
++ SAL OI<3                 EU
++ SAL OJ(A<>EIO<49>U<EFBFBD>)--       U
++ SAL OKAY^$               UKE
++ SAL OLYN$                ULIN
++ SAL OTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL OUI^                 FI
++ SAL OUILLE$              ULIE
++ SAL OU(DT)-^             AU
++ SAL OUSE$                AUZ
++ SAL OUT-                 AU
++ SAL OU                   U
++ SAL OWS$                 UZ
++ SAL OY(A<>EIO<49>U<EFBFBD>)--       U
++ SAL O(JY)<               EU
++ SAL O                    U
++ SAL PATIEN--^            PAZI
++ SAL PENSIO-^             PANZI
++ SAL PE(LMNRST)-3^        PE
++ SAL PFER-^               FE
++ SAL P(FH)<               F
++ SAL POLY^^               PULI
++ SAL PORTRAIT7            PURTRE
++ SAL PP(FH)--<            P
++ SAL PP-                  _
++ SAL PRIX^$               PRI
++ SAL P(S<>Z)^              Z
++ SAL PTI(A<>O<EFBFBD>U<EFBFBD>)-3        PZI
++ SAL PIC^$                PIK
++ SAL P                    P
++ SAL QUE(LMNRST)-3        KFE
++ SAL QUE$                 K
++ SAL QUI(NS)$             KI
++ SAL QU                   KF
++ SAL Q<                   K
++ SAL RCH                  RK
++ SAL RECHERCH^            REZAZ
++ SAL RER$                 RA
++ SAL RE(MNR)-4            RE
++ SAL RETTE$               RET
++ SAL RH<^                 R
++ SAL RJA(MN)--            RI
++ SAL RTI(A<>O<EFBFBD>U<EFBFBD>)-3        RZI
++ SAL RY(KN)-$             RI
++ SAL R                    R
++ SAL SAFE^$               ZEIF
++ SAL SAUCE-^              ZUZ
++ SAL SCHSCH---7           _
++ SAL SCHTSCH              Z
++ SAL SC(HZ)<              Z
++ SAL SC                   ZK
++ SAL SELBSTST--7^^        ZELP
++ SAL SELBST7^^            ZELPZT
++ SAL SERVICE7^            Z<>RFIZ
++ SAL SE(LMNRST)-3^        ZE
++ SAL SETTE$               ZET
++ SAL SHP-^                Z
++ SAL SHST                 ZT
++ SAL SHTSH                Z
++ SAL SHT                  Z
++ SAL SH3                  Z
++ SAL SIEGLI-^             ZIKL
++ SAL SIGLI-^              ZIKL
++ SAL SIGHT                ZEIT
++ SAL SIGN                 ZEIN
++ SAL SKI(NPZ)-            ZKI
++ SAL SKI<^                ZI
++ SAL SOUND-               ZAUN
++ SAL STAATS^^             ZTAZ
++ SAL STADT^^              ZTAT
++ SAL START^^              ZTART
++ SAL STAURANT7            ZTURAN
++ SAL STEAK-               ZTE
++ SAL STRAF^^              ZTRAF
++ SAL ST'S$                Z
++ SAL STST--               _
++ SAL STS(ACEHIOU<4F><55><EFBFBD>)--    ZT
++ SAL ST(SZ)               Z
++ SAL STYN(AE)-$           ZTIN
++ SAL ST                   ZT
++ SAL SZE(NPT)-^           ZE
++ SAL SZI(ELN)-^           ZI
++ SAL SZCZ<                Z
++ SAL SZT<                 ZT
++ SAL SZ<3                 Z
++ SAL S                    Z
++ SAL T'S3$                Z
++ SAL TCH                  Z
++ SAL TEAT-^               TEA
++ SAL TE(LMNRST)-3^        TE
++ SAL TH<                  T
++ SAL TIC$                 TIZ
++ SAL TOAS-^               TU
++ SAL TOILET-              TULE
++ SAL TOIN-                TUA
++ SAL TRAINI-              TREN
++ SAL TSCH                 Z
++ SAL TSH                  Z
++ SAL TST                  ZT
++ SAL T(S<>)                Z
++ SAL TT(SZ)--<            _
++ SAL TT9                  T
++ SAL TZ-                  _
++ SAL T                    T
++ SAL UEBER^^              IPA
++ SAL UE2                  I
++ SAL UIE$                 I
++ SAL UM^^                 UN
++ SAL UNTERE--             UNTE
++ SAL UNTER^^              UNTA
++ SAL UNVER^^              UNFA
++ SAL UN^^                 UN
++ SAL UTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL U                    U
++ SAL VACL-^               FAZ
++ SAL VAC$                 FAZ
++ SAL VEDD-^               FE
++ SAL VEREIN               FAEIN
++ SAL VERSEN^              FAZN
++ SAL VER^^                FA
++ SAL VER                  FA
++ SAL VET(HT)-^            FET
++ SAL VETTE$               FET
++ SAL VIC$                 FIZ
++ SAL VIEL                 FIL
++ SAL VIEW                 FIU
++ SAL VOR^^                FUR
++ SAL VY9^                 FI
++ SAL V<                   F
++ SAL WE(LMNRST)-3^        FE
++ SAL WIC$                 FIZ
++ SAL WIEDER^^             FITA
++ SAL WY9^                 FI
++ SAL W                    F
++ SAL XE(LMNRST)-3^        XE
++ SAL X<^                  Z
++ SAL X(CSZ)               X
++ SAL XTS(CH)--            XT
++ SAL XT(SZ)               Z
++ SAL X                    X
++ SAL YE(LMNRST)-3^        IE
++ SAL YE-3                 I
++ SAL YOR(GK)^$            I<>RK
++ SAL Y(AOU)-<7            I
++ SAL YVES^$               IF
++ SAL YVONNE^$             IFUN
++ SAL Y                    I
++ SAL ZC(AOU)-             ZK
++ SAL ZE(LMNRST)-3^        ZE
++ SAL ZH<                  Z
++ SAL ZS(CHT)--            _
++ SAL ZS                   Z
++ SAL ZUERST               ZUERZT
++ SAL ZUR<55>CK^^             ZURIK
++ SAL ZUVER^^              ZUFA    # x
++ SAL Z                    Z

runtime/spell/de/de_20.diff

@@ -1,17 +1,14 @@
-*** de_20.orig.aff	Mon Aug 15 22:45:41 2005
---- de_20.aff	Mon Aug 15 22:54:16 2005
+*** de_20.orig.aff	Thu Aug 25 11:22:14 2005
+--- de_20.aff	Thu Sep 29 11:44:41 2005
 ***************
 *** 2,3 ****
---- 2,24 ----
+--- 2,21 ----
   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
@@ -26,3 +23,483 @@
 + MAP s<>
 + 
   #
+***************
+*** 1225 ****
+--- 1243,1719 ----
+  REP <20> <20>e
++ 
++ #   German phonetic transformation rules from Aspell
++ #   Copyright (C) 2000 Bj<42>rn Jacke, distributed under LGPL.
++ #   Bj<42>rn Jacke may be reached by email at bjoern.jacke@gmx.de
++ #   Last changed 2000-01-07
++ 
++ SAL followup        1
++ SAL collapse_result 1
++ 
++ SAL <20>ER-                 E
++ SAL <20>U<                  EU
++ SAL <20><                   E
++ SAL <20>                    E
++ SAL <20>ER-                 <20>
++ SAL <20>                    <20>
++ SAL <20>BER^^               IPA
++ SAL <20>ER-                 I
++ SAL <20>                    I
++ SAL <20>                    Z
++ SAL ABELLE$              APL
++ SAL ABELL$               APL
++ SAL ABIENNE$             APIN
++ SAL ACEY$                AZI
++ SAL AEU<                 EU
++ SAL AE2                  E
++ SAL AGNI-^               AKN
++ SAL AGNIE-               ANI
++ SAL AGN(AEOU)-$          ANI
++ SAL AIA2                 AIA
++ SAL AIE$                 E
++ SAL AILL(EOU)-           ALI
++ SAL AINE$                EN
++ SAL AIRE$                ER
++ SAL AIR-                 E
++ SAL AISE$                EZ
++ SAL AISSANCE$            EZANZ
++ SAL AISSE$               EZ
++ SAL AIX$                 EX
++ SAL AJ(A<>EIO<49>U<EFBFBD>)--       A
++ SAL AKTIE                AXIE
++ SAL ALO(IY)^             ALUI
++ SAL AMATEU(RS)-          ANAT<41>
++ SAL ANIELLE$             ANIL
++ SAL ANTI^^               ANTI
++ SAL ANVER^^              ANFA
++ SAL ATIA$                ATIA
++ SAL ATIA(NS)--           ATI
++ SAL ATI(A<>O<EFBFBD>U<EFBFBD>)-         AZI
++ SAL AUAU--               _
++ SAL AUER<                AUA
++ SAL AUF^^                AUF
++ SAL AULT$                U
++ SAL AUSSE$               UZ
++ SAL AUS(ST)-^            AUZ
++ SAL AUS^^                AUZ
++ SAL AUTO^^               AUTU
++ SAL AUX(IY)-             AUX
++ SAL AUX                  U
++ SAL AU                   AU
++ SAL AVIER$               AFIE
++ SAL AYER--<              EI
++ SAL AY(A<>EIO<49>U<EFBFBD>)--       A
++ SAL A(IJY)<              EI
++ SAL A                    A
++ SAL BEA(BCMNRU)-^        PEA
++ SAL BEAT(AEIMORU)-^      PEAT
++ SAL BEIGE^$              PEZ
++ SAL BE(LMNRST)-^         PE
++ SAL BETTE$               PET
++ SAL BIC$                 PIZ
++ SAL BOWL(EI)-            PUL
++ SAL BP(A<>EIO<49>RU<52>Y)-      P
++ SAL BUDGET7              PIKE
++ SAL BUFFET7              PIFE
++ SAL BYLLE$               PILE
++ SAL BYLL$                PIL
++ SAL BYTE<                PEIT
++ SAL B                    P
++ SAL C<>-                  Z
++ SAL C<>$                  ZI
++ SAL CACH(EI)-^           KEZ
++ SAL CAE--                Z
++ SAL CA(IY)$              ZEI
++ SAL CCH                  Z
++ SAL CCE-                 X
++ SAL CE(EIJUY)--          Z
++ SAL CENT<                ZENT
++ SAL CERST(EI)----^       KE
++ SAL CER$                 ZA
++ SAL CE3                  ZE
++ SAL CHAO(ST)-            KAU
++ SAL CHAMPIO-^            ZENPI
++ SAL CHAR(AI)-^           KAR
++ SAL CHAU(CDFSVWXZ)-      ZU
++ SAL CHE(CF)-             ZE
++ SAL CHEM-^               KE
++ SAL CHEQUE<              ZEK
++ SAL CHI(CFGPVW)-         ZI
++ SAL CH(AEUY)-<^          Z
++ SAL CHK-                 _
++ SAL CH(LOR)-<^           K
++ SAL CHST-                X
++ SAL CH(S<>XZ)3            X
++ SAL CH                   K
++ SAL CIER$                ZIE
++ SAL CYB-^                ZEI
++ SAL CY9^                 ZI
++ SAL C(IJY)-3             Z
++ SAL CKST                 XT
++ SAL CK(S<>XZ)3            X
++ SAL C(CK)-               _
++ SAL CLAUDET---           KLU
++ SAL CLAUDINE^$           KLUTIN
++ SAL COLE$                KUL
++ SAL COUCH                KAUZ
++ SAL CQUES$               K
++ SAL CQUE                 K
++ SAL CREAT-^              KREA
++ SAL CST                  XT
++ SAL CS<^                 Z
++ SAL C(S<>X)               X
++ SAL CT(S<>XZ)             X
++ SAL CZ<                  Z
++ SAL C<                   K
++ SAL D'H^                 T
++ SAL D'S3$                Z
++ SAL DAVO(NR)-^$          TAFU
++ SAL DD(SZ)--<            _
++ SAL DEPOT7               TEPU
++ SAL DESIGN               TIZEIN
++ SAL DE(LMNRST)-3^        TE
++ SAL DETTE$               TET
++ SAL DIC$                 TIZ
++ SAL DJ(AEIOU)-^          I
++ SAL DS(CH)--<            T
++ SAL DST                  ZT
++ SAL DT-                  _
++ SAL DUIS-^               TI
++ SAL DURCH^^              TURK
++ SAL DZS(CH)--            T
++ SAL D(S<>Z)               Z
++ SAL D                    T
++ SAL EAULT$               U
++ SAL EAUX$                U
++ SAL EAU                  U
++ SAL EAV                  IF
++ SAL EA(A<>EIO<49><4F>Y)-3       EA
++ SAL EA3$                 EA
++ SAL EA3                  I
++ SAL EBEN^^               EPN
++ SAL EE9                  E
++ SAL EIEI--               _
++ SAL EIH--                E
++ SAL EILLE$               EI
++ SAL EI                   EI
++ SAL EJ$                  EI
++ SAL EL-^                 E
++ SAL EL(DKL)--1           E
++ SAL EL(MNT)--1$          E
++ SAL ELYNE$               ELINE
++ SAL ELYN$                ELIN
++ SAL EL(A<>EIO<49>U<EFBFBD>Y)-1      EL
++ SAL EL-1                 L
++ SAL EM-^                 E
++ SAL EM(DFKMPQT)--1       E
++ SAL EM(A<>EIO<49>U<EFBFBD>Y)--1     E
++ SAL EM-1                 N
++ SAL EN-^                 E
++ SAL EN(CDGKQT)--1        E
++ SAL ENZ(AEIOUY)--1       EN
++ SAL EN(A<>EINO<4E>U<EFBFBD>Y)-1     EN
++ SAL EN-<1                N
++ SAL ERH(A<>EIO<49>U<EFBFBD>)-^      ER
++ SAL ER-^                 E
++ SAL ER(A<>EIO<49>U<EFBFBD>Y)-1      A
++ SAL ER1$                 A
++ SAL ER<1                 A
++ SAL ETI(A<>O<EFBFBD><4F>U)-         EZI
++ SAL EUEU--               _
++ SAL EUILLE$              <20>
++ SAL EUR$                 <20>R
++ SAL EUX                  <20>
++ SAL EUYS$                EUZ
++ SAL EU                   EU
++ SAL EYER<                EIA
++ SAL EY<                  EI
++ SAL E                    E
++ SAL FANS--^$             FE
++ SAL FAN-^$               FE
++ SAL FAULT-               FUL
++ SAL FEE(DL)-             FI
++ SAL FEHLER               FELA
++ SAL FE(LMNRST)-3^        FE
++ SAL FOND7                FUN
++ SAL FRAIN$               FRA
++ SAL FRISEU(RS)-          FRIZ<49>  # x
++ SAL F                    F
++ SAL G'S$                 X
++ SAL GAGS^$               KEX
++ SAL GAG^$                KEK
++ SAL GD                   KT
++ SAL GEGEN^^              KEKN
++ SAL GE(LMNRST)-3^        KE
++ SAL GETTE$               KET
++ SAL G(CK)-               _
++ SAL GG-                  _
++ SAL GI(AO)-^             I
++ SAL GION$                KIUN
++ SAL GIUS-^               IU
++ SAL GMBH^$               GMPH
++ SAL GNAC$                NIAK
++ SAL GNON$                NIUN
++ SAL GN$                  N
++ SAL GONCAL-^             KUNZA
++ SAL GS(CH)--             K
++ SAL GST                  XT
++ SAL G(S<>XZ)              X
++ SAL GUCK-                KU
++ SAL GUI-^                K
++ SAL G                    K
++ SAL HEAD-                E
++ SAL HE(LMNRST)-3^        E
++ SAL HE(LMN)-1            E
++ SAL HEUR1$               <20>R
++ SAL H^                   _
++ SAL IEC$                 IZ
++ SAL IEI-3                _
++ SAL IELL3                IEL
++ SAL IENNE$               IN
++ SAL IERRE$               IER
++ SAL IETTE$               IT
++ SAL IEU                  I<>
++ SAL IE<4                 I
++ SAL IGHT3$               EIT
++ SAL IGNI(EO)-            INI
++ SAL IGN(AEOU)-$          INI
++ SAL IJ(AOU)-             I
++ SAL IJ$                  I
++ SAL IJ<                  EI
++ SAL IKOLE$               IKUL
++ SAL ILLAN(STZ)--         ILIA
++ SAL ILLAR(DT)--          ILIA
++ SAL INVER-               INFE
++ SAL ITI(A<>O<EFBFBD>U<EFBFBD>)-         IZI
++ SAL IVIER$               IFIE
++ SAL I                    I
++ SAL JAVIE---<^           ZA
++ SAL JEAN^$               IA
++ SAL JEAN-^               IA
++ SAL JER-^                IE
++ SAL JE(LMNST)-           IE
++ SAL JOR(GK)^$            I<>RK
++ SAL J                    I
++ SAL KC(<28>EIJ)-            X
++ SAL KE(LMNRST)-3^        KE
++ SAL KH<^                 K
++ SAL KIC$                 KIZ
++ SAL KLE(LMNRST)-3^       KLE
++ SAL KOTELE-^             KUTL
++ SAL KREAT-^              KREA
++ SAL KST                  XT
++ SAL K(S<>XZ)              X
++ SAL KTI(AIOU)-3          XI
++ SAL KT(S<>XZ)             X
++ SAL K                    K
++ SAL LARVE-               LARF
++ SAL LEAND-^              LEAN
++ SAL LEL-                 LE
++ SAL LE(MNRST)-3^         LE
++ SAL LETTE$               LET
++ SAL LFGNAG-              LFKAN
++ SAL LIC$                 LIZ
++ SAL LIVE^$               LEIF
++ SAL LUI(GS)--            LU
++ SAL L                    L
++ SAL MASSEU(RS)-          NAZ<41>
++ SAL MAURICE              NURIZ
++ SAL MBH^$                MPH
++ SAL MB(S<>Z)-             N
++ SAL MC9^                 NK
++ SAL MEMOIR-^             NENUA
++ SAL ME(LMNRST)-3^        NE
++ SAL MIGUEL               NIKL
++ SAL MIKE^$               NEIK
++ SAL MN                   N
++ SAL MPJUTE-              NPUT
++ SAL MP(S<>Z)-             N
++ SAL MP(BDJLMNPQRTVW)-    NP
++ SAL M                    N
++ SAL NACH^^               NAK
++ SAL NADINE               NATIN
++ SAL NAIV--               NA
++ SAL NAISE$               NEZE
++ SAL NCOISE$              ZUA
++ SAL NCOIS$               ZUA
++ SAL NEBEN^^              NEPN
++ SAL NE(LMNRST)-3^        NE
++ SAL NEN-3                NE
++ SAL NETTE$               NET
++ SAL NG(BDFJLMNPQRTVW)-   NK
++ SAL NICHTS^^             NIX
++ SAL NICHT^^              NIKT
++ SAL NINE$                NIN
++ SAL NON^^                NUN
++ SAL NOT^^                NUT
++ SAL NTI(AIOU)-3          NZI
++ SAL NTIEL--3             NZI
++ SAL NYLON                NEILUN
++ SAL ND(S<>Z)$             NZ
++ SAL NT(S<>Z)$             NZ
++ SAL ND'S$                NZ
++ SAL NT'S$                NZ
++ SAL NSTS$                NZ
++ SAL N                    N
++ SAL OBER^^               UPA
++ SAL OE2                  <20>
++ SAL OGNIE-               UNI
++ SAL OGN(AEOU)-$          UNI
++ SAL OIE$                 <20>
++ SAL OIR$                 UAR
++ SAL OIX                  UA
++ SAL OI<3                 EU
++ SAL OJ(A<>EIO<49>U<EFBFBD>)--       U
++ SAL OKAY^$               UKE
++ SAL OLYN$                ULIN
++ SAL OTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL OUI^                 FI
++ SAL OUILLE$              ULIE
++ SAL OU(DT)-^             AU
++ SAL OUSE$                AUZ
++ SAL OUT-                 AU
++ SAL OU                   U
++ SAL OWS$                 UZ
++ SAL OY(A<>EIO<49>U<EFBFBD>)--       U
++ SAL O(JY)<               EU
++ SAL O                    U
++ SAL PATIEN--^            PAZI
++ SAL PENSIO-^             PANZI
++ SAL PE(LMNRST)-3^        PE
++ SAL PFER-^               FE
++ SAL P(FH)<               F
++ SAL POLY^^               PULI
++ SAL PORTRAIT7            PURTRE
++ SAL PP(FH)--<            P
++ SAL PP-                  _
++ SAL PRIX^$               PRI
++ SAL P(S<>Z)^              Z
++ SAL PTI(A<>O<EFBFBD>U<EFBFBD>)-3        PZI
++ SAL PIC^$                PIK
++ SAL P                    P
++ SAL QUE(LMNRST)-3        KFE
++ SAL QUE$                 K
++ SAL QUI(NS)$             KI
++ SAL QU                   KF
++ SAL Q<                   K
++ SAL RCH                  RK
++ SAL RECHERCH^            REZAZ
++ SAL RER$                 RA
++ SAL RE(MNR)-4            RE
++ SAL RETTE$               RET
++ SAL RH<^                 R
++ SAL RJA(MN)--            RI
++ SAL RTI(A<>O<EFBFBD>U<EFBFBD>)-3        RZI
++ SAL RY(KN)-$             RI
++ SAL R                    R
++ SAL SAFE^$               ZEIF
++ SAL SAUCE-^              ZUZ
++ SAL SCHSCH---7           _
++ SAL SCHTSCH              Z
++ SAL SC(HZ)<              Z
++ SAL SC                   ZK
++ SAL SELBSTST--7^^        ZELP
++ SAL SELBST7^^            ZELPZT
++ SAL SERVICE7^            Z<>RFIZ
++ SAL SE(LMNRST)-3^        ZE
++ SAL SETTE$               ZET
++ SAL SHP-^                Z
++ SAL SHST                 ZT
++ SAL SHTSH                Z
++ SAL SHT                  Z
++ SAL SH3                  Z
++ SAL SIEGLI-^             ZIKL
++ SAL SIGLI-^              ZIKL
++ SAL SIGHT                ZEIT
++ SAL SIGN                 ZEIN
++ SAL SKI(NPZ)-            ZKI
++ SAL SKI<^                ZI
++ SAL SOUND-               ZAUN
++ SAL STAATS^^             ZTAZ
++ SAL STADT^^              ZTAT
++ SAL START^^              ZTART
++ SAL STAURANT7            ZTURAN
++ SAL STEAK-               ZTE
++ SAL STRAF^^              ZTRAF
++ SAL ST'S$                Z
++ SAL STST--               _
++ SAL STS(ACEHIOU<4F><55><EFBFBD>)--    ZT
++ SAL ST(SZ)               Z
++ SAL STYN(AE)-$           ZTIN
++ SAL ST                   ZT
++ SAL SZE(NPT)-^           ZE
++ SAL SZI(ELN)-^           ZI
++ SAL SZCZ<                Z
++ SAL SZT<                 ZT
++ SAL SZ<3                 Z
++ SAL S                    Z
++ SAL T'S3$                Z
++ SAL TCH                  Z
++ SAL TEAT-^               TEA
++ SAL TE(LMNRST)-3^        TE
++ SAL TH<                  T
++ SAL TIC$                 TIZ
++ SAL TOAS-^               TU
++ SAL TOILET-              TULE
++ SAL TOIN-                TUA
++ SAL TRAINI-              TREN
++ SAL TSCH                 Z
++ SAL TSH                  Z
++ SAL TST                  ZT
++ SAL T(S<>)                Z
++ SAL TT(SZ)--<            _
++ SAL TT9                  T
++ SAL TZ-                  _
++ SAL T                    T
++ SAL UEBER^^              IPA
++ SAL UE2                  I
++ SAL UIE$                 I
++ SAL UM^^                 UN
++ SAL UNTERE--             UNTE
++ SAL UNTER^^              UNTA
++ SAL UNVER^^              UNFA
++ SAL UN^^                 UN
++ SAL UTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL U                    U
++ SAL VACL-^               FAZ
++ SAL VAC$                 FAZ
++ SAL VEDD-^               FE
++ SAL VEREIN               FAEIN
++ SAL VERSEN^              FAZN
++ SAL VER^^                FA
++ SAL VER                  FA
++ SAL VET(HT)-^            FET
++ SAL VETTE$               FET
++ SAL VIC$                 FIZ
++ SAL VIEL                 FIL
++ SAL VIEW                 FIU
++ SAL VOR^^                FUR
++ SAL VY9^                 FI
++ SAL V<                   F
++ SAL WE(LMNRST)-3^        FE
++ SAL WIC$                 FIZ
++ SAL WIEDER^^             FITA
++ SAL WY9^                 FI
++ SAL W                    F
++ SAL XE(LMNRST)-3^        XE
++ SAL X<^                  Z
++ SAL X(CSZ)               X
++ SAL XTS(CH)--            XT
++ SAL XT(SZ)               Z
++ SAL X                    X
++ SAL YE(LMNRST)-3^        IE
++ SAL YE-3                 I
++ SAL YOR(GK)^$            I<>RK
++ SAL Y(AOU)-<7            I
++ SAL YVES^$               IF
++ SAL YVONNE^$             IFUN
++ SAL Y                    I
++ SAL ZC(AOU)-             ZK
++ SAL ZE(LMNRST)-3^        ZE
++ SAL ZH<                  Z
++ SAL ZS(CHT)--            _
++ SAL ZS                   Z
++ SAL ZUERST               ZUERZT
++ SAL ZUR<55>CK^^             ZURIK
++ SAL ZUVER^^              ZUFA    # x
++ SAL Z                    Z

runtime/spell/de/de_AT.diff

@@ -1,16 +1,13 @@
-*** de_AT.orig.aff	Mon Aug 15 22:59:43 2005
---- de_AT.aff	Mon Aug 15 23:00:25 2005
+*** de_AT.orig.aff	Thu Aug 25 11:22:16 2005
+--- de_AT.aff	Thu Sep 29 11:44:45 2005
 ***************
 *** 3,4 ****
---- 3,24 ----
+--- 3,21 ----
   
 + 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
@@ -25,8 +22,488 @@
 + MAP s<>
 + 
   
-*** de_AT.orig.dic	Mon Aug 15 22:59:43 2005
---- de_AT.dic	Mon Aug 15 23:11:02 2005
+***************
+*** 504 ****
+--- 521,997 ----
+  
++ 
++ #   German phonetic transformation rules from Aspell
++ #   Copyright (C) 2000 Bj<42>rn Jacke, distributed under LGPL.
++ #   Bj<42>rn Jacke may be reached by email at bjoern.jacke@gmx.de
++ #   Last changed 2000-01-07
++ 
++ SAL followup        1
++ SAL collapse_result 1
++ 
++ SAL <20>ER-                 E
++ SAL <20>U<                  EU
++ SAL <20><                   E
++ SAL <20>                    E
++ SAL <20>ER-                 <20>
++ SAL <20>                    <20>
++ SAL <20>BER^^               IPA
++ SAL <20>ER-                 I
++ SAL <20>                    I
++ SAL <20>                    Z
++ SAL ABELLE$              APL
++ SAL ABELL$               APL
++ SAL ABIENNE$             APIN
++ SAL ACEY$                AZI
++ SAL AEU<                 EU
++ SAL AE2                  E
++ SAL AGNI-^               AKN
++ SAL AGNIE-               ANI
++ SAL AGN(AEOU)-$          ANI
++ SAL AIA2                 AIA
++ SAL AIE$                 E
++ SAL AILL(EOU)-           ALI
++ SAL AINE$                EN
++ SAL AIRE$                ER
++ SAL AIR-                 E
++ SAL AISE$                EZ
++ SAL AISSANCE$            EZANZ
++ SAL AISSE$               EZ
++ SAL AIX$                 EX
++ SAL AJ(A<>EIO<49>U<EFBFBD>)--       A
++ SAL AKTIE                AXIE
++ SAL ALO(IY)^             ALUI
++ SAL AMATEU(RS)-          ANAT<41>
++ SAL ANIELLE$             ANIL
++ SAL ANTI^^               ANTI
++ SAL ANVER^^              ANFA
++ SAL ATIA$                ATIA
++ SAL ATIA(NS)--           ATI
++ SAL ATI(A<>O<EFBFBD>U<EFBFBD>)-         AZI
++ SAL AUAU--               _
++ SAL AUER<                AUA
++ SAL AUF^^                AUF
++ SAL AULT$                U
++ SAL AUSSE$               UZ
++ SAL AUS(ST)-^            AUZ
++ SAL AUS^^                AUZ
++ SAL AUTO^^               AUTU
++ SAL AUX(IY)-             AUX
++ SAL AUX                  U
++ SAL AU                   AU
++ SAL AVIER$               AFIE
++ SAL AYER--<              EI
++ SAL AY(A<>EIO<49>U<EFBFBD>)--       A
++ SAL A(IJY)<              EI
++ SAL A                    A
++ SAL BEA(BCMNRU)-^        PEA
++ SAL BEAT(AEIMORU)-^      PEAT
++ SAL BEIGE^$              PEZ
++ SAL BE(LMNRST)-^         PE
++ SAL BETTE$               PET
++ SAL BIC$                 PIZ
++ SAL BOWL(EI)-            PUL
++ SAL BP(A<>EIO<49>RU<52>Y)-      P
++ SAL BUDGET7              PIKE
++ SAL BUFFET7              PIFE
++ SAL BYLLE$               PILE
++ SAL BYLL$                PIL
++ SAL BYTE<                PEIT
++ SAL B                    P
++ SAL C<>-                  Z
++ SAL C<>$                  ZI
++ SAL CACH(EI)-^           KEZ
++ SAL CAE--                Z
++ SAL CA(IY)$              ZEI
++ SAL CCH                  Z
++ SAL CCE-                 X
++ SAL CE(EIJUY)--          Z
++ SAL CENT<                ZENT
++ SAL CERST(EI)----^       KE
++ SAL CER$                 ZA
++ SAL CE3                  ZE
++ SAL CHAO(ST)-            KAU
++ SAL CHAMPIO-^            ZENPI
++ SAL CHAR(AI)-^           KAR
++ SAL CHAU(CDFSVWXZ)-      ZU
++ SAL CHE(CF)-             ZE
++ SAL CHEM-^               KE
++ SAL CHEQUE<              ZEK
++ SAL CHI(CFGPVW)-         ZI
++ SAL CH(AEUY)-<^          Z
++ SAL CHK-                 _
++ SAL CH(LOR)-<^           K
++ SAL CHST-                X
++ SAL CH(S<>XZ)3            X
++ SAL CH                   K
++ SAL CIER$                ZIE
++ SAL CYB-^                ZEI
++ SAL CY9^                 ZI
++ SAL C(IJY)-3             Z
++ SAL CKST                 XT
++ SAL CK(S<>XZ)3            X
++ SAL C(CK)-               _
++ SAL CLAUDET---           KLU
++ SAL CLAUDINE^$           KLUTIN
++ SAL COLE$                KUL
++ SAL COUCH                KAUZ
++ SAL CQUES$               K
++ SAL CQUE                 K
++ SAL CREAT-^              KREA
++ SAL CST                  XT
++ SAL CS<^                 Z
++ SAL C(S<>X)               X
++ SAL CT(S<>XZ)             X
++ SAL CZ<                  Z
++ SAL C<                   K
++ SAL D'H^                 T
++ SAL D'S3$                Z
++ SAL DAVO(NR)-^$          TAFU
++ SAL DD(SZ)--<            _
++ SAL DEPOT7               TEPU
++ SAL DESIGN               TIZEIN
++ SAL DE(LMNRST)-3^        TE
++ SAL DETTE$               TET
++ SAL DIC$                 TIZ
++ SAL DJ(AEIOU)-^          I
++ SAL DS(CH)--<            T
++ SAL DST                  ZT
++ SAL DT-                  _
++ SAL DUIS-^               TI
++ SAL DURCH^^              TURK
++ SAL DZS(CH)--            T
++ SAL D(S<>Z)               Z
++ SAL D                    T
++ SAL EAULT$               U
++ SAL EAUX$                U
++ SAL EAU                  U
++ SAL EAV                  IF
++ SAL EA(A<>EIO<49><4F>Y)-3       EA
++ SAL EA3$                 EA
++ SAL EA3                  I
++ SAL EBEN^^               EPN
++ SAL EE9                  E
++ SAL EIEI--               _
++ SAL EIH--                E
++ SAL EILLE$               EI
++ SAL EI                   EI
++ SAL EJ$                  EI
++ SAL EL-^                 E
++ SAL EL(DKL)--1           E
++ SAL EL(MNT)--1$          E
++ SAL ELYNE$               ELINE
++ SAL ELYN$                ELIN
++ SAL EL(A<>EIO<49>U<EFBFBD>Y)-1      EL
++ SAL EL-1                 L
++ SAL EM-^                 E
++ SAL EM(DFKMPQT)--1       E
++ SAL EM(A<>EIO<49>U<EFBFBD>Y)--1     E
++ SAL EM-1                 N
++ SAL EN-^                 E
++ SAL EN(CDGKQT)--1        E
++ SAL ENZ(AEIOUY)--1       EN
++ SAL EN(A<>EINO<4E>U<EFBFBD>Y)-1     EN
++ SAL EN-<1                N
++ SAL ERH(A<>EIO<49>U<EFBFBD>)-^      ER
++ SAL ER-^                 E
++ SAL ER(A<>EIO<49>U<EFBFBD>Y)-1      A
++ SAL ER1$                 A
++ SAL ER<1                 A
++ SAL ETI(A<>O<EFBFBD><4F>U)-         EZI
++ SAL EUEU--               _
++ SAL EUILLE$              <20>
++ SAL EUR$                 <20>R
++ SAL EUX                  <20>
++ SAL EUYS$                EUZ
++ SAL EU                   EU
++ SAL EYER<                EIA
++ SAL EY<                  EI
++ SAL E                    E
++ SAL FANS--^$             FE
++ SAL FAN-^$               FE
++ SAL FAULT-               FUL
++ SAL FEE(DL)-             FI
++ SAL FEHLER               FELA
++ SAL FE(LMNRST)-3^        FE
++ SAL FOND7                FUN
++ SAL FRAIN$               FRA
++ SAL FRISEU(RS)-          FRIZ<49>  # x
++ SAL F                    F
++ SAL G'S$                 X
++ SAL GAGS^$               KEX
++ SAL GAG^$                KEK
++ SAL GD                   KT
++ SAL GEGEN^^              KEKN
++ SAL GE(LMNRST)-3^        KE
++ SAL GETTE$               KET
++ SAL G(CK)-               _
++ SAL GG-                  _
++ SAL GI(AO)-^             I
++ SAL GION$                KIUN
++ SAL GIUS-^               IU
++ SAL GMBH^$               GMPH
++ SAL GNAC$                NIAK
++ SAL GNON$                NIUN
++ SAL GN$                  N
++ SAL GONCAL-^             KUNZA
++ SAL GS(CH)--             K
++ SAL GST                  XT
++ SAL G(S<>XZ)              X
++ SAL GUCK-                KU
++ SAL GUI-^                K
++ SAL G                    K
++ SAL HEAD-                E
++ SAL HE(LMNRST)-3^        E
++ SAL HE(LMN)-1            E
++ SAL HEUR1$               <20>R
++ SAL H^                   _
++ SAL IEC$                 IZ
++ SAL IEI-3                _
++ SAL IELL3                IEL
++ SAL IENNE$               IN
++ SAL IERRE$               IER
++ SAL IETTE$               IT
++ SAL IEU                  I<>
++ SAL IE<4                 I
++ SAL IGHT3$               EIT
++ SAL IGNI(EO)-            INI
++ SAL IGN(AEOU)-$          INI
++ SAL IJ(AOU)-             I
++ SAL IJ$                  I
++ SAL IJ<                  EI
++ SAL IKOLE$               IKUL
++ SAL ILLAN(STZ)--         ILIA
++ SAL ILLAR(DT)--          ILIA
++ SAL INVER-               INFE
++ SAL ITI(A<>O<EFBFBD>U<EFBFBD>)-         IZI
++ SAL IVIER$               IFIE
++ SAL I                    I
++ SAL JAVIE---<^           ZA
++ SAL JEAN^$               IA
++ SAL JEAN-^               IA
++ SAL JER-^                IE
++ SAL JE(LMNST)-           IE
++ SAL JOR(GK)^$            I<>RK
++ SAL J                    I
++ SAL KC(<28>EIJ)-            X
++ SAL KE(LMNRST)-3^        KE
++ SAL KH<^                 K
++ SAL KIC$                 KIZ
++ SAL KLE(LMNRST)-3^       KLE
++ SAL KOTELE-^             KUTL
++ SAL KREAT-^              KREA
++ SAL KST                  XT
++ SAL K(S<>XZ)              X
++ SAL KTI(AIOU)-3          XI
++ SAL KT(S<>XZ)             X
++ SAL K                    K
++ SAL LARVE-               LARF
++ SAL LEAND-^              LEAN
++ SAL LEL-                 LE
++ SAL LE(MNRST)-3^         LE
++ SAL LETTE$               LET
++ SAL LFGNAG-              LFKAN
++ SAL LIC$                 LIZ
++ SAL LIVE^$               LEIF
++ SAL LUI(GS)--            LU
++ SAL L                    L
++ SAL MASSEU(RS)-          NAZ<41>
++ SAL MAURICE              NURIZ
++ SAL MBH^$                MPH
++ SAL MB(S<>Z)-             N
++ SAL MC9^                 NK
++ SAL MEMOIR-^             NENUA
++ SAL ME(LMNRST)-3^        NE
++ SAL MIGUEL               NIKL
++ SAL MIKE^$               NEIK
++ SAL MN                   N
++ SAL MPJUTE-              NPUT
++ SAL MP(S<>Z)-             N
++ SAL MP(BDJLMNPQRTVW)-    NP
++ SAL M                    N
++ SAL NACH^^               NAK
++ SAL NADINE               NATIN
++ SAL NAIV--               NA
++ SAL NAISE$               NEZE
++ SAL NCOISE$              ZUA
++ SAL NCOIS$               ZUA
++ SAL NEBEN^^              NEPN
++ SAL NE(LMNRST)-3^        NE
++ SAL NEN-3                NE
++ SAL NETTE$               NET
++ SAL NG(BDFJLMNPQRTVW)-   NK
++ SAL NICHTS^^             NIX
++ SAL NICHT^^              NIKT
++ SAL NINE$                NIN
++ SAL NON^^                NUN
++ SAL NOT^^                NUT
++ SAL NTI(AIOU)-3          NZI
++ SAL NTIEL--3             NZI
++ SAL NYLON                NEILUN
++ SAL ND(S<>Z)$             NZ
++ SAL NT(S<>Z)$             NZ
++ SAL ND'S$                NZ
++ SAL NT'S$                NZ
++ SAL NSTS$                NZ
++ SAL N                    N
++ SAL OBER^^               UPA
++ SAL OE2                  <20>
++ SAL OGNIE-               UNI
++ SAL OGN(AEOU)-$          UNI
++ SAL OIE$                 <20>
++ SAL OIR$                 UAR
++ SAL OIX                  UA
++ SAL OI<3                 EU
++ SAL OJ(A<>EIO<49>U<EFBFBD>)--       U
++ SAL OKAY^$               UKE
++ SAL OLYN$                ULIN
++ SAL OTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL OUI^                 FI
++ SAL OUILLE$              ULIE
++ SAL OU(DT)-^             AU
++ SAL OUSE$                AUZ
++ SAL OUT-                 AU
++ SAL OU                   U
++ SAL OWS$                 UZ
++ SAL OY(A<>EIO<49>U<EFBFBD>)--       U
++ SAL O(JY)<               EU
++ SAL O                    U
++ SAL PATIEN--^            PAZI
++ SAL PENSIO-^             PANZI
++ SAL PE(LMNRST)-3^        PE
++ SAL PFER-^               FE
++ SAL P(FH)<               F
++ SAL POLY^^               PULI
++ SAL PORTRAIT7            PURTRE
++ SAL PP(FH)--<            P
++ SAL PP-                  _
++ SAL PRIX^$               PRI
++ SAL P(S<>Z)^              Z
++ SAL PTI(A<>O<EFBFBD>U<EFBFBD>)-3        PZI
++ SAL PIC^$                PIK
++ SAL P                    P
++ SAL QUE(LMNRST)-3        KFE
++ SAL QUE$                 K
++ SAL QUI(NS)$             KI
++ SAL QU                   KF
++ SAL Q<                   K
++ SAL RCH                  RK
++ SAL RECHERCH^            REZAZ
++ SAL RER$                 RA
++ SAL RE(MNR)-4            RE
++ SAL RETTE$               RET
++ SAL RH<^                 R
++ SAL RJA(MN)--            RI
++ SAL RTI(A<>O<EFBFBD>U<EFBFBD>)-3        RZI
++ SAL RY(KN)-$             RI
++ SAL R                    R
++ SAL SAFE^$               ZEIF
++ SAL SAUCE-^              ZUZ
++ SAL SCHSCH---7           _
++ SAL SCHTSCH              Z
++ SAL SC(HZ)<              Z
++ SAL SC                   ZK
++ SAL SELBSTST--7^^        ZELP
++ SAL SELBST7^^            ZELPZT
++ SAL SERVICE7^            Z<>RFIZ
++ SAL SE(LMNRST)-3^        ZE
++ SAL SETTE$               ZET
++ SAL SHP-^                Z
++ SAL SHST                 ZT
++ SAL SHTSH                Z
++ SAL SHT                  Z
++ SAL SH3                  Z
++ SAL SIEGLI-^             ZIKL
++ SAL SIGLI-^              ZIKL
++ SAL SIGHT                ZEIT
++ SAL SIGN                 ZEIN
++ SAL SKI(NPZ)-            ZKI
++ SAL SKI<^                ZI
++ SAL SOUND-               ZAUN
++ SAL STAATS^^             ZTAZ
++ SAL STADT^^              ZTAT
++ SAL START^^              ZTART
++ SAL STAURANT7            ZTURAN
++ SAL STEAK-               ZTE
++ SAL STRAF^^              ZTRAF
++ SAL ST'S$                Z
++ SAL STST--               _
++ SAL STS(ACEHIOU<4F><55><EFBFBD>)--    ZT
++ SAL ST(SZ)               Z
++ SAL STYN(AE)-$           ZTIN
++ SAL ST                   ZT
++ SAL SZE(NPT)-^           ZE
++ SAL SZI(ELN)-^           ZI
++ SAL SZCZ<                Z
++ SAL SZT<                 ZT
++ SAL SZ<3                 Z
++ SAL S                    Z
++ SAL T'S3$                Z
++ SAL TCH                  Z
++ SAL TEAT-^               TEA
++ SAL TE(LMNRST)-3^        TE
++ SAL TH<                  T
++ SAL TIC$                 TIZ
++ SAL TOAS-^               TU
++ SAL TOILET-              TULE
++ SAL TOIN-                TUA
++ SAL TRAINI-              TREN
++ SAL TSCH                 Z
++ SAL TSH                  Z
++ SAL TST                  ZT
++ SAL T(S<>)                Z
++ SAL TT(SZ)--<            _
++ SAL TT9                  T
++ SAL TZ-                  _
++ SAL T                    T
++ SAL UEBER^^              IPA
++ SAL UE2                  I
++ SAL UIE$                 I
++ SAL UM^^                 UN
++ SAL UNTERE--             UNTE
++ SAL UNTER^^              UNTA
++ SAL UNVER^^              UNFA
++ SAL UN^^                 UN
++ SAL UTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL U                    U
++ SAL VACL-^               FAZ
++ SAL VAC$                 FAZ
++ SAL VEDD-^               FE
++ SAL VEREIN               FAEIN
++ SAL VERSEN^              FAZN
++ SAL VER^^                FA
++ SAL VER                  FA
++ SAL VET(HT)-^            FET
++ SAL VETTE$               FET
++ SAL VIC$                 FIZ
++ SAL VIEL                 FIL
++ SAL VIEW                 FIU
++ SAL VOR^^                FUR
++ SAL VY9^                 FI
++ SAL V<                   F
++ SAL WE(LMNRST)-3^        FE
++ SAL WIC$                 FIZ
++ SAL WIEDER^^             FITA
++ SAL WY9^                 FI
++ SAL W                    F
++ SAL XE(LMNRST)-3^        XE
++ SAL X<^                  Z
++ SAL X(CSZ)               X
++ SAL XTS(CH)--            XT
++ SAL XT(SZ)               Z
++ SAL X                    X
++ SAL YE(LMNRST)-3^        IE
++ SAL YE-3                 I
++ SAL YOR(GK)^$            I<>RK
++ SAL Y(AOU)-<7            I
++ SAL YVES^$               IF
++ SAL YVONNE^$             IFUN
++ SAL Y                    I
++ SAL ZC(AOU)-             ZK
++ SAL ZE(LMNRST)-3^        ZE
++ SAL ZH<                  Z
++ SAL ZS(CHT)--            _
++ SAL ZS                   Z
++ SAL ZUERST               ZUERZT
++ SAL ZUR<55>CK^^             ZURIK
++ SAL ZUVER^^              ZUFA    # x
++ SAL Z                    Z
+*** 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
@@ -36,21 +513,18 @@
 ***************
 *** 151,153 ****
   zulieb
-! 77857
-  <20>bte/N
---- 150,152 ----
-  zulieb
-! 
+- 77857
   <20>bte/N
+--- 150,151 ----
 ***************
 *** 18792,18794 ****
   Geschwulstherde
 - Geselchte/N
   Geselle/N
---- 18791,18792 ----
+--- 18790,18791 ----
 ***************
 *** 20472,20474 ****
   HTML
 - H<>fen
   H<>ftling/EPS
---- 20470,20471 ----
+--- 20469,20470 ----

runtime/spell/de/de_CH.diff

@@ -1,16 +1,13 @@
-*** de_CH.orig.aff	Mon Aug 15 22:45:43 2005
---- de_CH.aff	Mon Aug 15 22:54:21 2005
+*** de_CH.orig.aff	Thu Aug 25 11:22:18 2005
+--- de_CH.aff	Thu Sep 29 11:44:50 2005
 ***************
 *** 3,4 ****
---- 3,24 ----
+--- 3,21 ----
   
 + 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
@@ -25,3 +22,483 @@
 + MAP s<>
 + 
   
+***************
+*** 501 ****
+--- 518,994 ----
+  REP eh e
++ 
++ #   German phonetic transformation rules from Aspell
++ #   Copyright (C) 2000 Bj<42>rn Jacke, distributed under LGPL.
++ #   Bj<42>rn Jacke may be reached by email at bjoern.jacke@gmx.de
++ #   Last changed 2000-01-07
++ 
++ SAL followup        1
++ SAL collapse_result 1
++ 
++ SAL <20>ER-                 E
++ SAL <20>U<                  EU
++ SAL <20><                   E
++ SAL <20>                    E
++ SAL <20>ER-                 <20>
++ SAL <20>                    <20>
++ SAL <20>BER^^               IPA
++ SAL <20>ER-                 I
++ SAL <20>                    I
++ SAL <20>                    Z
++ SAL ABELLE$              APL
++ SAL ABELL$               APL
++ SAL ABIENNE$             APIN
++ SAL ACEY$                AZI
++ SAL AEU<                 EU
++ SAL AE2                  E
++ SAL AGNI-^               AKN
++ SAL AGNIE-               ANI
++ SAL AGN(AEOU)-$          ANI
++ SAL AIA2                 AIA
++ SAL AIE$                 E
++ SAL AILL(EOU)-           ALI
++ SAL AINE$                EN
++ SAL AIRE$                ER
++ SAL AIR-                 E
++ SAL AISE$                EZ
++ SAL AISSANCE$            EZANZ
++ SAL AISSE$               EZ
++ SAL AIX$                 EX
++ SAL AJ(A<>EIO<49>U<EFBFBD>)--       A
++ SAL AKTIE                AXIE
++ SAL ALO(IY)^             ALUI
++ SAL AMATEU(RS)-          ANAT<41>
++ SAL ANIELLE$             ANIL
++ SAL ANTI^^               ANTI
++ SAL ANVER^^              ANFA
++ SAL ATIA$                ATIA
++ SAL ATIA(NS)--           ATI
++ SAL ATI(A<>O<EFBFBD>U<EFBFBD>)-         AZI
++ SAL AUAU--               _
++ SAL AUER<                AUA
++ SAL AUF^^                AUF
++ SAL AULT$                U
++ SAL AUSSE$               UZ
++ SAL AUS(ST)-^            AUZ
++ SAL AUS^^                AUZ
++ SAL AUTO^^               AUTU
++ SAL AUX(IY)-             AUX
++ SAL AUX                  U
++ SAL AU                   AU
++ SAL AVIER$               AFIE
++ SAL AYER--<              EI
++ SAL AY(A<>EIO<49>U<EFBFBD>)--       A
++ SAL A(IJY)<              EI
++ SAL A                    A
++ SAL BEA(BCMNRU)-^        PEA
++ SAL BEAT(AEIMORU)-^      PEAT
++ SAL BEIGE^$              PEZ
++ SAL BE(LMNRST)-^         PE
++ SAL BETTE$               PET
++ SAL BIC$                 PIZ
++ SAL BOWL(EI)-            PUL
++ SAL BP(A<>EIO<49>RU<52>Y)-      P
++ SAL BUDGET7              PIKE
++ SAL BUFFET7              PIFE
++ SAL BYLLE$               PILE
++ SAL BYLL$                PIL
++ SAL BYTE<                PEIT
++ SAL B                    P
++ SAL C<>-                  Z
++ SAL C<>$                  ZI
++ SAL CACH(EI)-^           KEZ
++ SAL CAE--                Z
++ SAL CA(IY)$              ZEI
++ SAL CCH                  Z
++ SAL CCE-                 X
++ SAL CE(EIJUY)--          Z
++ SAL CENT<                ZENT
++ SAL CERST(EI)----^       KE
++ SAL CER$                 ZA
++ SAL CE3                  ZE
++ SAL CHAO(ST)-            KAU
++ SAL CHAMPIO-^            ZENPI
++ SAL CHAR(AI)-^           KAR
++ SAL CHAU(CDFSVWXZ)-      ZU
++ SAL CHE(CF)-             ZE
++ SAL CHEM-^               KE
++ SAL CHEQUE<              ZEK
++ SAL CHI(CFGPVW)-         ZI
++ SAL CH(AEUY)-<^          Z
++ SAL CHK-                 _
++ SAL CH(LOR)-<^           K
++ SAL CHST-                X
++ SAL CH(S<>XZ)3            X
++ SAL CH                   K
++ SAL CIER$                ZIE
++ SAL CYB-^                ZEI
++ SAL CY9^                 ZI
++ SAL C(IJY)-3             Z
++ SAL CKST                 XT
++ SAL CK(S<>XZ)3            X
++ SAL C(CK)-               _
++ SAL CLAUDET---           KLU
++ SAL CLAUDINE^$           KLUTIN
++ SAL COLE$                KUL
++ SAL COUCH                KAUZ
++ SAL CQUES$               K
++ SAL CQUE                 K
++ SAL CREAT-^              KREA
++ SAL CST                  XT
++ SAL CS<^                 Z
++ SAL C(S<>X)               X
++ SAL CT(S<>XZ)             X
++ SAL CZ<                  Z
++ SAL C<                   K
++ SAL D'H^                 T
++ SAL D'S3$                Z
++ SAL DAVO(NR)-^$          TAFU
++ SAL DD(SZ)--<            _
++ SAL DEPOT7               TEPU
++ SAL DESIGN               TIZEIN
++ SAL DE(LMNRST)-3^        TE
++ SAL DETTE$               TET
++ SAL DIC$                 TIZ
++ SAL DJ(AEIOU)-^          I
++ SAL DS(CH)--<            T
++ SAL DST                  ZT
++ SAL DT-                  _
++ SAL DUIS-^               TI
++ SAL DURCH^^              TURK
++ SAL DZS(CH)--            T
++ SAL D(S<>Z)               Z
++ SAL D                    T
++ SAL EAULT$               U
++ SAL EAUX$                U
++ SAL EAU                  U
++ SAL EAV                  IF
++ SAL EA(A<>EIO<49><4F>Y)-3       EA
++ SAL EA3$                 EA
++ SAL EA3                  I
++ SAL EBEN^^               EPN
++ SAL EE9                  E
++ SAL EIEI--               _
++ SAL EIH--                E
++ SAL EILLE$               EI
++ SAL EI                   EI
++ SAL EJ$                  EI
++ SAL EL-^                 E
++ SAL EL(DKL)--1           E
++ SAL EL(MNT)--1$          E
++ SAL ELYNE$               ELINE
++ SAL ELYN$                ELIN
++ SAL EL(A<>EIO<49>U<EFBFBD>Y)-1      EL
++ SAL EL-1                 L
++ SAL EM-^                 E
++ SAL EM(DFKMPQT)--1       E
++ SAL EM(A<>EIO<49>U<EFBFBD>Y)--1     E
++ SAL EM-1                 N
++ SAL EN-^                 E
++ SAL EN(CDGKQT)--1        E
++ SAL ENZ(AEIOUY)--1       EN
++ SAL EN(A<>EINO<4E>U<EFBFBD>Y)-1     EN
++ SAL EN-<1                N
++ SAL ERH(A<>EIO<49>U<EFBFBD>)-^      ER
++ SAL ER-^                 E
++ SAL ER(A<>EIO<49>U<EFBFBD>Y)-1      A
++ SAL ER1$                 A
++ SAL ER<1                 A
++ SAL ETI(A<>O<EFBFBD><4F>U)-         EZI
++ SAL EUEU--               _
++ SAL EUILLE$              <20>
++ SAL EUR$                 <20>R
++ SAL EUX                  <20>
++ SAL EUYS$                EUZ
++ SAL EU                   EU
++ SAL EYER<                EIA
++ SAL EY<                  EI
++ SAL E                    E
++ SAL FANS--^$             FE
++ SAL FAN-^$               FE
++ SAL FAULT-               FUL
++ SAL FEE(DL)-             FI
++ SAL FEHLER               FELA
++ SAL FE(LMNRST)-3^        FE
++ SAL FOND7                FUN
++ SAL FRAIN$               FRA
++ SAL FRISEU(RS)-          FRIZ<49>  # x
++ SAL F                    F
++ SAL G'S$                 X
++ SAL GAGS^$               KEX
++ SAL GAG^$                KEK
++ SAL GD                   KT
++ SAL GEGEN^^              KEKN
++ SAL GE(LMNRST)-3^        KE
++ SAL GETTE$               KET
++ SAL G(CK)-               _
++ SAL GG-                  _
++ SAL GI(AO)-^             I
++ SAL GION$                KIUN
++ SAL GIUS-^               IU
++ SAL GMBH^$               GMPH
++ SAL GNAC$                NIAK
++ SAL GNON$                NIUN
++ SAL GN$                  N
++ SAL GONCAL-^             KUNZA
++ SAL GS(CH)--             K
++ SAL GST                  XT
++ SAL G(S<>XZ)              X
++ SAL GUCK-                KU
++ SAL GUI-^                K
++ SAL G                    K
++ SAL HEAD-                E
++ SAL HE(LMNRST)-3^        E
++ SAL HE(LMN)-1            E
++ SAL HEUR1$               <20>R
++ SAL H^                   _
++ SAL IEC$                 IZ
++ SAL IEI-3                _
++ SAL IELL3                IEL
++ SAL IENNE$               IN
++ SAL IERRE$               IER
++ SAL IETTE$               IT
++ SAL IEU                  I<>
++ SAL IE<4                 I
++ SAL IGHT3$               EIT
++ SAL IGNI(EO)-            INI
++ SAL IGN(AEOU)-$          INI
++ SAL IJ(AOU)-             I
++ SAL IJ$                  I
++ SAL IJ<                  EI
++ SAL IKOLE$               IKUL
++ SAL ILLAN(STZ)--         ILIA
++ SAL ILLAR(DT)--          ILIA
++ SAL INVER-               INFE
++ SAL ITI(A<>O<EFBFBD>U<EFBFBD>)-         IZI
++ SAL IVIER$               IFIE
++ SAL I                    I
++ SAL JAVIE---<^           ZA
++ SAL JEAN^$               IA
++ SAL JEAN-^               IA
++ SAL JER-^                IE
++ SAL JE(LMNST)-           IE
++ SAL JOR(GK)^$            I<>RK
++ SAL J                    I
++ SAL KC(<28>EIJ)-            X
++ SAL KE(LMNRST)-3^        KE
++ SAL KH<^                 K
++ SAL KIC$                 KIZ
++ SAL KLE(LMNRST)-3^       KLE
++ SAL KOTELE-^             KUTL
++ SAL KREAT-^              KREA
++ SAL KST                  XT
++ SAL K(S<>XZ)              X
++ SAL KTI(AIOU)-3          XI
++ SAL KT(S<>XZ)             X
++ SAL K                    K
++ SAL LARVE-               LARF
++ SAL LEAND-^              LEAN
++ SAL LEL-                 LE
++ SAL LE(MNRST)-3^         LE
++ SAL LETTE$               LET
++ SAL LFGNAG-              LFKAN
++ SAL LIC$                 LIZ
++ SAL LIVE^$               LEIF
++ SAL LUI(GS)--            LU
++ SAL L                    L
++ SAL MASSEU(RS)-          NAZ<41>
++ SAL MAURICE              NURIZ
++ SAL MBH^$                MPH
++ SAL MB(S<>Z)-             N
++ SAL MC9^                 NK
++ SAL MEMOIR-^             NENUA
++ SAL ME(LMNRST)-3^        NE
++ SAL MIGUEL               NIKL
++ SAL MIKE^$               NEIK
++ SAL MN                   N
++ SAL MPJUTE-              NPUT
++ SAL MP(S<>Z)-             N
++ SAL MP(BDJLMNPQRTVW)-    NP
++ SAL M                    N
++ SAL NACH^^               NAK
++ SAL NADINE               NATIN
++ SAL NAIV--               NA
++ SAL NAISE$               NEZE
++ SAL NCOISE$              ZUA
++ SAL NCOIS$               ZUA
++ SAL NEBEN^^              NEPN
++ SAL NE(LMNRST)-3^        NE
++ SAL NEN-3                NE
++ SAL NETTE$               NET
++ SAL NG(BDFJLMNPQRTVW)-   NK
++ SAL NICHTS^^             NIX
++ SAL NICHT^^              NIKT
++ SAL NINE$                NIN
++ SAL NON^^                NUN
++ SAL NOT^^                NUT
++ SAL NTI(AIOU)-3          NZI
++ SAL NTIEL--3             NZI
++ SAL NYLON                NEILUN
++ SAL ND(S<>Z)$             NZ
++ SAL NT(S<>Z)$             NZ
++ SAL ND'S$                NZ
++ SAL NT'S$                NZ
++ SAL NSTS$                NZ
++ SAL N                    N
++ SAL OBER^^               UPA
++ SAL OE2                  <20>
++ SAL OGNIE-               UNI
++ SAL OGN(AEOU)-$          UNI
++ SAL OIE$                 <20>
++ SAL OIR$                 UAR
++ SAL OIX                  UA
++ SAL OI<3                 EU
++ SAL OJ(A<>EIO<49>U<EFBFBD>)--       U
++ SAL OKAY^$               UKE
++ SAL OLYN$                ULIN
++ SAL OTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL OUI^                 FI
++ SAL OUILLE$              ULIE
++ SAL OU(DT)-^             AU
++ SAL OUSE$                AUZ
++ SAL OUT-                 AU
++ SAL OU                   U
++ SAL OWS$                 UZ
++ SAL OY(A<>EIO<49>U<EFBFBD>)--       U
++ SAL O(JY)<               EU
++ SAL O                    U
++ SAL PATIEN--^            PAZI
++ SAL PENSIO-^             PANZI
++ SAL PE(LMNRST)-3^        PE
++ SAL PFER-^               FE
++ SAL P(FH)<               F
++ SAL POLY^^               PULI
++ SAL PORTRAIT7            PURTRE
++ SAL PP(FH)--<            P
++ SAL PP-                  _
++ SAL PRIX^$               PRI
++ SAL P(S<>Z)^              Z
++ SAL PTI(A<>O<EFBFBD>U<EFBFBD>)-3        PZI
++ SAL PIC^$                PIK
++ SAL P                    P
++ SAL QUE(LMNRST)-3        KFE
++ SAL QUE$                 K
++ SAL QUI(NS)$             KI
++ SAL QU                   KF
++ SAL Q<                   K
++ SAL RCH                  RK
++ SAL RECHERCH^            REZAZ
++ SAL RER$                 RA
++ SAL RE(MNR)-4            RE
++ SAL RETTE$               RET
++ SAL RH<^                 R
++ SAL RJA(MN)--            RI
++ SAL RTI(A<>O<EFBFBD>U<EFBFBD>)-3        RZI
++ SAL RY(KN)-$             RI
++ SAL R                    R
++ SAL SAFE^$               ZEIF
++ SAL SAUCE-^              ZUZ
++ SAL SCHSCH---7           _
++ SAL SCHTSCH              Z
++ SAL SC(HZ)<              Z
++ SAL SC                   ZK
++ SAL SELBSTST--7^^        ZELP
++ SAL SELBST7^^            ZELPZT
++ SAL SERVICE7^            Z<>RFIZ
++ SAL SE(LMNRST)-3^        ZE
++ SAL SETTE$               ZET
++ SAL SHP-^                Z
++ SAL SHST                 ZT
++ SAL SHTSH                Z
++ SAL SHT                  Z
++ SAL SH3                  Z
++ SAL SIEGLI-^             ZIKL
++ SAL SIGLI-^              ZIKL
++ SAL SIGHT                ZEIT
++ SAL SIGN                 ZEIN
++ SAL SKI(NPZ)-            ZKI
++ SAL SKI<^                ZI
++ SAL SOUND-               ZAUN
++ SAL STAATS^^             ZTAZ
++ SAL STADT^^              ZTAT
++ SAL START^^              ZTART
++ SAL STAURANT7            ZTURAN
++ SAL STEAK-               ZTE
++ SAL STRAF^^              ZTRAF
++ SAL ST'S$                Z
++ SAL STST--               _
++ SAL STS(ACEHIOU<4F><55><EFBFBD>)--    ZT
++ SAL ST(SZ)               Z
++ SAL STYN(AE)-$           ZTIN
++ SAL ST                   ZT
++ SAL SZE(NPT)-^           ZE
++ SAL SZI(ELN)-^           ZI
++ SAL SZCZ<                Z
++ SAL SZT<                 ZT
++ SAL SZ<3                 Z
++ SAL S                    Z
++ SAL T'S3$                Z
++ SAL TCH                  Z
++ SAL TEAT-^               TEA
++ SAL TE(LMNRST)-3^        TE
++ SAL TH<                  T
++ SAL TIC$                 TIZ
++ SAL TOAS-^               TU
++ SAL TOILET-              TULE
++ SAL TOIN-                TUA
++ SAL TRAINI-              TREN
++ SAL TSCH                 Z
++ SAL TSH                  Z
++ SAL TST                  ZT
++ SAL T(S<>)                Z
++ SAL TT(SZ)--<            _
++ SAL TT9                  T
++ SAL TZ-                  _
++ SAL T                    T
++ SAL UEBER^^              IPA
++ SAL UE2                  I
++ SAL UIE$                 I
++ SAL UM^^                 UN
++ SAL UNTERE--             UNTE
++ SAL UNTER^^              UNTA
++ SAL UNVER^^              UNFA
++ SAL UN^^                 UN
++ SAL UTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL U                    U
++ SAL VACL-^               FAZ
++ SAL VAC$                 FAZ
++ SAL VEDD-^               FE
++ SAL VEREIN               FAEIN
++ SAL VERSEN^              FAZN
++ SAL VER^^                FA
++ SAL VER                  FA
++ SAL VET(HT)-^            FET
++ SAL VETTE$               FET
++ SAL VIC$                 FIZ
++ SAL VIEL                 FIL
++ SAL VIEW                 FIU
++ SAL VOR^^                FUR
++ SAL VY9^                 FI
++ SAL V<                   F
++ SAL WE(LMNRST)-3^        FE
++ SAL WIC$                 FIZ
++ SAL WIEDER^^             FITA
++ SAL WY9^                 FI
++ SAL W                    F
++ SAL XE(LMNRST)-3^        XE
++ SAL X<^                  Z
++ SAL X(CSZ)               X
++ SAL XTS(CH)--            XT
++ SAL XT(SZ)               Z
++ SAL X                    X
++ SAL YE(LMNRST)-3^        IE
++ SAL YE-3                 I
++ SAL YOR(GK)^$            I<>RK
++ SAL Y(AOU)-<7            I
++ SAL YVES^$               IF
++ SAL YVONNE^$             IFUN
++ SAL Y                    I
++ SAL ZC(AOU)-             ZK
++ SAL ZE(LMNRST)-3^        ZE
++ SAL ZH<                  Z
++ SAL ZS(CHT)--            _
++ SAL ZS                   Z
++ SAL ZUERST               ZUERZT
++ SAL ZUR<55>CK^^             ZURIK
++ SAL ZUVER^^              ZUFA    # x
++ SAL Z                    Z

runtime/spell/de/de_DE.diff

@@ -1,17 +1,14 @@
-*** de_DE.orig.aff	Mon Aug 15 22:45:33 2005
---- de_DE.aff	Mon Aug 15 22:45:33 2005
+*** de_DE.orig.aff	Thu Aug 25 11:22:06 2005
+--- de_DE.aff	Thu Sep 29 11:44:57 2005
 ***************
 *** 2,3 ****
---- 2,24 ----
+--- 2,21 ----
   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
@@ -26,3 +23,483 @@
 + MAP s<>
 + 
   #
+***************
+*** 1225 ****
+--- 1243,1719 ----
+  REP <20> <20>e
++ 
++ #   German phonetic transformation rules from Aspell
++ #   Copyright (C) 2000 Bj<42>rn Jacke, distributed under LGPL.
++ #   Bj<42>rn Jacke may be reached by email at bjoern.jacke@gmx.de
++ #   Last changed 2000-01-07
++ 
++ SAL followup        1
++ SAL collapse_result 1
++ 
++ SAL <20>ER-                 E
++ SAL <20>U<                  EU
++ SAL <20><                   E
++ SAL <20>                    E
++ SAL <20>ER-                 <20>
++ SAL <20>                    <20>
++ SAL <20>BER^^               IPA
++ SAL <20>ER-                 I
++ SAL <20>                    I
++ SAL <20>                    Z
++ SAL ABELLE$              APL
++ SAL ABELL$               APL
++ SAL ABIENNE$             APIN
++ SAL ACEY$                AZI
++ SAL AEU<                 EU
++ SAL AE2                  E
++ SAL AGNI-^               AKN
++ SAL AGNIE-               ANI
++ SAL AGN(AEOU)-$          ANI
++ SAL AIA2                 AIA
++ SAL AIE$                 E
++ SAL AILL(EOU)-           ALI
++ SAL AINE$                EN
++ SAL AIRE$                ER
++ SAL AIR-                 E
++ SAL AISE$                EZ
++ SAL AISSANCE$            EZANZ
++ SAL AISSE$               EZ
++ SAL AIX$                 EX
++ SAL AJ(A<>EIO<49>U<EFBFBD>)--       A
++ SAL AKTIE                AXIE
++ SAL ALO(IY)^             ALUI
++ SAL AMATEU(RS)-          ANAT<41>
++ SAL ANIELLE$             ANIL
++ SAL ANTI^^               ANTI
++ SAL ANVER^^              ANFA
++ SAL ATIA$                ATIA
++ SAL ATIA(NS)--           ATI
++ SAL ATI(A<>O<EFBFBD>U<EFBFBD>)-         AZI
++ SAL AUAU--               _
++ SAL AUER<                AUA
++ SAL AUF^^                AUF
++ SAL AULT$                U
++ SAL AUSSE$               UZ
++ SAL AUS(ST)-^            AUZ
++ SAL AUS^^                AUZ
++ SAL AUTO^^               AUTU
++ SAL AUX(IY)-             AUX
++ SAL AUX                  U
++ SAL AU                   AU
++ SAL AVIER$               AFIE
++ SAL AYER--<              EI
++ SAL AY(A<>EIO<49>U<EFBFBD>)--       A
++ SAL A(IJY)<              EI
++ SAL A                    A
++ SAL BEA(BCMNRU)-^        PEA
++ SAL BEAT(AEIMORU)-^      PEAT
++ SAL BEIGE^$              PEZ
++ SAL BE(LMNRST)-^         PE
++ SAL BETTE$               PET
++ SAL BIC$                 PIZ
++ SAL BOWL(EI)-            PUL
++ SAL BP(A<>EIO<49>RU<52>Y)-      P
++ SAL BUDGET7              PIKE
++ SAL BUFFET7              PIFE
++ SAL BYLLE$               PILE
++ SAL BYLL$                PIL
++ SAL BYTE<                PEIT
++ SAL B                    P
++ SAL C<>-                  Z
++ SAL C<>$                  ZI
++ SAL CACH(EI)-^           KEZ
++ SAL CAE--                Z
++ SAL CA(IY)$              ZEI
++ SAL CCH                  Z
++ SAL CCE-                 X
++ SAL CE(EIJUY)--          Z
++ SAL CENT<                ZENT
++ SAL CERST(EI)----^       KE
++ SAL CER$                 ZA
++ SAL CE3                  ZE
++ SAL CHAO(ST)-            KAU
++ SAL CHAMPIO-^            ZENPI
++ SAL CHAR(AI)-^           KAR
++ SAL CHAU(CDFSVWXZ)-      ZU
++ SAL CHE(CF)-             ZE
++ SAL CHEM-^               KE
++ SAL CHEQUE<              ZEK
++ SAL CHI(CFGPVW)-         ZI
++ SAL CH(AEUY)-<^          Z
++ SAL CHK-                 _
++ SAL CH(LOR)-<^           K
++ SAL CHST-                X
++ SAL CH(S<>XZ)3            X
++ SAL CH                   K
++ SAL CIER$                ZIE
++ SAL CYB-^                ZEI
++ SAL CY9^                 ZI
++ SAL C(IJY)-3             Z
++ SAL CKST                 XT
++ SAL CK(S<>XZ)3            X
++ SAL C(CK)-               _
++ SAL CLAUDET---           KLU
++ SAL CLAUDINE^$           KLUTIN
++ SAL COLE$                KUL
++ SAL COUCH                KAUZ
++ SAL CQUES$               K
++ SAL CQUE                 K
++ SAL CREAT-^              KREA
++ SAL CST                  XT
++ SAL CS<^                 Z
++ SAL C(S<>X)               X
++ SAL CT(S<>XZ)             X
++ SAL CZ<                  Z
++ SAL C<                   K
++ SAL D'H^                 T
++ SAL D'S3$                Z
++ SAL DAVO(NR)-^$          TAFU
++ SAL DD(SZ)--<            _
++ SAL DEPOT7               TEPU
++ SAL DESIGN               TIZEIN
++ SAL DE(LMNRST)-3^        TE
++ SAL DETTE$               TET
++ SAL DIC$                 TIZ
++ SAL DJ(AEIOU)-^          I
++ SAL DS(CH)--<            T
++ SAL DST                  ZT
++ SAL DT-                  _
++ SAL DUIS-^               TI
++ SAL DURCH^^              TURK
++ SAL DZS(CH)--            T
++ SAL D(S<>Z)               Z
++ SAL D                    T
++ SAL EAULT$               U
++ SAL EAUX$                U
++ SAL EAU                  U
++ SAL EAV                  IF
++ SAL EA(A<>EIO<49><4F>Y)-3       EA
++ SAL EA3$                 EA
++ SAL EA3                  I
++ SAL EBEN^^               EPN
++ SAL EE9                  E
++ SAL EIEI--               _
++ SAL EIH--                E
++ SAL EILLE$               EI
++ SAL EI                   EI
++ SAL EJ$                  EI
++ SAL EL-^                 E
++ SAL EL(DKL)--1           E
++ SAL EL(MNT)--1$          E
++ SAL ELYNE$               ELINE
++ SAL ELYN$                ELIN
++ SAL EL(A<>EIO<49>U<EFBFBD>Y)-1      EL
++ SAL EL-1                 L
++ SAL EM-^                 E
++ SAL EM(DFKMPQT)--1       E
++ SAL EM(A<>EIO<49>U<EFBFBD>Y)--1     E
++ SAL EM-1                 N
++ SAL EN-^                 E
++ SAL EN(CDGKQT)--1        E
++ SAL ENZ(AEIOUY)--1       EN
++ SAL EN(A<>EINO<4E>U<EFBFBD>Y)-1     EN
++ SAL EN-<1                N
++ SAL ERH(A<>EIO<49>U<EFBFBD>)-^      ER
++ SAL ER-^                 E
++ SAL ER(A<>EIO<49>U<EFBFBD>Y)-1      A
++ SAL ER1$                 A
++ SAL ER<1                 A
++ SAL ETI(A<>O<EFBFBD><4F>U)-         EZI
++ SAL EUEU--               _
++ SAL EUILLE$              <20>
++ SAL EUR$                 <20>R
++ SAL EUX                  <20>
++ SAL EUYS$                EUZ
++ SAL EU                   EU
++ SAL EYER<                EIA
++ SAL EY<                  EI
++ SAL E                    E
++ SAL FANS--^$             FE
++ SAL FAN-^$               FE
++ SAL FAULT-               FUL
++ SAL FEE(DL)-             FI
++ SAL FEHLER               FELA
++ SAL FE(LMNRST)-3^        FE
++ SAL FOND7                FUN
++ SAL FRAIN$               FRA
++ SAL FRISEU(RS)-          FRIZ<49>  # x
++ SAL F                    F
++ SAL G'S$                 X
++ SAL GAGS^$               KEX
++ SAL GAG^$                KEK
++ SAL GD                   KT
++ SAL GEGEN^^              KEKN
++ SAL GE(LMNRST)-3^        KE
++ SAL GETTE$               KET
++ SAL G(CK)-               _
++ SAL GG-                  _
++ SAL GI(AO)-^             I
++ SAL GION$                KIUN
++ SAL GIUS-^               IU
++ SAL GMBH^$               GMPH
++ SAL GNAC$                NIAK
++ SAL GNON$                NIUN
++ SAL GN$                  N
++ SAL GONCAL-^             KUNZA
++ SAL GS(CH)--             K
++ SAL GST                  XT
++ SAL G(S<>XZ)              X
++ SAL GUCK-                KU
++ SAL GUI-^                K
++ SAL G                    K
++ SAL HEAD-                E
++ SAL HE(LMNRST)-3^        E
++ SAL HE(LMN)-1            E
++ SAL HEUR1$               <20>R
++ SAL H^                   _
++ SAL IEC$                 IZ
++ SAL IEI-3                _
++ SAL IELL3                IEL
++ SAL IENNE$               IN
++ SAL IERRE$               IER
++ SAL IETTE$               IT
++ SAL IEU                  I<>
++ SAL IE<4                 I
++ SAL IGHT3$               EIT
++ SAL IGNI(EO)-            INI
++ SAL IGN(AEOU)-$          INI
++ SAL IJ(AOU)-             I
++ SAL IJ$                  I
++ SAL IJ<                  EI
++ SAL IKOLE$               IKUL
++ SAL ILLAN(STZ)--         ILIA
++ SAL ILLAR(DT)--          ILIA
++ SAL INVER-               INFE
++ SAL ITI(A<>O<EFBFBD>U<EFBFBD>)-         IZI
++ SAL IVIER$               IFIE
++ SAL I                    I
++ SAL JAVIE---<^           ZA
++ SAL JEAN^$               IA
++ SAL JEAN-^               IA
++ SAL JER-^                IE
++ SAL JE(LMNST)-           IE
++ SAL JOR(GK)^$            I<>RK
++ SAL J                    I
++ SAL KC(<28>EIJ)-            X
++ SAL KE(LMNRST)-3^        KE
++ SAL KH<^                 K
++ SAL KIC$                 KIZ
++ SAL KLE(LMNRST)-3^       KLE
++ SAL KOTELE-^             KUTL
++ SAL KREAT-^              KREA
++ SAL KST                  XT
++ SAL K(S<>XZ)              X
++ SAL KTI(AIOU)-3          XI
++ SAL KT(S<>XZ)             X
++ SAL K                    K
++ SAL LARVE-               LARF
++ SAL LEAND-^              LEAN
++ SAL LEL-                 LE
++ SAL LE(MNRST)-3^         LE
++ SAL LETTE$               LET
++ SAL LFGNAG-              LFKAN
++ SAL LIC$                 LIZ
++ SAL LIVE^$               LEIF
++ SAL LUI(GS)--            LU
++ SAL L                    L
++ SAL MASSEU(RS)-          NAZ<41>
++ SAL MAURICE              NURIZ
++ SAL MBH^$                MPH
++ SAL MB(S<>Z)-             N
++ SAL MC9^                 NK
++ SAL MEMOIR-^             NENUA
++ SAL ME(LMNRST)-3^        NE
++ SAL MIGUEL               NIKL
++ SAL MIKE^$               NEIK
++ SAL MN                   N
++ SAL MPJUTE-              NPUT
++ SAL MP(S<>Z)-             N
++ SAL MP(BDJLMNPQRTVW)-    NP
++ SAL M                    N
++ SAL NACH^^               NAK
++ SAL NADINE               NATIN
++ SAL NAIV--               NA
++ SAL NAISE$               NEZE
++ SAL NCOISE$              ZUA
++ SAL NCOIS$               ZUA
++ SAL NEBEN^^              NEPN
++ SAL NE(LMNRST)-3^        NE
++ SAL NEN-3                NE
++ SAL NETTE$               NET
++ SAL NG(BDFJLMNPQRTVW)-   NK
++ SAL NICHTS^^             NIX
++ SAL NICHT^^              NIKT
++ SAL NINE$                NIN
++ SAL NON^^                NUN
++ SAL NOT^^                NUT
++ SAL NTI(AIOU)-3          NZI
++ SAL NTIEL--3             NZI
++ SAL NYLON                NEILUN
++ SAL ND(S<>Z)$             NZ
++ SAL NT(S<>Z)$             NZ
++ SAL ND'S$                NZ
++ SAL NT'S$                NZ
++ SAL NSTS$                NZ
++ SAL N                    N
++ SAL OBER^^               UPA
++ SAL OE2                  <20>
++ SAL OGNIE-               UNI
++ SAL OGN(AEOU)-$          UNI
++ SAL OIE$                 <20>
++ SAL OIR$                 UAR
++ SAL OIX                  UA
++ SAL OI<3                 EU
++ SAL OJ(A<>EIO<49>U<EFBFBD>)--       U
++ SAL OKAY^$               UKE
++ SAL OLYN$                ULIN
++ SAL OTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL OUI^                 FI
++ SAL OUILLE$              ULIE
++ SAL OU(DT)-^             AU
++ SAL OUSE$                AUZ
++ SAL OUT-                 AU
++ SAL OU                   U
++ SAL OWS$                 UZ
++ SAL OY(A<>EIO<49>U<EFBFBD>)--       U
++ SAL O(JY)<               EU
++ SAL O                    U
++ SAL PATIEN--^            PAZI
++ SAL PENSIO-^             PANZI
++ SAL PE(LMNRST)-3^        PE
++ SAL PFER-^               FE
++ SAL P(FH)<               F
++ SAL POLY^^               PULI
++ SAL PORTRAIT7            PURTRE
++ SAL PP(FH)--<            P
++ SAL PP-                  _
++ SAL PRIX^$               PRI
++ SAL P(S<>Z)^              Z
++ SAL PTI(A<>O<EFBFBD>U<EFBFBD>)-3        PZI
++ SAL PIC^$                PIK
++ SAL P                    P
++ SAL QUE(LMNRST)-3        KFE
++ SAL QUE$                 K
++ SAL QUI(NS)$             KI
++ SAL QU                   KF
++ SAL Q<                   K
++ SAL RCH                  RK
++ SAL RECHERCH^            REZAZ
++ SAL RER$                 RA
++ SAL RE(MNR)-4            RE
++ SAL RETTE$               RET
++ SAL RH<^                 R
++ SAL RJA(MN)--            RI
++ SAL RTI(A<>O<EFBFBD>U<EFBFBD>)-3        RZI
++ SAL RY(KN)-$             RI
++ SAL R                    R
++ SAL SAFE^$               ZEIF
++ SAL SAUCE-^              ZUZ
++ SAL SCHSCH---7           _
++ SAL SCHTSCH              Z
++ SAL SC(HZ)<              Z
++ SAL SC                   ZK
++ SAL SELBSTST--7^^        ZELP
++ SAL SELBST7^^            ZELPZT
++ SAL SERVICE7^            Z<>RFIZ
++ SAL SE(LMNRST)-3^        ZE
++ SAL SETTE$               ZET
++ SAL SHP-^                Z
++ SAL SHST                 ZT
++ SAL SHTSH                Z
++ SAL SHT                  Z
++ SAL SH3                  Z
++ SAL SIEGLI-^             ZIKL
++ SAL SIGLI-^              ZIKL
++ SAL SIGHT                ZEIT
++ SAL SIGN                 ZEIN
++ SAL SKI(NPZ)-            ZKI
++ SAL SKI<^                ZI
++ SAL SOUND-               ZAUN
++ SAL STAATS^^             ZTAZ
++ SAL STADT^^              ZTAT
++ SAL START^^              ZTART
++ SAL STAURANT7            ZTURAN
++ SAL STEAK-               ZTE
++ SAL STRAF^^              ZTRAF
++ SAL ST'S$                Z
++ SAL STST--               _
++ SAL STS(ACEHIOU<4F><55><EFBFBD>)--    ZT
++ SAL ST(SZ)               Z
++ SAL STYN(AE)-$           ZTIN
++ SAL ST                   ZT
++ SAL SZE(NPT)-^           ZE
++ SAL SZI(ELN)-^           ZI
++ SAL SZCZ<                Z
++ SAL SZT<                 ZT
++ SAL SZ<3                 Z
++ SAL S                    Z
++ SAL T'S3$                Z
++ SAL TCH                  Z
++ SAL TEAT-^               TEA
++ SAL TE(LMNRST)-3^        TE
++ SAL TH<                  T
++ SAL TIC$                 TIZ
++ SAL TOAS-^               TU
++ SAL TOILET-              TULE
++ SAL TOIN-                TUA
++ SAL TRAINI-              TREN
++ SAL TSCH                 Z
++ SAL TSH                  Z
++ SAL TST                  ZT
++ SAL T(S<>)                Z
++ SAL TT(SZ)--<            _
++ SAL TT9                  T
++ SAL TZ-                  _
++ SAL T                    T
++ SAL UEBER^^              IPA
++ SAL UE2                  I
++ SAL UIE$                 I
++ SAL UM^^                 UN
++ SAL UNTERE--             UNTE
++ SAL UNTER^^              UNTA
++ SAL UNVER^^              UNFA
++ SAL UN^^                 UN
++ SAL UTI(A<>O<EFBFBD>U<EFBFBD>)-         UZI
++ SAL U                    U
++ SAL VACL-^               FAZ
++ SAL VAC$                 FAZ
++ SAL VEDD-^               FE
++ SAL VEREIN               FAEIN
++ SAL VERSEN^              FAZN
++ SAL VER^^                FA
++ SAL VER                  FA
++ SAL VET(HT)-^            FET
++ SAL VETTE$               FET
++ SAL VIC$                 FIZ
++ SAL VIEL                 FIL
++ SAL VIEW                 FIU
++ SAL VOR^^                FUR
++ SAL VY9^                 FI
++ SAL V<                   F
++ SAL WE(LMNRST)-3^        FE
++ SAL WIC$                 FIZ
++ SAL WIEDER^^             FITA
++ SAL WY9^                 FI
++ SAL W                    F
++ SAL XE(LMNRST)-3^        XE
++ SAL X<^                  Z
++ SAL X(CSZ)               X
++ SAL XTS(CH)--            XT
++ SAL XT(SZ)               Z
++ SAL X                    X
++ SAL YE(LMNRST)-3^        IE
++ SAL YE-3                 I
++ SAL YOR(GK)^$            I<>RK
++ SAL Y(AOU)-<7            I
++ SAL YVES^$               IF
++ SAL YVONNE^$             IFUN
++ SAL Y                    I
++ SAL ZC(AOU)-             ZK
++ SAL ZE(LMNRST)-3^        ZE
++ SAL ZH<                  Z
++ SAL ZS(CHT)--            _
++ SAL ZS                   Z
++ SAL ZUERST               ZUERZT
++ SAL ZUR<55>CK^^             ZURIK
++ SAL ZUVER^^              ZUFA    # x
++ SAL Z                    Z

runtime/spell/de/main.aap

@@ -22,9 +22,9 @@ SPELLDIR   = ..
 FILES      = de_$*(REGIONS).aff de_$*(REGIONS).dic
 
 ZIPFILE_DE = de_DE_comb.zip
-ZIPFILE_19 = de_DE.zip
+ZIPFILE_19 = de_OLDSPELL.zip
 ZIPFILE_20 = de_DE_neu.zip
-ZIPFILE_AT = de_AT.zip
+ZIPFILE_AT = de_DE.zip
 ZIPFILE_CH = de_CH.zip
 ZIPFILES   = $ZIPFILE_DE $ZIPFILE_19 $ZIPFILE_20 $ZIPFILE_AT $ZIPFILE_CH
 
@@ -57,10 +57,13 @@ $SPELLDIR/de.utf-8.spl : $FILES
         :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
+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.
@@ -82,23 +85,12 @@ de_DE.aff de_DE.dic: {buildcheck=}
 de_19.aff de_19.dic: {buildcheck=}
         :assertpkg unzip patch
         :fetch $ZIPFILE_19
-        # Move the other files out of the way.
-        @if os.path.exists("de_DE.aff"):
-            :move de_DE.aff de_DE_comb.aff
-            :move de_DE.dic de_DE_comb.dic
-            :move README_de_DE.txt README_de_DE_comb.txt
-
         :sys $UNZIP $ZIPFILE_19
         :delete $ZIPFILE_19
-        :delete {f} de_AT.dic
-        :move de_DE.aff de_19.aff
-        :move de_DE.dic de_19.dic
-        :move README_de_DE.txt README_de_19.txt
-
-        @if os.path.exists("de_DE_comb.aff"):
-            :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
+        :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'):
@@ -121,16 +113,37 @@ de_20.aff de_20.dic: {buildcheck=}
         @if os.path.exists('de_20.diff'):
             :sys patch <de_20.diff
 
-# It appears de_AT.dic is only an additional file for another word list.  We
-# guess it's the old spelling one and concatenate them.  Complication is that
-# de_AT.dic is missing a newline at the end.
-de_AT.aff de_AT.dic: {buildcheck=} de_19.dic
+# 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_19.dic >>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'):
@@ -172,25 +185,6 @@ diff:
 
 check:
         :print TODO!!!!
-        :assertpkg unzip diff
-        :fetch $ZIPFILE_DE
-        :mkdir tmp
-        :cd tmp
-        @try:
-            @import stat
-            :sys $UNZIP ../$ZIPFILE_DE
-            :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_DE
 
 
 # vim: set sts=4 sw=4 :

runtime/spell/el/el_GR.diff

@@ -0,0 +1,204 @@
+*** el_GR.orig.aff	Tue Aug 16 18:02:27 2005
+--- el_GR.aff	Thu Sep 29 22:28:12 2005
+***************
+*** 572,574 ****
+  SFX J <20>     <20><><EFBFBD><EFBFBD><EFBFBD>      .          # <20><><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+! 	 
+  SFX K Y 4 
+--- 572,574 ----
+  SFX J <20>     <20><><EFBFBD><EFBFBD><EFBFBD>      .          # <20><><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+!          
+  SFX K Y 4 
+***************
+*** 619,621 ****
+  
+! 	 
+  SFX R Y 4
+--- 619,621 ----
+  
+!          
+  SFX R Y 4
+***************
+*** 626,628 ****
+  
+! 	 
+  SFX S Y 4
+--- 626,628 ----
+  
+!          
+  SFX S Y 4
+***************
+*** 646,648 ****
+  
+! 	 
+  SFX V Y 5
+--- 646,648 ----
+  
+!          
+  SFX V Y 5
+***************
+*** 686,688 ****
+  
+! 	 
+  SFX b Y 4
+--- 686,688 ----
+  
+!          
+  SFX b Y 4
+***************
+*** 758 ****
+--- 758,911 ----
+  SFX n <20><>         <20>           .        # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD>
++ 
++ # sound folding from Aspell
++ # version 0.0 03/14/2002
++ # 03/14/2002 Evripidis Papakostas <evris@source.gr>
++ 
++ # all the following double letters are pronounced as one
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>                         <20><>
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20><>                         <20>
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20><>                         <20>
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _
++ SAL <20>                          <20>
++ SAL <20><>-                        _ 
++ SAL <20>                          <20>
++ 
++ # alpha + (ypsilon or ypsilon tonos) becomes alpha + beta
++ SAL <20><><                        <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-               <20><>
++ SAL <20><><EFBFBD>                        <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-        <20><>
++ 
++ # alpha + (ypsilon or ypsilon tonos) becomes alpha + phi
++ SAL <20><><EFBFBD>                        <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-                <20><>
++ SAL <20><><EFBFBD>-                       <20><>
++ SAL <20><><EFBFBD>-                       <20><>
++ 
++ # alpha + (iota or iota tonos) becomes epsilon
++ SAL <20>(ɺ)                      <20>
++ 
++ # alpha is alpha
++ SAL <20>                          <20>
++ 
++ # epsilon + (ypsilon or ypsilon tonos) becomes epsilon + vita
++ SAL ž<                        <20>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-               <20><>
++ SAL <20><><EFBFBD>                        <20><>
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ն<EFBFBD><D5B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-        <20><>
++ 
++ # epsilon + (ypsilon or ypsilon tonos) becomes epsilon + phi
++ SAL <20><><EFBFBD>                        <20><>
++ SAL <20><><EFBFBD><EFBFBD>--                     <20><>       # GUESSED!
++ SAL <20><>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)-                <20><>
++ SAL <20><><EFBFBD>-                       <20><>
++ SAL <20><><EFBFBD>-                       <20><>
++ 
++ # epsilon + (iota or iota tonos) becomes iota
++ SAL <20>(ɺ)                      <20>
++ 
++ # epsilon is epsilon
++ SAL <20>                          <20>
++ 
++ 
++ # omikron + (iota or iota tonos) becomes iota
++ SAL <20>(ɺ)                      <20>
++ 
++ # omikron + (ypsilon or ypsilon tonos) becomes u
++ SAL <20>(վ)                      <20><>
++ 
++ # omikron is omikron
++ SAL <20>                          <20>
++ 
++ # wmega becomes omikron
++ SAL <20>                          <20>
++ 
++ # ita becomes iota
++ SAL <20>                          <20>
++ 
++ # ypsilon + iota becomes iota
++ SAL <20><>                         <20>
++ 
++ # ypsilon becomes iota
++ SAL <20>                          <20>
++ 
++ # iota is iota
++ SAL <20>                          <20>
++ 
++ # double ksi becomes ksi 
++ SAL <20><>-                         _
++ 
++ # ksi + sigma becomes ksi 
++ SAL <20><>                         <20>
++ 
++ # ksi is ksi
++ SAL <20>                          <20>
++ 
++ # psi + psi becomes psi
++ SAL <20><>-                        _
++ 
++ # psi + sigma becomes psi
++ SAL <20><>                         <20>
++ 
++ # psi is psi
++ SAL <20>                          <20>
++ 
++ 
++ # iota dialitika becomes iota 
++ SAL <20>                          <20>
++ 
++ # ypsilon dialitika becomes I
++ SAL <20>                          <20>
++ 
++ # alpha tonos becomes alpha
++ SAL <20>                          <20>
++ 
++ # omikron tonos becomes omikron
++ SAL <20>                          <20>
++ 
++ # iota tonos becomes iota
++ SAL <20>                          <20>
++ 
++ # epsilon tonos becomes epsilon
++ SAL <20>                          <20>
++ 
++ # ypsilon tonos becomes ypsilon
++ SAL <20>                          <20>
++ 
++ # wmega tonos becomes omikron
++ SAL <20>                          <20>
++ 
++ # ita tonos becomes iota
++ SAL <20>                          <20>

runtime/spell/en/en_AU.diff

@@ -2352,7 +2352,7 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_AU.orig.dic	Fri Apr 15 13:20:36 2005
---- en_AU.dic	Tue Aug 16 17:03:44 2005
+--- en_AU.dic	Sat Oct  8 15:54:05 2005
 ***************
 *** 912,914 ****
   Alaska/M
@@ -2419,11 +2419,17 @@
   ea
 --- 12518,12519 ----
 ***************
+*** 12792,12794 ****
+  e.g.
+- e.g..
+  egad
+--- 12793,12794 ----
+***************
 *** 13779,13781 ****
   estuary/MS
 ! et
   ETA
---- 13780,13783 ----
+--- 13779,13782 ----
   estuary/MS
 ! et cetera
 ! et al.
@@ -2433,7 +2439,7 @@
   fjord/SM
 ! f/K
   flab/2zZM
---- 15298,15300 ----
+--- 15297,15299 ----
   fjord/SM
 ! pref
   flab/2zZM
@@ -2442,19 +2448,19 @@
   FYI
 - g/7
   gabardine/SM
---- 16482,16483 ----
+--- 16481,16482 ----
 ***************
 *** 18599,18601 ****
   HDTV
 - h/E
   headache/SM
---- 18600,18601 ----
+--- 18599,18600 ----
 ***************
 *** 19214,19216 ****
   Hobbes
 ! hobbit
   hobble/RGSD
---- 19214,19216 ----
+--- 19213,19215 ----
   Hobbes
 ! hobbit/MS
   hobble/RGSD
@@ -2463,34 +2469,34 @@
   jive/DSMG
 - j/k
   jnr.
---- 21791,21792 ----
+--- 21790,21791 ----
 ***************
 *** 22125,22127 ****
   kcal
 - k/E
   Keane
---- 22124,22125 ----
+--- 22123,22124 ----
 ***************
 *** 22606,22608 ****
   Kyushu/M
 - l/3
   label/AGaSD
---- 22604,22605 ----
+--- 22603,22604 ----
 ***************
 *** 22885,22887 ****
   lass/SM
 - last-ditch
   lasted/e
---- 22882,22883 ----
+--- 22881,22882 ----
 ***************
 *** 22890,22892 ****
   last/kJYDSG
 - last-minute
   lasts/e
---- 22886,22887 ----
+--- 22885,22886 ----
 ***************
 *** 26417,26418 ****
---- 26412,26414 ----
+--- 26411,26413 ----
   Moolawatana
 + Moolenaar/M
   Moomba
@@ -2501,7 +2507,7 @@
   nationhood/M
 ! nation/M
   nationwide
---- 27184,27188 ----
+--- 27183,27187 ----
   nationals/4
 ! national/sQq3SZ
   nationhood/M
@@ -2509,7 +2515,7 @@
   nationwide
 ***************
 *** 27194,27195 ****
---- 27190,27193 ----
+--- 27189,27192 ----
   nativity/MS
 + natively
 + nativeness
@@ -2519,28 +2525,28 @@
   nuzzle/SDG
 - n/xvuNVn
   Nyah
---- 28363,28364 ----
+--- 28362,28363 ----
 ***************
 *** 29464,29466 ****
   oz
 - o/z
   Ozark/MS
---- 29461,29462 ----
+--- 29460,29461 ----
 ***************
 *** 31035,31037 ****
   Pk
 - p/KF
   pl.
---- 31031,31032 ----
+--- 31030,31031 ----
 ***************
 *** 31288,31289 ****
---- 31283,31285 ----
+--- 31282,31284 ----
   pneumonia/MS
 + pneumonic
   PO
 ***************
 *** 31460,31461 ****
---- 31456,31458 ----
+--- 31455,31457 ----
   pompom/MS
 + pompon/M
   pomposity/MS
@@ -2549,25 +2555,25 @@
   pyx/S
 - q
   Qatar
---- 32862,32863 ----
+--- 32861,32862 ----
 ***************
 *** 33378,33380 ****
   razzmatazz
 - r/d
   Rd/M
---- 33374,33375 ----
+--- 33373,33374 ----
 ***************
 *** 34979,34981 ****
   RSPCA
 - rte
   rub-a-dub
---- 34974,34975 ----
+--- 34973,34974 ----
 ***************
 *** 36012,36014 ****
   sec.
 ! s/eca
   secant/MS
---- 36006,36008 ----
+--- 36005,36007 ----
   sec.
 ! outs
   secant/MS
@@ -2576,7 +2582,7 @@
   Szechwan/M
 ! t/7k
   Ta
---- 40236,40238 ----
+--- 40235,40237 ----
   Szechwan/M
 ! tingly
   Ta
@@ -2585,10 +2591,10 @@
   Tyson/M
 - u
   ubiquitousness
---- 42610,42611 ----
+--- 42609,42610 ----
 ***************
 *** 42990,42991 ****
---- 42983,42985 ----
+--- 42982,42984 ----
   unscrupulous
 + searchable
   unsearchable
@@ -2597,13 +2603,13 @@
   Uzi/M
 - v
   vacancy/MS
---- 43246,43247 ----
+--- 43245,43246 ----
 ***************
 *** 43749,43751 ****
   Vilnius/M
 ! vim/M
   vinaigrette/MS
---- 43742,43745 ----
+--- 43741,43744 ----
   Vilnius/M
 ! Vim/M
 ! vim/?
@@ -2613,16 +2619,16 @@
   yippee
 - y/K
   YMCA
---- 45488,45489 ----
+--- 45487,45488 ----
 ***************
 *** 45586,45588 ****
   zap/SGRD
 - z/d
   Zealanders
---- 45579,45580 ----
+--- 45578,45579 ----
 ***************
 *** 45655 ****
---- 45647,45654 ----
+--- 45646,45653 ----
   zymurgy/S
 + nd
 + the the/!

runtime/spell/en/en_CA.diff

@@ -165,7 +165,7 @@
 ! SFX G   0     ing        [^e]
   
 *** en_CA.orig.dic	Sat Apr 16 14:40:06 2005
---- en_CA.dic	Tue Aug 16 17:03:55 2005
+--- en_CA.dic	Sat Oct  8 15:54:16 2005
 ***************
 *** 46,48 ****
   R/G
@@ -437,7 +437,7 @@
   felicitous/IY
 ***************
 *** 62341 ****
---- 62343,62350 ----
+--- 62343,62351 ----
   data/M
 + et al.
 + the the/!
@@ -446,3 +446,4 @@
 + an a/!
 + an an/!
 + PayPal
++ e.g.

runtime/spell/en/en_GB.diff

@@ -2356,7 +2356,7 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_GB.orig.dic	Sun Jul  3 18:05:07 2005
---- en_GB.dic	Tue Aug 16 17:05:18 2005
+--- en_GB.dic	Wed Sep 28 23:07:50 2005
 ***************
 *** 630,632 ****
   Byrne/M
@@ -2519,26 +2519,32 @@
 ! singly
   Sabine/M
 ***************
+*** 41153,41155 ****
+  zymurgy/S
+- <20>
+  Aachen/M
+--- 41136,41137 ----
+***************
 *** 41473,41475 ****
   azalea/MS
 - b/pb
   Baal/M
---- 41456,41457 ----
+--- 41455,41456 ----
 ***************
 *** 43612,43614 ****
   justnesses
 - k/k
   kabob's
---- 43594,43595 ----
+--- 43593,43594 ----
 ***************
 *** 45690,45692 ****
   syringe/SMGD
 - t/7k
   Tabasco/M
---- 45671,45672 ----
+--- 45670,45671 ----
 ***************
 *** 46281 ****
---- 46261,46276 ----
+--- 46260,46275 ----
   Zurich/M
 + conj.
 + pompon

runtime/spell/en/en_NZ.diff

@@ -2353,7 +2353,7 @@
 ! SFX 3 o ist's o
 ! SFX 3 0 ist's [^eoy]
 *** en_NZ.orig.dic	Fri Apr 15 13:20:36 2005
---- en_NZ.dic	Tue Aug 16 17:05:28 2005
+--- en_NZ.dic	Wed Sep 28 23:08:01 2005
 ***************
 *** 4,6 ****
   2ZB
@@ -2603,71 +2603,77 @@
   yacht/M5SmGD
 --- 45886,45887 ----
 ***************
+*** 46152,46154 ****
+  zymurgy/S
+- <20>
+  font/SM
+--- 46131,46132 ----
+***************
 *** 46198,46200 ****
   rata/M
 - kaka/M
   waka/M
---- 46177,46178 ----
+--- 46176,46177 ----
 ***************
 *** 46216,46218 ****
   jandal/MS
 - Swanndri/M
   hoon/MS
---- 46194,46195 ----
+--- 46193,46194 ----
 ***************
 *** 46242,46244 ****
   Invercargill/M
 - Te
   Alexandra/M
---- 46219,46220 ----
+--- 46218,46219 ----
 ***************
 *** 46261,46263 ****
   Kawerau/M
 - Kerikeri/M
   Lyttelton/M
---- 46237,46238 ----
+--- 46236,46237 ----
 ***************
 *** 46491,46493 ****
   Waianakarua
 - Hakatere
   Swin
---- 46466,46467 ----
+--- 46465,46466 ----
 ***************
 *** 46690,46692 ****
   Omarama/M
 - Wairarapa/M
   Kilda/M
---- 46664,46665 ----
+--- 46663,46664 ----
 ***************
 *** 46711,46713 ****
   Wellsford/M
 - Akaroa/M
   Avonhead/M
---- 46684,46685 ----
+--- 46683,46684 ----
 ***************
 *** 46838,46840 ****
   Ballantyne's
 - DB
   Monteith's
---- 46810,46811 ----
+--- 46809,46810 ----
 ***************
 *** 46920,46922 ****
   Egmont/M
 - Waitaki/M
   katipo/M
---- 46891,46892 ----
+--- 46890,46891 ----
 ***************
 *** 46956,46958 ****
   Sunnyside/M
 - Wairau/M
   Waikoropupu
---- 46926,46927 ----
+--- 46925,46926 ----
 ***************
 *** 47141,47142 ****
   Burkina
 ! Faso/M
 \ No newline at end of file
---- 47110,47118 ----
+--- 47109,47117 ----
   Burkina
 ! Faso/M
 ! nd

runtime/spell/en/en_US.diff

@@ -1,5 +1,5 @@
 *** en_US.orig.aff	Fri Apr 15 13:20:36 2005
---- en_US.aff	Sun Jul 31 22:17:40 2005
+--- en_US.aff	Wed Sep 28 22:06:01 2005
 ***************
 *** 3,4 ****
 --- 3,134 ----
@@ -164,6 +164,15 @@
   SFX G   e     ing        e
 ! SFX G   0     ing        [^e]
   
+***************
+*** 99,101 ****
+  
+! REP 88
+  REP a ei
+--- 229,231 ----
+  
+! REP 91
+  REP a ei
 ***************
 *** 137,138 ****
 --- 267,270 ----
@@ -171,8 +180,22 @@
 + REP y ie
 + REP ie y
   REP i ee
+***************
+*** 174,175 ****
+--- 306,308 ----
+  REP ew ue
++ REP uf ough
+  REP uff ough
+***************
+*** 188 ****
+--- 321,325 ----
+  REP shun cion
++ REP an_a a
++ REP an_a an
++ REP a_an a
++ REP a_an an
 *** en_US.orig.dic	Fri Apr 15 13:20:36 2005
---- en_US.dic	Tue Aug 16 17:03:31 2005
+--- en_US.dic	Sat Oct  8 15:54:26 2005
 ***************
 *** 5944,5946 ****
   bk
@@ -542,12 +565,17 @@
   Zubenelgenubi/M
 ***************
 *** 62077 ****
---- 62077,62084 ----
+--- 62077,62089 ----
   zymurgy/S
 + nd
 + the the/!
 + a a/!
++ an an/!
 + a an/!
 + an a/!
-+ an an/!
++ the a/!
++ the an/!
++ a the/!
++ an the/!
 + PayPal
++ e.g.

runtime/spell/es/es_ES.diff

@@ -0,0 +1,81 @@
+*** es_ES.orig.aff	Thu Aug 25 19:19:44 2005
+--- es_ES.aff	Thu Aug 25 19:19:44 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
+*** es_ES.orig.dic	Thu Aug 25 19:19:44 2005
+--- es_ES.dic	Thu Aug 25 20:18:55 2005
+***************
+*** 485,487 ****
+  acerc<72>se
+- acerc<72>se
+  acer<65>a/S
+--- 485,486 ----
+***************
+*** 708,710 ****
+  acr<63>ticamente
+- acr<63>tico
+  acr<63>tico/PS
+--- 707,708 ----
+***************
+*** 948,950 ****
+  ad<61>nde
+- ad<61>nde
+  adondequiera
+--- 946,947 ----
+***************
+*** 1435,1437 ****
+  ah
+- ah
+  ahajar/PSTVWX
+--- 1432,1433 ----
+***************
+*** 3887,3889 ****
+  apostolado
+- apostolado
+  apostolados
+--- 3883,3884 ----
+***************
+*** 12926,12928 ****
+  dame
+- dame
+  d<>melo
+--- 12921,12922 ----
+***************
+*** 15561,15563 ****
+  dime
+- dime
+  d<>melo
+--- 15555,15556 ----
+***************
+*** 25133,25135 ****
+  inadaptado/PS
+- inadecuaci<63>n
+  inadecuaci<63>n/S
+--- 25126,25127 ----
+***************
+*** 28007,28009 ****
+  librancista/S
+- l<>branos
+  l<>branos
+--- 27999,28000 ----