updated for version 7.0gv7.0g

author: Bram Moolenaar <Bram@vim.org> 2006-04-30 18:54:39 +0000
committer: Bram Moolenaar <Bram@vim.org> 2006-04-30 18:54:39 +0000
commit: c9b4b05b3544b434730eb218e848a1a441d5ffb2 (patch)
tree: c1550ddf398d2030ed25ee98e8342fcb41ac1c87 /runtime
parent: aa35dd1667c5903cdcc32ebe10f27bc6683c68a1 (diff)
download: vim-git-c9b4b05b3544b434730eb218e848a1a441d5ffb2.tar.gz
205 files changed, 2025 insertions, 1715 deletions
diff --git a/runtime/autoload/csscomplete.vim b/runtime/autoload/csscomplete.vim
index f82db620f..a6f7041ff 100644
--- a/runtime/autoload/csscomplete.vim
+++ b/runtime/autoload/csscomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	CSS 2.1
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2005 Oct 12
+" Last Change:	2006 Apr 30
 
 function! csscomplete#CompleteCSS(findstart, base)
 if a:findstart
@@ -19,12 +19,12 @@ else
 	" ^ ; : { } /* */
 	" Where ^ is start of line and /* */ are comment borders
 	" Depending on their relative position to cursor we will now what should
-	" be completed. 
+	" 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. 
+	"    as 1.
 	" 5. if @ complete at-rule
 	" 6. if ! complete important
 	if exists("b:compl_context")
@@ -385,7 +385,7 @@ else
 					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(']
 
diff --git a/runtime/autoload/htmlcomplete.vim b/runtime/autoload/htmlcomplete.vim
index 2170e21a9..8adc2bdb3 100644
--- a/runtime/autoload/htmlcomplete.vim
+++ b/runtime/autoload/htmlcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	HTML and XHTML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 24
+" Last Change:	2006 Apr 30
 
 function! htmlcomplete#CompleteTags(findstart, base)
   if a:findstart
@@ -23,7 +23,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 	" Handling of <style> tag {{{
 	let stylestart = searchpair('<style\>', '', '<\/style\>', "bnW")
 	let styleend   = searchpair('<style\>', '', '<\/style\>', "nW")
-	if stylestart != 0 && styleend != 0 
+	if stylestart != 0 && styleend != 0
 		if stylestart <= curline && styleend >= curline
 			let start = col('.') - 1
 			let b:csscompl = 1
@@ -36,7 +36,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 	" Handling of <script> tag {{{
 	let scriptstart = searchpair('<script\>', '', '<\/script\>', "bnW")
 	let scriptend   = searchpair('<script\>', '', '<\/script\>', "nW")
-	if scriptstart != 0 && scriptend != 0 
+	if scriptstart != 0 && scriptend != 0
 		if scriptstart <= curline && scriptend >= curline
 			let start = col('.') - 1
 			let b:jscompl = 1
@@ -109,7 +109,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 			endwhile
 		endif
 		" If b:compl_context begins with <? we are inside of PHP code. It
-		" wasn't closed so PHP completion passed it to HTML 
+		" wasn't closed so PHP completion passed it to HTML
 		if &filetype =~? 'php' && b:compl_context =~ '^<?'
 			let b:phpcompl = 1
 			let start = col('.') - 1
@@ -200,7 +200,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 
 	" If context contains > it means we are already outside of tag and we
 	" should abandon action
-	" If context contains white space it is attribute. 
+	" If context contains white space it is attribute.
 	" It can be also value of attribute.
 	" We have to get first word to offer proper completions
 	if context == ''
@@ -353,7 +353,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 					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 
+					" 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*')
@@ -432,7 +432,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 				return javascriptcomplete#CompleteJS(0, js_context)
 
 			endif
-				
+
 			" }}}
 			let stripbase = matchstr(context, ".*\\(on[a-zA-Z]*\\|style\\|class\\)\\s*=\\s*[\"']\\zs.*")
 			" Now we have context stripped from all chars up to style/class.
@@ -508,7 +508,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 			call htmlcomplete#LoadData()
 		endif
 		" }}}
-		
+
 		if has_key(b:html_omni, tag)
 			let attrs = keys(b:html_omni[tag][1])
 		else
@@ -600,7 +600,7 @@ function! htmlcomplete#CompleteTags(findstart, base)
 		endif
 	endif
 	" }}}
-	
+
 	if exists("uppercase_tag") && uppercase_tag == 1
 		let context = tolower(context)
 	endif
diff --git a/runtime/autoload/javascriptcomplete.vim b/runtime/autoload/javascriptcomplete.vim
index 87e40f36d..2abe41b46 100644
--- a/runtime/autoload/javascriptcomplete.vim
+++ b/runtime/autoload/javascriptcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	Java Script
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Feb 6
+" Last Change:	2006 Apr 30
 
 function! javascriptcomplete#CompleteJS(findstart, base)
   if a:findstart
@@ -48,7 +48,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
 		let doms = ['style.']
 		" Arrays
 		let arrayprop = ['constructor', 'index', 'input', 'length', 'prototype']
-		let arraymeth = ['concat', 'join', 'pop', 'push', 'reverse', 'shift', 
+		let arraymeth = ['concat', 'join', 'pop', 'push', 'reverse', 'shift',
 					\ 'splice', 'sort', 'toSource', 'toString', 'unshift', 'valueOf',
 					\ 'watch', 'unwatch']
 		call map(arraymeth, 'v:val."("')
diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim
index 1953aa2f8..1dbabc3c0 100644
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	PHP
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 15
+" Last Change:	2006 Apr 30
 "
 "   TODO:
 "   - Class aware completion:
@@ -72,7 +72,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 		" Complete class name
 		" Internal solution for finding classes in current file.
 		let file = getline(1, '$')
-		call filter(file, 
+		call filter(file,
 				\ 'v:val =~ "class\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*("')
 		let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
 		let jfile = join(file, ' ')
@@ -153,15 +153,15 @@ function! phpcomplete#CompletePHP(findstart, base)
 				" and ifs. No good solution
 				" Functions declared with public keyword or without any
 				" keyword are public
-				let functions = filter(deepcopy(sccontent), 
+				let functions = filter(deepcopy(sccontent),
 						\ 'v:val =~ "^\\s*\\(public\\s\\*\\)\\?function"')
 				let jfuncs = join(functions, ' ')
 				let sfuncs = split(jfuncs, 'function\s\+')
 				let c_functions = {}
 				for i in sfuncs
-					let f_name = matchstr(i, 
+					let f_name = matchstr(i,
 							\ '^&\?\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\ze')
-					let f_args = matchstr(i, 
+					let f_args = matchstr(i,
 							\ '^&\?[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\s*(\zs.\{-}\ze)\_s*{')
 					if f_name != ''
 						let c_functions[f_name.'('] = f_args
@@ -169,13 +169,13 @@ function! phpcomplete#CompletePHP(findstart, base)
 				endfor
 				" Variables declared with var or with public keyword are
 				" public
-				let variables = filter(deepcopy(sccontent), 
+				let variables = filter(deepcopy(sccontent),
 						\ 'v:val =~ "^\\s*\\(public\\|var\\)\\s\\+\\$"')
 				let jvars = join(variables, ' ')
 				let svars = split(jvars, '\$')
 				let c_variables = {}
 				for i in svars
-					let c_var = matchstr(i, 
+					let c_var = matchstr(i,
 							\ '^\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\ze')
 					if c_var != ''
 						let c_variables[c_var] = ''
@@ -204,13 +204,13 @@ function! phpcomplete#CompletePHP(findstart, base)
 						if all_values[i] != ''
 							let class = i.' class '
 						endif
-						let final_list += 
-								\ [{'word':i, 
-								\   'info':class.all_values[i], 
+						let final_list +=
+								\ [{'word':i,
+								\   'info':class.all_values[i],
 								\   'kind':'v'}]
 					else
-						let final_list += 
-								\ [{'word':substitute(i, '.*::', '', ''), 
+						let final_list +=
+								\ [{'word':substitute(i, '.*::', '', ''),
 								\   'info':i.all_values[i].')',
 								\   'kind':'f'}]
 					endif
@@ -241,7 +241,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 				let int_vars[adddollar.val] = ''
 			endif
 		endfor
-		
+
 		" ctags has good support for PHP, use tags file for external
 		" variables
 		let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
@@ -256,7 +256,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 				let classname = ''
 				if field['text'] =~ item.'\s*=\s*new\s\+'
 					let item = item.'->'
-					let classname = matchstr(field['text'], 
+					let classname = matchstr(field['text'],
 							\ '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
 				endif
 				let ext_vars[adddollar.item] = classname
@@ -268,16 +268,16 @@ function! phpcomplete#CompletePHP(findstart, base)
 
 		" Internal solution for finding functions in current file.
 		let file = getline(1, '$')
-		call filter(file, 
+		call filter(file,
 				\ 'v:val =~ "function\\s\\+&\\?[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*("')
 		let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
 		let jfile = join(file, ' ')
 		let int_values = split(jfile, 'function\s\+')
 		let int_functions = {}
 		for i in int_values
-			let f_name = matchstr(i, 
+			let f_name = matchstr(i,
 					\ '^&\?\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\ze')
-			let f_args = matchstr(i, 
+			let f_args = matchstr(i,
 					\ '^&\?[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\s*(\zs.\{-}\ze)\_s*{')
 			let int_functions[f_name.'('] = f_args.')'
 		endfor
@@ -291,7 +291,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 				" File name
 				let item = matchstr(field['text'], '^[^[:space:]]\+')
 				let fname = matchstr(field['text'], '\t\zs\f\+\ze')
-				let prototype = matchstr(field['text'], 
+				let prototype = matchstr(field['text'],
 						\ 'function\s\+&\?[^[:space:]]\+\s*(\s*\zs.\{-}\ze\s*)\s*{\?')
 				let ext_functions[item.'('] = prototype.') - '.fname
 			endfor
@@ -320,8 +320,8 @@ function! phpcomplete#CompletePHP(findstart, base)
 				endif
 				let final_list += [{'word':i, 'info':class.all_values[i], 'kind':'v'}]
 			else
-				let final_list += 
-						\ [{'word':substitute(i, '.*::', '', ''), 
+				let final_list +=
+						\ [{'word':substitute(i, '.*::', '', ''),
 						\   'info':i.all_values[i],
 						\   'kind':'f'}]
 			endif
@@ -361,10 +361,10 @@ function! phpcomplete#CompletePHP(findstart, base)
 		let int_vars = {}
 		for i in int_vals
 			if i =~ '^\$[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\s*=\s*new'
-				let val = matchstr(i, 
+				let val = matchstr(i,
 						\ '^\$[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*').'->'
 			else
-				let val = matchstr(i, 
+				let val = matchstr(i,
 						\ '^\$[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*')
 			endif
 			if val != ''
@@ -373,7 +373,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 		endfor
 
 		call extend(int_vars,g:php_builtin_vars)
-		
+
 		" ctags has support for PHP, use tags file for external variables
 		let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
 		let ext_vars = {}
@@ -387,7 +387,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 				" Add -> if it is possible object declaration
 				if field['text'] =~ item.'\s*=\s*new\s\+'
 					let item = item.'->'
-					let m_menu = matchstr(field['text'], 
+					let m_menu = matchstr(field['text'],
 							\ '=\s*new\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
 				endif
 				let ext_vars[item] = m_menu
@@ -421,7 +421,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 		return int_dict
 
 	else
-		" Complete everything else - 
+		" Complete everything else -
 		"  + functions,  DONE
 		"  + keywords of language DONE
 		"  + defines (constant definitions), DONE
@@ -431,16 +431,16 @@ function! phpcomplete#CompletePHP(findstart, base)
 
 		" Internal solution for finding functions in current file.
 		let file = getline(1, '$')
-		call filter(file, 
+		call filter(file,
 				\ 'v:val =~ "function\\s\\+&\\?[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*("')
 		let fnames = join(map(tagfiles(), 'escape(v:val, " \\")'))
 		let jfile = join(file, ' ')
 		let int_values = split(jfile, 'function\s\+')
 		let int_functions = {}
 		for i in int_values
-			let f_name = matchstr(i, 
+			let f_name = matchstr(i,
 					\ '^&\?\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\ze')
-			let f_args = matchstr(i, 
+			let f_args = matchstr(i,
 					\ '^&\?[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\s*(\s*\zs.\{-}\ze\s*)\_s*{')
 			let int_functions[f_name.'('] = f_args.')'
 		endfor
@@ -454,7 +454,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 				" File name
 				let item = matchstr(field['text'], '^[^[:space:]]\+')
 				let fname = matchstr(field['text'], '\t\zs\f\+\ze')
-				let prototype = matchstr(field['text'], 
+				let prototype = matchstr(field['text'],
 						\ 'function\s\+&\?[^[:space:]]\+\s*(\s*\zs.\{-}\ze\s*)\s*{\?')
 				let ext_functions[item.'('] = prototype.') - '.fname
 			endfor
@@ -472,7 +472,7 @@ function! phpcomplete#CompletePHP(findstart, base)
 		let int_constants = {}
 		for i in int_values
 			let c_name = matchstr(i, '\(["'']\)\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\ze\1')
-			" let c_value = matchstr(i, 
+			" let c_value = matchstr(i,
 			" \ '\(["'']\)[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\1\s*,\s*\zs.\{-}\ze\s*)')
 			if c_name != ''
 				let int_constants[c_name] = '' " c_value
@@ -516,8 +516,8 @@ function! phpcomplete#CompletePHP(findstart, base)
 		let final_list = []
 		for i in int_list
 			if has_key(int_functions, i)
-				let final_list += 
-						\ [{'word':i, 
+				let final_list +=
+						\ [{'word':i,
 						\   'info':i.int_functions[i],
 						\   'kind':'f'}]
 			elseif has_key(int_constants, i)
@@ -599,17 +599,17 @@ endfunction
 
 function! phpcomplete#GetClassContents(file, name) " {{{
 	let cfile = join(a:file, "\n")
-	" We use new buffer and (later) normal! because 
+	" We use new buffer and (later) normal! because
 	" this is the most efficient way. The other way
 	" is to go through the looong string looking for
-	" matching {} 
+	" matching {}
 	below 1new
 	0put =cfile
 	call search('class\s\+'.a:name)
 	let cfline = line('.')
 	" Catch extends
 	if getline('.') =~ 'extends'
-		let extends_class = matchstr(getline('.'), 
+		let extends_class = matchstr(getline('.'),
 				\ 'class\s\+'.a:name.'\s\+extends\s\+\zs[a-zA-Z_0-9\x7f-\xff]\+\ze')
 	else
 		let extends_class = ''
@@ -965,8 +965,8 @@ let g:php_keywords = {
 " PHP builtin functions {{{
 " To create from scratch list of functions:
 " 1. Download multi html file PHP documentation
-" 2. run for i in `ls | grep "^function\."`; do grep -A4 Description $i >> funcs; done 
-" 3. Open funcs in Vim and 
+" 2. run for i in `ls | grep "^function\."`; do grep -A4 Description $i >> funcs; done
+" 3. Open funcs in Vim and
 "    a) g/Description/normal! 5J
 "    b) remove all html tags (it will require few s/// and g//)
 "    c) :%s/^\([^[:space:]]\+\) \([^[:space:]]\+\) ( \(.*\))/\\ '\2(': '\3| \1',
diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim
index 0729b0934..78d30582a 100644
--- a/runtime/autoload/xmlcomplete.vim
+++ b/runtime/autoload/xmlcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Apr 19
+" Last Change:	2006 Apr 30
 
 " This function will create Dictionary with users namespace strings and values
 " canonical (system) names of data files.  Names should be lowercase,
@@ -22,7 +22,7 @@ function! xmlcomplete#CreateConnection(canonical, ...) " {{{
 	endif
 
 	" Source data file. Due to suspected errors in autoload do it with
-	" :runtime. 
+	" :runtime.
 	" TODO: make it properly (using autoload, that is) later
 	exe "runtime autoload/xml/".a:canonical.".vim"
 
@@ -166,7 +166,7 @@ function! xmlcomplete#CompleteTags(findstart, base)
 	endif
 
     " find tags matching with "a:base"
-	" If a:base contains white space it is attribute. 
+	" If a:base contains white space it is attribute.
 	" It could be also value of attribute...
 	" We have to get first word to offer
 	" proper completions
diff --git a/runtime/colors/darkblue.vim b/runtime/colors/darkblue.vim
index 9812e9890..c1800eaca 100644
--- a/runtime/colors/darkblue.vim
+++ b/runtime/colors/darkblue.vim
@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-" Last Change:	2006 Apr 21
+" Last Change:	2006 Apr 30
 
 " darkblue -- for those who prefer dark background
 " [note: looks bit uglier with come terminal palettes,
@@ -45,8 +45,8 @@ hi DiffChange	guibg=darkmagenta ctermbg=magenta cterm=none
 hi DiffDelete	ctermfg=blue ctermbg=cyan gui=bold guifg=Blue guibg=DarkCyan
 hi DiffText	cterm=bold ctermbg=red gui=bold guibg=Red
 
-hi Cursor   	guifg=black guibg=yellow ctermfg=black ctermbg=yellow
-hi lCursor   	guifg=black guibg=white ctermfg=black ctermbg=white
+hi Cursor	guifg=black guibg=yellow ctermfg=black ctermbg=yellow
+hi lCursor	guifg=black guibg=white ctermfg=black ctermbg=white
 
 
 hi Comment	guifg=#80a0ff ctermfg=darkred
diff --git a/runtime/colors/delek.vim b/runtime/colors/delek.vim
index 6812b9093..2cb90a5a8 100644
--- a/runtime/colors/delek.vim
+++ b/runtime/colors/delek.vim
@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	David Schweikert <dws@ee.ethz.ch>
-" Last Change:	2006 Apr 14
+" Last Change:	2006 Apr 30
 
 hi clear
 
@@ -14,30 +14,30 @@ hi lCursor    guifg=NONE   guibg=Cyan
 " Note: we never set 'term' because the defaults for B&W terminals are OK
 hi DiffAdd    ctermbg=LightBlue    guibg=LightBlue
 hi DiffChange ctermbg=LightMagenta guibg=LightMagenta
-hi DiffDelete ctermfg=Blue         ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
-hi DiffText   ctermbg=Red          cterm=bold gui=bold guibg=Red
-hi Directory  ctermfg=DarkBlue     guifg=Blue
-hi ErrorMsg   ctermfg=White        ctermbg=DarkRed  guibg=Red       guifg=White
-hi FoldColumn ctermfg=DarkBlue     ctermbg=Grey     guibg=Grey      guifg=DarkBlue
-hi Folded     ctermbg=Grey         ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
-hi IncSearch  cterm=reverse        gui=reverse
-hi LineNr     ctermfg=Brown        guifg=Brown
-hi ModeMsg    cterm=bold           gui=bold
+hi DiffDelete ctermfg=Blue	   ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan
+hi DiffText   ctermbg=Red	   cterm=bold gui=bold guibg=Red
+hi Directory  ctermfg=DarkBlue	   guifg=Blue
+hi ErrorMsg   ctermfg=White	   ctermbg=DarkRed  guibg=Red	    guifg=White
+hi FoldColumn ctermfg=DarkBlue	   ctermbg=Grey     guibg=Grey	    guifg=DarkBlue
+hi Folded     ctermbg=Grey	   ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue
+hi IncSearch  cterm=reverse	   gui=reverse
+hi LineNr     ctermfg=Brown	   guifg=Brown
+hi ModeMsg    cterm=bold	   gui=bold
 hi MoreMsg    ctermfg=DarkGreen    gui=bold guifg=SeaGreen
-hi NonText    ctermfg=Blue         gui=bold guifg=gray guibg=white
+hi NonText    ctermfg=Blue	   gui=bold guifg=gray guibg=white
 hi Pmenu      guibg=LightBlue
-hi PmenuSel   ctermfg=White        ctermbg=DarkBlue  guifg=White  guibg=DarkBlue
+hi PmenuSel   ctermfg=White	   ctermbg=DarkBlue  guifg=White  guibg=DarkBlue
 hi Question   ctermfg=DarkGreen    gui=bold guifg=SeaGreen
-hi Search     ctermfg=NONE         ctermbg=Yellow guibg=Yellow guifg=NONE
-hi SpecialKey ctermfg=DarkBlue     guifg=Blue
-hi StatusLine cterm=bold           ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
-hi StatusLineNC	cterm=bold         ctermbg=blue ctermfg=black  guibg=gold guifg=blue
+hi Search     ctermfg=NONE	   ctermbg=Yellow guibg=Yellow guifg=NONE
+hi SpecialKey ctermfg=DarkBlue	   guifg=Blue
+hi StatusLine cterm=bold	   ctermbg=blue ctermfg=yellow guibg=gold guifg=blue
+hi StatusLineNC	cterm=bold	   ctermbg=blue ctermfg=black  guibg=gold guifg=blue
 hi Title      ctermfg=DarkMagenta  gui=bold guifg=Magenta
-hi VertSplit  cterm=reverse        gui=reverse
-hi Visual     ctermbg=NONE         cterm=reverse gui=reverse guifg=Grey guibg=fg
+hi VertSplit  cterm=reverse	   gui=reverse
+hi Visual     ctermbg=NONE	   cterm=reverse gui=reverse guifg=Grey guibg=fg
 hi VisualNOS  cterm=underline,bold gui=underline,bold
-hi WarningMsg ctermfg=DarkRed      guifg=Red
-hi WildMenu   ctermfg=Black        ctermbg=Yellow    guibg=Yellow guifg=Black
+hi WarningMsg ctermfg=DarkRed	   guifg=Red
+hi WildMenu   ctermfg=Black	   ctermbg=Yellow    guibg=Yellow guifg=Black
 
 " syntax highlighting
 hi Comment    cterm=NONE ctermfg=DarkRed     gui=NONE guifg=red2
diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt
index 859125306..f13a6638b 100644
--- a/runtime/doc/arabic.txt
+++ b/runtime/doc/arabic.txt
@@ -1,4 +1,4 @@
-*arabic.txt*	For Vim version 7.0f.  Last change: 2005 Mar 29
+*arabic.txt*	For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Nadim Shaikli
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index cf8a457f8..b79a5efe7 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0f.  Last change: 2006 Apr 25
+*autocmd.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -162,7 +162,7 @@ was last defined. Example: >
 
     :verbose autocmd BufEnter
     FileExplorer  BufEnter
-	*         call s:LocalBrowse(expand("<amatch>"))
+	*	  call s:LocalBrowse(expand("<amatch>"))
 	    Last set from /usr/share/vim/vim-7.0/plugin/NetrwPlugin.vim
 <
 See |:verbose-cmd| for more information.
@@ -884,8 +884,8 @@ buffer actually still exists (it becomes unlisted), thus the autocommands are
 still executed.
 
 ==============================================================================
-7. Buffer-local autocommands  	*autocmd-buflocal* *autocmd-buffer-local*
-                                    	*<buffer=N>* *<buffer=abuf>* *E680*
+7. Buffer-local autocommands	*autocmd-buflocal* *autocmd-buffer-local*
+					*<buffer=N>* *<buffer=abuf>* *E680*
 
 Buffer-local autocommands are attached to a specific buffer.  They are useful
 if the buffer does not have a name and when the name does not match a specific
@@ -904,14 +904,14 @@ Examples: >
 
 All the commands for autocommands also work with buffer-local autocommands,
 simply use the special string instead of the pattern.  Examples: >
-    :au! * <buffer>     	     " remove buffer-local autocommands for
-                                     " current buffer
-    :au! * <buffer=33>  	     " remove buffer-local autocommands for
-    				     " buffer #33
+    :au! * <buffer>		     " remove buffer-local autocommands for
+				     " current buffer
+    :au! * <buffer=33>		     " remove buffer-local autocommands for
+				     " buffer #33
     :dobuf :au! CursorHold <buffer>  " remove autocmd for given event for all
-    				     " buffers
-    :au * <buffer>       	     " list buffer-local autocommands for
-    				     " current buffer
+				     " buffers
+    :au * <buffer>		     " list buffer-local autocommands for
+				     " current buffer
 
 Note that when an autocommand is defined for the current buffer, it is stored
 with the buffer number.  Thus it uses the form "<buffer=12>", where 12 is the
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 21b98d6dc..4cc671116 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0f.  Last change: 2006 Apr 25
+*change.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -470,7 +470,7 @@ For example: >
 ==============================================================================
 4. Complex changes					*complex-change*
 
-4.1 Filter commands 					*filter*
+4.1 Filter commands					*filter*
 
 A filter is a program that accepts text at standard input, changes it in some
 way, and sends it to standard output.  You can use the commands below to send
@@ -900,7 +900,7 @@ inside of strings can change!  Also see 'softtabstop' option. >
 							*<MiddleMouse>*
 ["x]<MiddleMouse>	Put the text from a register before the cursor [count]
 			times.  Uses the "* register, unless another is
-			specified.  
+			specified.
 			Leaves the cursor at the end of the new text.
 			Using the mouse only works when 'mouse' contains 'n'
 			or 'a'.
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 4b15f3387..44f6857cd 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0f.  Last change: 2006 Mar 16
+*cmdline.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -663,7 +663,7 @@ closed fold.  See |fold-behavior|.
 Reverse Range						*E493*
 
 A range should have the lower line number first.  If this is not the case, Vim
-will ask you if it should swap the line numbers. 
+will ask you if it should swap the line numbers.
 	Backwards range given, OK to swap ~
 This is not done within the global command ":g".
 
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index 13220ecb0..815c6dcc8 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.0f.  Last change: 2006 Apr 24
+*debug.txt*     For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,7 +10,7 @@ This is for debugging Vim itself, when it doesn't work properly.
 For debugging Vim scripts, functions, etc. see |debug-scripts|
 
 1. Location of a crash, using gcc and gdb	|debug-gcc|
-2. Windows Bug Reporting               		|debug-win32|
+2. Windows Bug Reporting			|debug-win32|
 
 ==============================================================================
 
@@ -38,7 +38,7 @@ This also applies when using the MingW tools.
 
 ==============================================================================
 
-2. Windows Bug Reporting                       		*debug-win32*
+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.
diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt
index e94096c54..92453b6f8 100644
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0f.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index d769a8808..5104859c6 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0f.  Last change: 2006 Mar 09
+*develop.txt*   For Vim version 7.0g.  Last change: 2006 Mar 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 479660c36..b49046006 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.0f.  Last change: 2006 Apr 14
+*diff.txt*      For Vim version 7.0g.  Last change: 2006 Apr 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index 594d189f4..981bc0d5b 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0f.  Last change: 2006 Apr 25
+*digraph.txt*   For Vim version 7.0g.  Last change: 2006 Apr 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 02f646c0b..930ae6ddb 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0f.  Last change: 2006 Apr 29
+*editing.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -433,9 +433,9 @@ Where {optname} is one of:	    *++ff* *++enc* *++bin* *++nobin* *++edit*
     enc    or  encoding	    overrides 'fileencoding'
     bin    or  binary	    sets 'binary'
     nobin  or  nobinary	    resets 'binary'
-    bad                     specifies behavior for bad characters
+    bad			    specifies behavior for bad characters
     edit		    for |:read| only: keep option values as if editing
-    			    a file
+			    a file
 
 {value} cannot contain white space.  It can be any valid value for these
 options.  Examples: >
@@ -453,7 +453,7 @@ The argument of "++bad=" specifies what happens with characters that can't be
 converted and illegal bytes.  It can be one of three things:
     ++bad=X      A single-byte character that replaces each bad character.
     ++bad=keep   Keep bad characters without conversion.  Note that this may
-    		 result in illegal bytes in your text!
+		 result in illegal bytes in your text!
     ++bad=drop   Remove the bad characters.
 
 The default is like "++bad=?": Replace each bad character with a question
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4e7d5f344..8c3612f4b 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0f.  Last change: 2006 Apr 29
+*eval.txt*      For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1681,7 +1681,7 @@ remote_read( {serverid})	String	read reply string
 remote_send( {server}, {string} [, {idvar}])
 				String	send key sequence
 remove( {list}, {idx} [, {end}])  any	remove items {idx}-{end} from {list}
-remove( {dict}, {key})  	any	remove entry {key} from {dict}
+remove( {dict}, {key})		any	remove entry {key} from {dict}
 rename( {from}, {to})		Number	rename (move) file from {from} to {to}
 repeat( {expr}, {count})	String	repeat {expr} {count} times
 resolve( {filename})		String	get filename a shortcut points to
@@ -2323,7 +2323,7 @@ exists({expr})	The result is a Number, which is non-zero if {expr} is
 			#group#event	autocommand defined for this group and
 					event.
 			#group#event#pattern
-					autocommand defined for this group, 
+					autocommand defined for this group,
 					event and pattern.
 			##event		autocommand for this event is
 					supported.
@@ -2450,7 +2450,7 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		used to decide what to do:
 		{expr3} = "keep": keep the value of {expr1}
 		{expr3} = "force": use the value of {expr2}
-		{expr3} = "error": give an error message 		*E737*
+		{expr3} = "error": give an error message		*E737*
 		When {expr3} is omitted then "force" is assumed.
 
 		{expr1} is changed when {expr2} is not empty.  If necessary
@@ -3538,7 +3538,7 @@ match({expr}, {pat}[, {start}[, {count}]])			*match()*
 
 
 matcharg({nr})							*matcharg()*
-		Selects the {nr} match item, as set with a |:match|, 
+		Selects the {nr} match item, as set with a |:match|,
 		|:2match| or |:3match| command.
 		Return a |List| with two elements:
 			The name of the highlight group used
@@ -3696,7 +3696,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 			"  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
 
 		Often used items are:
-		  %s   	string
+		  %s	string
 		  %6s	string right-aligned in 6 bytes
 		  %.9s  string truncated to 9 bytes
 		  %c    single byte
@@ -3717,7 +3717,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 
 			%  [flags]  [field-width]  [.precision]  type
 
-	        flags
+		flags
 			Zero or more of the following flags:
 
 		    #	      The value should be converted to an "alternate
@@ -3779,7 +3779,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 <		This limits the length of the text used from "line" to
 		"width" bytes.
 
-	        The conversion specifiers and their meanings are:
+		The conversion specifiers and their meanings are:
 
 		doxX    The Number argument is converted to signed decimal
 			(d), unsigned octal (o), or unsigned hexadecimal (x
@@ -3833,10 +3833,10 @@ range({expr} [, {max} [, {stride}]])				*range()*
 		empty list.  When the maximum is more than one before the
 		start this is an error.
 		Examples: >
-			range(4) 		" [0, 1, 2, 3]
+			range(4)		" [0, 1, 2, 3]
 			range(2, 4)		" [2, 3, 4]
 			range(2, 9, 3)		" [2, 5, 8]
-			range(2, -2, -1) 	" [2, 1, 0, -1, -2]
+			range(2, -2, -1)	" [2, 1, 0, -1, -2]
 			range(0)		" []
 			range(2, 0)		" error!
 <
@@ -4100,7 +4100,7 @@ search({pattern} [, {flags} [, {stopline}]])			*search()*
 
 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.
@@ -4306,7 +4306,7 @@ setpos({expr}, {list})
 		    [bufnum, lnum, col, off]
 
 		"bufnum" is the buffer number.  Zero can be used for the
-		current buffer.  Setting the cursor is only possible for 
+		current buffer.  Setting the cursor is only possible for
 		the current buffer.  To set a mark in another buffer you can
 		use the |bufnr()| function to turn a file name into a buffer
 		number.
@@ -4334,7 +4334,7 @@ setqflist({list} [, {action}])				*setqflist()*
 		    pattern	search pattern used to locate the error
 		    col		column number
 		    vcol	when non-zero: "col" is visual column
-		    		when zero: "col" is byte index
+				when zero: "col" is byte index
 		    nr		error number
 		    text	description of the error
 		    type	single-character error type, 'E', 'W', etc.
@@ -4478,7 +4478,7 @@ spellbadword([{sentence}])
 		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
+			"bad"		spelling mistake
 			"rare"		rare word
 			"local"		word only valid in another region
 			"caps"		word should start with Capital
@@ -4545,7 +4545,7 @@ str2nr( {expr} [, {base}])				*str2nr()*
 		When {base} is 16 a leading "0x" or "0X" is ignored.  With a
 		different base the result will be zero.
 		Text after the number is silently ignored.
-	
+
 
 strftime({format} [, {time}])				*strftime()*
 		The result is a String, which is a formatted date and time, as
@@ -4581,7 +4581,7 @@ stridx({haystack}, {needle} [, {start}])		*stridx()*
 		  :echo stridx("An Example", "Example")	     3
 		  :echo stridx("Starting point", "Start")    0
 		  :echo stridx("Starting point", "start")   -1
-<	  					*strstr()* *strchr()*
+<						*strstr()* *strchr()*
 		stridx() works similar to the C function strstr().  When used
 		with a single character it works similar to strchr().
 
@@ -4638,7 +4638,7 @@ strridx({haystack}, {needle} [, {start}])			*strridx()*
 		If the {needle} is empty the length of {haystack} is returned.
 		See also |stridx()|.  Examples: >
 		  :echo strridx("an angry armadillo", "an")	     3
-<		  					*strrchr()*
+<							*strrchr()*
 		When used with a single character it works similar to the C
 		function strrchr().
 
@@ -4937,10 +4937,11 @@ virtcol({expr})						*virtcol()*
 
 visualmode([expr])						*visualmode()*
 		The result is a String, which describes the last Visual mode
-		used.  Initially it returns an empty string, but once Visual
-		mode has been used, it returns "v", "V", or "<CTRL-V>" (a
-		single CTRL-V character) for character-wise, line-wise, or
-		block-wise Visual mode respectively.
+		used in the current buffer.  Initially it returns an empty
+		string, but once Visual mode has been used, it returns "v",
+		"V", or "<CTRL-V>" (a single CTRL-V character) for
+		character-wise, line-wise, or block-wise Visual mode
+		respectively.
 		Example: >
 			:exe "normal " . visualmode()
 <		This enters the same Visual mode as before.  It is also useful
@@ -5301,7 +5302,7 @@ last defined. Example: >
 <
 See |:verbose-cmd| for more information.
 
- 							*E124* *E125*
+							*E124* *E125*
 :fu[nction][!] {name}([arguments]) [range] [abort] [dict]
 			Define a new function by the name {name}.  The name
 			must be made of alphanumeric characters and '_', and
@@ -5754,7 +5755,7 @@ This would call the function "my_func_whizz(parameter)".
 			variable is indicated before the value:
 			    <nothing>	String
 				#	Number
-			    	*	Funcref
+				*	Funcref
 
 
 :unl[et][!] {name} ...					*:unlet* *:unl* *E108*
diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt
index 404259c8b..a5c44e244 100644
--- a/runtime/doc/farsi.txt
+++ b/runtime/doc/farsi.txt
@@ -1,4 +1,4 @@
-*farsi.txt*     For Vim version 7.0f.  Last change: 2005 Mar 29
+*farsi.txt*     For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Mortaza Ghassab Shiran
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 3483281a0..fe286ba1f 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.0f.  Last change: 2006 Apr 28
+*filetype.txt*  For Vim version 7.0g.  Last change: 2006 Apr 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 0684d15c5..5123d1da7 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0f.  Last change: 2006 Mar 29
+*fold.txt*      For Vim version 7.0g.  Last change: 2006 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/getscript.txt b/runtime/doc/getscript.txt
index 464ba95bf..c64e93e1d 100644
--- a/runtime/doc/getscript.txt
+++ b/runtime/doc/getscript.txt
@@ -1,4 +1,4 @@
-*getscript.txt*	For Vim version 7.0f.  Last change: 2006 Mar 24
+*getscript.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 		Get the Latest VimScripts
 
@@ -6,10 +6,10 @@ Authors:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamilyA.Mbiz>
 	  (remove NOSPAM from the email address)
 						*GetLatestVimScripts-copyright*
 Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
-           The VIM LICENSE applies to GetLatestVimScripts.vim and
-           GetLatestVimScripts.txt (see |copyright|) except use
-           "GetLatestVimScripts" instead of "Vim".
-           No warranty, express or implied.  Use At-Your-Own-Risk.
+	   The VIM LICENSE applies to GetLatestVimScripts.vim and
+	   GetLatestVimScripts.txt (see |copyright|) except use
+	   "GetLatestVimScripts" instead of "Vim".
+	   No warranty, express or implied.  Use At-Your-Own-Risk.
 
 
 ==============================================================================
@@ -99,12 +99,12 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 	plugin, GetLatestVimScripts will find it and use it to build user's
 	GetLatestVimScripts.dat files:
 >
-	                             src_id
-		                            v
+				     src_id
+					    v
 		" GetLatestVimScripts: ### ### yourscriptname
-		                        ^
-		                    scriptid
-<   
+					^
+				    scriptid
+<
 	As an author, you should include such a line in to refer to your own
 	script plus any additional lines describing any plugin dependencies it
 	may have.  Same format, of course!
@@ -146,12 +146,12 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 	to do to install them (please refer to the script's "install"
 	directions).  On the other hand, most scripts will be
 	auto-installable.
-	
+
 	To let GetLatestVimScripts do an autoinstall, the data file's comment
 	field should begin with (surrounding blanks are ignored):
-	
+
 		:AutoInstall:
-	
+
 	Both colons are needed, and it should begin the comment
 	(yourscriptname) field.
 
@@ -160,16 +160,16 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 >
 		let g:GetLatestVimScripts_allowautoinstall= 0
 <
-	
+
 	With :AutoInstall: enabled, as it is by default, files which end with
-	
+
 	  ---.tar.bz2  : decompressed and untarred in [.vim|vimfiles] directory
 	  ---.tar.gz   : decompressed and untarred in [.vim|vimfiles] directory
 	  ---.vim.bz2  : decompressed and moved to the .vim/plugin directory
 	  ---.vim.gz   : decompressed and moved to the .vim/plugin directory
 	  ---.zip      : unzipped in [.vim|vimfiles] directory
 	  ---.vim      : moved to [.vim|vimfiles]/plugin directory
-	
+
 	and which merely need to have their components placed by the
 	untar/gunzip or move-to-plugin-directory process should be
 	auto-installable.
@@ -186,7 +186,7 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 	Currently, vim's after/syntax only supports by-filetype scripts (in
 	blockhl.vim's case, that's after/syntax/c.vim).  Hence, auto-install
 	would possibly overwrite the current user's after/syntax/c.vim file.
-	
+
 	In my own case, I use <aftersyntax.vim> (renamed to
 	after/syntax/c.vim) to allow a after/syntax/c/ directory:
 >
@@ -221,7 +221,7 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 		Move the file from GetLatest/ to the following directory
 			Unix   : $HOME/.vim
 			Windows: $HOME\vimfiles
-	
+
 		if the downloaded file ends with ".bz2"
 			bunzip2 it
 		else if the downloaded file ends with ".gz"
@@ -238,66 +238,66 @@ Copyright: (c) 2004-2005 by Charles E. Campbell, Jr.
 7. GetLatestVimScripts History       *getlatestvimscripts-history* *glvs-hist*
 
 	v20 Dec 23, 2005 : * Eric Haarbauer found&fixed a bug with unzip use;
-	                     unzip needs the -o flag to overwrite.
+			     unzip needs the -o flag to overwrite.
 	v19 Nov 28, 2005 : * v18's GetLatestVimScript line accessed the wrong
-	                     script! Fixed.
+			     script! Fixed.
 	v18 Mar 21, 2005 : * bugfix to automatic database construction
-	                   * bugfix - nowrapscan caused an error
-	                     (tnx to David Green for the fix)
+			   * bugfix - nowrapscan caused an error
+			     (tnx to David Green for the fix)
 	    Apr 01, 2005   * if shell is bash, "mv" instead of "ren" used in
-	                     :AutoInstall:s, even though its o/s is windows
+			     :AutoInstall:s, even though its o/s is windows
 	    Apr 01, 2005   * when downloading errors occurred, GLVS was
-	                     terminating early.  It now just goes on to trying
-	                     the next script (after trying three times to
-	                     download a script description page)
+			     terminating early.  It now just goes on to trying
+			     the next script (after trying three times to
+			     download a script description page)
 	    Apr 20, 2005   * bugfix - when a failure to download occurred,
-	                     GetLatestVimScripts would stop early and claim that
-	                     everything was current.  Fixed.
+			     GetLatestVimScripts would stop early and claim that
+			     everything was current.  Fixed.
 	v17 Aug 25, 2004 : * g:GetLatestVimScripts_allowautoinstall, which
-	                     defaults to 1, can be used to prevent all
-	                     :AutoInstall:
+			     defaults to 1, can be used to prevent all
+			     :AutoInstall:
 	v16 Aug 25, 2004 : * made execution of bunzip2/gunzip/tar/zip silent
-	                   * fixed bug with :AutoInstall: use of helptags
+			   * fixed bug with :AutoInstall: use of helptags
 	v15 Aug 24, 2004 : * bugfix: the "0 0 comment" download prevention wasn't
-	                     always preventing downloads (just usually).  Fixed.
+			     always preventing downloads (just usually).  Fixed.
 	v14 Aug 24, 2004 : * bugfix -- helptags was using dotvim, rather than
-	                     s:dotvim.  Fixed.
+			     s:dotvim.	Fixed.
 	v13 Aug 23, 2004 : * will skip downloading a file if its scriptid or srcid
-	                     is zero.  Useful for script authors; that way their
-	                     own GetLatestVimScripts activity won't overwrite
-	                     their scripts.
+			     is zero.  Useful for script authors; that way their
+			     own GetLatestVimScripts activity won't overwrite
+			     their scripts.
 	v12 Aug 23, 2004 : * bugfix - a "return" got left in the distribution that
-	                     was intended only for testing.  Removed, now works.
-	                   * :AutoInstall: implemented
+			     was intended only for testing.  Removed, now works.
+			   * :AutoInstall: implemented
 	v11 Aug 20, 2004 : * GetLatestVimScripts is now a plugin:
-	                   * :GetLatestVimScripts command
-	                   * (runtimepath)/GetLatest/GetLatestVimScripts.dat
-	                     now holds scripts that need updating
+			   * :GetLatestVimScripts command
+			   * (runtimepath)/GetLatest/GetLatestVimScripts.dat
+			     now holds scripts that need updating
 	v10 Apr 19, 2004 : * moved history from script to doc
 	v9  Jan 23, 2004 :   windows (win32/win16/win95) will use
-	                     double quotes ("") whereas other systems will use
-	                     single quotes ('') around the urls in calls via wget
+			     double quotes ("") whereas other systems will use
+			     single quotes ('') around the urls in calls via wget
 	v8  Dec 01, 2003 :   makes three tries at downloading
 	v7  Sep 02, 2003 :   added error messages if "Click on..." or "src_id="
-	                     not found in downloaded webpage
-	                     Uses t_ti, t_te, and rs to make progress visible
+			     not found in downloaded webpage
+			     Uses t_ti, t_te, and rs to make progress visible
 	v6  Aug 06, 2003 :   final status messages now display summary of work
-	                     ( "Downloaded someqty scripts" or
-	                       "Everything was current")
-	                     Now GetLatestVimScripts is careful about downloading
-	                     GetLatestVimScripts.vim itself!
-	                     (goes to <NEW_GetLatestVimScripts.vim>)
+			     ( "Downloaded someqty scripts" or
+			       "Everything was current")
+			     Now GetLatestVimScripts is careful about downloading
+			     GetLatestVimScripts.vim itself!
+			     (goes to <NEW_GetLatestVimScripts.vim>)
 	v5  Aug 04, 2003 :   missing an endif near bottom
 	v4  Jun 17, 2003 :   redraw! just before each "considering" message
 	v3  May 27, 2003 :   Protects downloaded files from errant shell
-	                     expansions with single quotes: '...'
+			     expansions with single quotes: '...'
 	v2  May 14, 2003 :   extracts name of item to be obtained from the
-	                     script file.  Uses it instead of comment field
-	                     for output filename; comment is used in the
-	                     "considering..." line and is now just a comment!
-	                   * Fixed a bug: a string-of-numbers is not the
-	                     same as a number, so I added zero to them
-	                     and they became numbers.  Fixes comparison.
+			     script file.  Uses it instead of comment field
+			     for output filename; comment is used in the
+			     "considering..." line and is now just a comment!
+			   * Fixed a bug: a string-of-numbers is not the
+			     same as a number, so I added zero to them
+			     and they became numbers.  Fixes comparison.
 
 ==============================================================================
 vim:tw=78:ts=8:ft=help
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 1e7b7ce81..fe09d8038 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0f.  Last change: 2006 Apr 02
+*gui.txt*       For Vim version 7.0g.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt
index 2eb99333f..fb7853400 100644
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
index 00875caa9..16af8fb0f 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*gui_w32.txt*   For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt
index 3c05a6814..b4c3bd202 100644
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.0f.  Last change: 2005 Dec 06
+*gui_x11.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -12,7 +12,7 @@ Vim's Graphical User Interface				*gui-x11* *GUI-X11*
 4. Various			|gui-x11-various|
 5. GTK version			|gui-gtk|
 6. GNOME version		|gui-gnome|
-7. KDE version                  |gui-kde|
+7. KDE version			|gui-kde|
 8. Compiling			|gui-x11-compiling|
 9. X11 selection mechanism	|x11-selection|
 
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
index 7dc05ef54..904f65063 100644
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0f.  Last change: 2006 Apr 02
+*hangulin.txt*  For Vim version 7.0g.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 42ed0886a..f495ae2b6 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -1,4 +1,4 @@
-*hebrew.txt*    For Vim version 7.0f.  Last change: 2003 May 11
+*hebrew.txt*    For Vim version 7.0g.  Last change: 2003 May 11
 
 
 	   VIM REFERENCE MANUAL    by Ron Aaron (and Avner Lottem)
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 4226704de..cdaa397a6 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0f.  Last change: 2006 Apr 02
+*help.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 			VIM - main help file
 									 k
@@ -18,12 +18,12 @@ Get specific help:  It is possible to go directly to whatever you want help
 							*help-context*
 			  WHAT			PREPEND    EXAMPLE	~
 		      Normal mode command      (nothing)   :help x
-		      Visual mode command 	  v_	   :help v_u
-		      Insert mode command 	  i_	   :help i_<Esc>
-		      Command-line command 	  :	   :help :quit
+		      Visual mode command	  v_	   :help v_u
+		      Insert mode command	  i_	   :help i_<Esc>
+		      Command-line command	  :	   :help :quit
 		      Command-line editing	  c_	   :help c_<Del>
-		      Vim command argument 	  -	   :help -r
-		      Option 			  '	   :help 'textwidth'
+		      Vim command argument	  -	   :help -r
+		      Option			  '	   :help 'textwidth'
   Search for help:  Type ":help word", then hit CTRL-D to see matching
 		    help entries for "word".
 
diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt
index 97273ed07..5183218fd 100644
--- a/runtime/doc/howto.txt
+++ b/runtime/doc/howto.txt
@@ -1,4 +1,4 @@
-*howto.txt*	For Vim version 7.0f.  Last change: 2006 Apr 02
+*howto.txt*	For Vim version 7.0g.  Last change: 2006 Apr 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index d459ba9dc..02471fa29 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.0f.  Last change: 2005 Mar 29
+*if_cscop.txt*  For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
index f8fc6461d..7c3811b23 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_mzsch.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
@@ -41,7 +41,7 @@ For downloading MzScheme and other info:
 							*:mzfile* *:mzf*
 :[range]mzf[ile] {file}	Execute the MzScheme script in {file}.  {not in Vi}
 			All statements are executed in the namespace of the
-                        buffer that was current during :mzfile start.
+			buffer that was current during :mzfile start.
 			If you want to access other namespaces, use
 			'parameterize'.
 
@@ -196,8 +196,8 @@ Buffers							 *mzscheme-buffer*
     (set-buff-line {linenr} {string} [buffer])
 				    Set a line in a buffer. If {string} is #f,
 				    the line gets deleted.  The [buffer]
-                                    argument is optional. If omitted, the
-                                    current buffer will be used.
+				    argument is optional. If omitted, the
+				    current buffer will be used.
     (get-buff-line-list {start} {end} [buffer])
 				    Get a list of lines in a buffer. {Start}
 				    and {end} are 1-based. {Start} is
@@ -262,7 +262,7 @@ In a console window type "path" to see what directories are used.
 
 The names of the DLLs must match the MzScheme version Vim was compiled with.
 For MzScheme version 209 they will be "libmzsch209_000.dll" and
-"libmzgc209_000.dll". To know for sure edit "gvim.exe" and search for 
+"libmzgc209_000.dll". To know for sure edit "gvim.exe" and search for
 "libmzsch\d\d\d_\d\d\d\.dll\c".
 
 ======================================================================
diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt
index 56d05bcb6..94da75e82 100644
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_ole.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -169,7 +169,7 @@ In .Net Studio choose from the menu Tools->External Tools...
 Add
      Title     - Vim
      Command   - c:\vim\vim63\gvim.exe
-     Arguments - --servername VS_NET --remote-silent "+call cursor($(CurLine), $(CurCol))" $(ItemPath)  
+     Arguments - --servername VS_NET --remote-silent "+call cursor($(CurLine), $(CurCol))" $(ItemPath)
      Init Dir  - Empty
 
 Now, when you open a file in .Net, you can choose from the .Net menu:
@@ -182,14 +182,14 @@ like.  You might also be able to set this as your default editor.
 If you refine this further, please post back to the Vim maillist so we have a
 record of it.
 
---servername VS_NET 
+--servername VS_NET
 This will create a new instance of vim called VS_NET.  So if you open multiple
 files from VS, they will use the same instance of Vim.  This allows you to
 have multiple copies of Vim running, but you can control which one has VS
 files in it.
 
---remote-silent "+call cursor(10, 27)" 
-              - Places the cursor on line 10 column 27
+--remote-silent "+call cursor(10, 27)"
+	      - Places the cursor on line 10 column 27
 In Vim >
    :h --remote-silent for mor details
 
diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt
index 6a3b6afd1..803f87382 100644
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_perl.txt*   For Vim version 7.0g.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 081efc56e..c96ba9a0d 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.0f.  Last change: 2006 Jan 20
+*if_pyth.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -134,7 +134,7 @@ vim.eval(str)						*python-eval*
 	evaluator (see |expression|).  Returns the expression result as:
 	- a string if the Vim expression evaluates to a string or number
 	- a list if the Vim expression evaluates to a Vim list
-  	- a dictionary if the Vim expression evaluates to a Vim dictionary
+	- a dictionary if the Vim expression evaluates to a Vim dictionary
 	Dictionaries and lists are recursively expanded.
 	Examples: >
 	    :py text_width = vim.eval("&tw")
@@ -142,7 +142,7 @@ vim.eval(str)						*python-eval*
 						# string.atoi() to convert to
 						# a number.
 
-	    :py tagList = vim.eval('taglist("eval_expr")') 
+	    :py tagList = vim.eval('taglist("eval_expr")')
 <	The latter will return a python list of python dicts, for instance:
 	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':
 	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index eb8ade0e8..8f957e0ee 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.0f.  Last change: 2006 Mar 26
+*if_ruby.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Shugo Maeda
@@ -147,7 +147,7 @@ self[{n}] = {str}
 delete({n})	Deletes a line from the buffer. {n} is the line number.
 append({n}, {str})
 		Appends a line after the line {n}.
-line            Returns the current line of the buffer if the buffer is
+line		Returns the current line of the buffer if the buffer is
 		active.
 line = {str}    Sets the current line of the buffer if the buffer is active.
 line_number     Returns the number of the current line if the buffer is
diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt
index 1664bb1ac..bfff1ba32 100644
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.0f.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL
diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt
index e3dc46dbc..432a6bf86 100644
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.0f.  Last change: 2006 Mar 06
+*if_tcl.txt*    For Vim version 7.0g.  Last change: 2006 Mar 06
 
 
 		  VIM REFERENCE MANUAL    by Ingo Wilken
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 384462b3b..ca991ca3e 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0f.  Last change: 2006 Apr 25
+*indent.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -412,8 +412,8 @@ assume a 'shiftwidth' of 4.
 
 		cino=			  cino=M1 >
 		  if (cond1 &&		    if (cond1 &&
-		         cond2			   cond2
-		     )			    	   )
+			 cond2			   cond2
+		     )				   )
 <
 					*java-cinoptions* *java-indenting*
 	jN    Indent java anonymous classes correctly.  The value 'N' is
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 332ad37eb..65f49c4e8 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0f.  Last change: 2006 Apr 10
+*index.txt*     For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -748,7 +748,7 @@ tag		char	      note action in Normal mode	~
 |gu|		gu{motion}	2  make Nmove text lowercase
 |gv|		gv		   reselect the previous Visual area
 |gw|		gw{motion}	2  format Nmove text and keep cursor
-|g@|            g@{motion}         call 'operatorfunc'
+|g@|		g@{motion}	   call 'operatorfunc'
 |g~|		g~{motion}	2  swap case for Nmove text
 |g<Down>|	g<Down>		1  same as "gj"
 |g<End>|	g<End>		1  same as "g$"
@@ -1336,7 +1336,7 @@ The commands are sorted on the non-optional part of their name.
 |:profdel|	:profd[el]	stop profiling a function or script
 |:profile|	:prof[ile]	profiling functions and scripts
 |:promptfind|	:pro[mtfind]	open GUI dialog for searching
-|:promptrepl| 	:promtr[epl]	open GUI dialog for search/replace
+|:promptrepl|	:promtr[epl]	open GUI dialog for search/replace
 |:perldo|	:perld[o]	execute Perl command for each line
 |:pop|		:po[p]		jump to older entry in tag stack
 |:popup|	:pop[up]	popup a menu by name
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index a0ef63cbb..fc55e6b5a 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0f.  Last change: 2006 Apr 26
+*insert.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1351,7 +1351,7 @@ Script completes:
     class. To find class location and contents tags file is required. Because
     PHP isn't strongly typed language user can use @var tag to declare class: >
 
-    	/* @var $myVar myClass */
+	/* @var $myVar myClass */
 	$myVar->
 <
     Still, to find myClass contents tags file is required.
@@ -1375,7 +1375,7 @@ automatically switch to HTML/CSS/JavaScript completion. Note: contrary to
 original HTML files completion of tags (and only tags) isn't context aware.
 
 
-RUBY                                                    *ft-ruby-omni*
+RUBY							*ft-ruby-omni*
 
 Completion of Ruby code requires that vim be built with |+ruby|.
 
@@ -1385,16 +1385,16 @@ and modules defined in the current buffer.
 
 The completions provided by CTRL-X CTRL-O are sensitive to the context:
 
-          CONTEXT                          COMPLETIONS PROVIDED ~
+	  CONTEXT			   COMPLETIONS PROVIDED ~
 
  1. Not inside a class definition    Classes, constants and globals
 
- 2. Inside a class definition        Methods or constants defined in the class
+ 2. Inside a class definition	     Methods or constants defined in the class
 
- 3. After '.', '::' or ':'           Methods applicable to the object being
-                                       dereferenced
+ 3. After '.', '::' or ':'	     Methods applicable to the object being
+				       dereferenced
 
- 4. After ':' or ':foo'              Symbol name (beginning with 'foo')
+ 4. After ':' or ':foo'		     Symbol name (beginning with 'foo')
 
 Notes:
  - Vim will load/evaluate code in order to provide completions.  This may
@@ -1557,7 +1557,7 @@ Note: Tag names in data file MUST not contain namespace description.  Check
 xsl.vim for example.
 
 
-DTD -> Vim                     					*dtd2vim*
+DTD -> Vim							*dtd2vim*
 
 On |www| is script |dtd2vim| which parses DTD and creates XML data file
 for Vim XML omni completion.
@@ -1565,7 +1565,7 @@ for Vim XML omni completion.
     dtd2vim: http://www.vim.org/scripts/script.php?script_id=1462
 
 Check there and beginning of file for details of usage.
-Script requires perl and: 
+Script requires perl and:
 
     perlSGML: http://savannah.nongnu.org/projects/perlsgml
 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6cf501a11..4259ab56c 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.0f.  Last change: 2006 Apr 20
+*intro.txt*     For Vim version 7.0g.  Last change: 2006 Apr 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 2c515c22f..23af8b564 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0f.  Last change: 2006 Apr 25
+*map.txt*       For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -218,8 +218,14 @@ The result of the InsertDot() function will be inserted.  It could check the
 text before the cursor and start omni completion when some condition is met.
 
 Be very careful about side effects!  The expression is evaluated while
-obtaining characters, if you change buffer text, move the cursor, edit another
-file, etc. you may very well make command dysfunctional.
+obtaining characters, you may very well make the command dysfunctional.
+For this reason the following is blocked:
+- changing the buffer text |textlock|
+- editing another buffer
+- the |:normal| command
+- moving the cursor is allowed, but it is restored afterwards
+If you want the mapping to do any of these let the returned characters do
+that.
 
 Here is an example that inserts a list number that increases: >
 	let counter = 0
@@ -269,28 +275,28 @@ Overview of which map command works in which mode:
 
 			*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*
     commands:				      modes: ~
-                                       Normal  Visual+Select  Operator-pending ~
-:map   :noremap   :unmap   :mapclear     yes        yes            yes
-:nmap  :nnoremap  :nunmap  :nmapclear    yes         -              -
-:vmap  :vnoremap  :vunmap  :vmapclear     -         yes             -
-:omap  :onoremap  :ounmap  :omapclear     -          -             yes
+				       Normal  Visual+Select  Operator-pending ~
+:map   :noremap   :unmap   :mapclear	 yes	    yes		   yes
+:nmap  :nnoremap  :nunmap  :nmapclear	 yes	     -		    -
+:vmap  :vnoremap  :vunmap  :vmapclear	  -	    yes		    -
+:omap  :onoremap  :ounmap  :omapclear	  -	     -		   yes
 
 :nunmap can also be used outside of a monastery.
-                                                *mapmode-x* *mapmode-s*
+						*mapmode-x* *mapmode-s*
 Some commands work both in Visual and Select mode, some in only one.  Note
 that quite often "Visual" is mentioned where both Visual and Select mode
 apply. |Select-mode-mapping|
 
-    commands:                                 modes: ~
-                                          Visual    Select ~
-:vmap  :vnoremap  :vunmap  :vmapclear       yes      yes
-:xmap  :xnoremap  :xunmap  :xmapclear       yes       -
-:smap  :snoremap  :sunmap  :smapclear       -        yes
+    commands:				      modes: ~
+					  Visual    Select ~
+:vmap  :vnoremap  :vunmap  :vmapclear	    yes      yes
+:xmap  :xnoremap  :xunmap  :xmapclear	    yes       -
+:smap  :snoremap  :sunmap  :smapclear	    -	     yes
 
 			*mapmode-ic* *mapmode-i* *mapmode-c* *mapmode-l*
 Some commands work both in Insert mode and Command-line mode, some not:
 
-    commands:                                 modes: ~
+    commands:				      modes: ~
 					  Insert  Command-line	Lang-Arg ~
 :map!  :noremap!  :unmap!  :mapclear!	    yes	       yes	   -
 :imap  :inoremap  :iunmap  :imapclear	    yes		-	   -
@@ -366,7 +372,7 @@ last defined.  Example: >
 
 	:verbose map <C-W>*
 	n  <C-W>*      * <C-W><C-S>*
-	        Last set from /home/abcd/.vimrc
+		Last set from /home/abcd/.vimrc
 
 See |:verbose-cmd| for more information.
 
@@ -872,7 +878,7 @@ When 'verbose' is non-zero, listing an abbreviation will also display where it
 was last defined.  Example: >
 
 	:verbose abbreviate
-	!  teh           the
+	!  teh		 the
 		Last set from /home/abcd/vim/abbr.vim
 
 See |:verbose-cmd| for more information.
@@ -1083,10 +1089,10 @@ When 'verbose' is non-zero, listing a command will also display where it was
 last defined. Example: >
 
     :verbose command TOhtml
-	Name        Args Range Complete  Definition
-	TOhtml      0    %               :call Convert2HTML(<line1>, <line2>)
-	    Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim
-<
+<	Name	    Args Range Complete  Definition ~
+	TOhtml	    0	 %		 :call Convert2HTML(<line1>, <line2>) ~
+	    Last set from /usr/share/vim/vim-7.0/plugin/tohtml.vim ~
+
 See |:verbose-cmd| for more information.
 
 							*E174* *E182*
@@ -1295,7 +1301,7 @@ To allow commands to pass their arguments on to a user-defined function, there
 is a special form <f-args> ("function args").  This splits the command
 arguments at spaces and Tabs, quotes each argument individually, and the
 <f-args> sequence is replaced by the comma-separated list of quoted arguments.
-See the Mycmd example below.  If no arguments are given <f-args> is removed. 
+See the Mycmd example below.  If no arguments are given <f-args> is removed.
 
 Examples >
 
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index cc8e700c6..5d89bf1ca 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.0f.  Last change: 2006 Apr 21
+*mbyte.txt*     For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -352,7 +352,7 @@ u   ucs2be	same as ucs-2 (big endian)
 u   ucs-2be	same as ucs-2 (big endian)
 u   ucs-4be	same as ucs-4 (big endian)
     default     stands for the default value of 'encoding', depends on the
-    		environment
+		environment
 
 For the UCS codes the byte order matters.  This is tricky, use UTF-8 whenever
 you can.  The default is to use big-endian (most significant byte comes
@@ -774,7 +774,7 @@ is suitable for complex input, such as CJK.
   locale if you make a correct input table.  Xcin can be found at:
   http://xcin.linux.org.tw/
   Others are scim: http://scim.freedesktop.org/ and fcitx:
-  http://www.fcitx.org/ 
+  http://www.fcitx.org/
 
 - Conversion Server
 							*conversion-server*
@@ -1261,7 +1261,7 @@ is no longer relevant in the GTK+ 2 GUI.
 					*mbyte-combining* *mbyte-composing*
 A composing or combining character is used to change the meaning of the
 character before it.  The combining characters are drawn on top of the
-preceding character.  
+preceding character.
 Up to two combining characters can be used by default.  This can be changed
 with the 'maxcombine' option.
 When editing text a composing character is mostly considered part of the
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 5e3ad2d2c..89b0f0cdd 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0f.  Last change: 2006 Apr 11
+*message.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -297,7 +297,7 @@ happens when you use ":w! filename" and a swapfile is found.
   to delete the swapfile.  Edit {filename} to find out information about the
   swapfile.
 - If you want to write anyway prepend ":silent!" to the command.  For example: >
-  	:silent! w! /tmp/test
+	:silent! w! /tmp/test
 < The special command is needed, since you already added the ! for overwriting
   an existing file.
 
@@ -796,7 +796,7 @@ Type					effect ~
      d					down a page (half a screen)
      <Space> or <PageDown>		down a screen
      G					down all the way, until the hit-enter
-     					prompt
+					prompt
 
      <BS> or k or <Up>			one line back (*)
      u					up a page (half a screen) (*)
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index 911f2a09e..a38b8cd60 100644
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.0f.  Last change: 2004 Feb 24
+*mlang.txt*     For Vim version 7.0g.  Last change: 2004 Feb 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 7173faf97..16c929cb7 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0f.  Last change: 2006 Apr 29
+*motion.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -780,7 +780,7 @@ g'{mark}  g`{mark}
 <			to list marks 'a' and 'B'.  {not in Vi}
 
 							*:delm* *:delmarks*
-:delm[arks] {marks} 	Delete the specified marks.  Marks that can be deleted
+:delm[arks] {marks}	Delete the specified marks.  Marks that can be deleted
 			include A-Z and 0-9.  You cannot delete the ' mark.
 			They can be specified by giving the list of mark
 			names, or with a range, separated with a dash.  Spaces
@@ -854,11 +854,17 @@ was made yet in the current file.
 
 							*'<* *`<*
 '<  `<			To the first character of the last selected Visual
-			area in the current buffer.  {not in Vi}.
+			area in the current buffer.  For block mode it may
+			also be the last character in the first line (to be
+			able to define the block).  {not in Vi}.
 
 							*'>* *`>*
 '>  `>			To the last character of the last selected Visual
-			area in the current buffer.  {not in Vi}.
+			area in the current buffer.  For block mode it may
+			also be the first character of the last line (to be
+			able to define the block).  Note that 'selection'
+			applies, the position may be just after the Visual
+			area.  {not in Vi}.
 
 							*''* *``*
 ''  ``			To the position before the latest jump, or where the
@@ -985,7 +991,7 @@ These commands are not marks themselves, but jump to a mark:
 <
 			Note that ":keepjumps" must be used for every command.
 			When invoking a function the commands in that function
-			can still change the jumplist.  Also, for 
+			can still change the jumplist.  Also, for
 			":keepjumps exe 'command '" the "command" won't keep
 			jumps.  Instead use: ":exe 'keepjumps command'"
 
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 3f00db7f3..979395994 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0f.  Last change: 2006 Mar 09
+*netbeans.txt*  For Vim version 7.0g.  Last change: 2006 Mar 09
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 749fb5862..af5278f1b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0f.  Last change: 2006 Apr 29
+*options.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1192,7 +1192,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			written
 	  nowrite	buffer which will not be written
 	  acwrite	buffer which will always be written with BufWriteCmd
-	  		autocommands. {not available when compiled without the
+			autocommands. {not available when compiled without the
 			|+autocmd| feature}
 	  quickfix	quickfix buffer, contains list of errors |:cwindow|
 			or list of locations |:lwindow|
@@ -1648,7 +1648,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    sufficient colors are available.  |ins-completion-menu|
 
 	   menuone  Use the popup menu also when there is only one match.
-	   	    Useful when there is additional information about the
+		    Useful when there is additional information about the
 		    match, e.g., what file it comes from.
 
 	   longest  Only insert the longest common text of the matches.  If
@@ -1658,7 +1658,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    used.
 
 	   preview  Show extra information about the currently selected
-	   	    completion in the preview window.
+		    completion in the preview window.
 
 				*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
 'confirm' 'cf'		boolean (default off)
@@ -1954,7 +1954,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		+	When included, a ":write file" command will reset the
 			'modified' flag of the buffer, even though the buffer
 			itself may still be different from its file.
-			 					*cpo-star*
+								*cpo-star*
 		*	Use ":*" in the same way as ":@".  When not included,
 			":*" is an alias for ":'<,'>", select the Visual area.
 								*cpo-<*
@@ -1973,7 +1973,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when $VIM_POSIX was set on startup. |posix|
 
 	    contains	behavior	~
-			 					*cpo-#*
+								*cpo-#*
 		#	A count before "D", "o" and "O" has no effect.
 								*cpo-&*
 		&	When ":preserve" was used keep the swap file when
@@ -2990,9 +2990,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	operator.  When this option is empty 'formatprg' is used.
 
 	The |v:lnum|  variable holds the first line to be formatted.
-	The |v:count| variable the number of lines to be formatted.
-	The |v:char|  variable the character to be inserted.  This can be
-		      empty.  Don't insert it yet!
+	The |v:count| variable holds the number of lines to be formatted.
+	The |v:char|  variable holds the character that is going to be
+		      inserted.  This can be empty.  Don't insert it yet!
 
 	Example: >
 		:set formatexpr=mylang#Format()
@@ -3370,7 +3370,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  't'	Include tearoff menu items.  Currently only works for Win32,
 		GTK+, and Motif 1.2 GUI.
 	  'T'	Include Toolbar.  Currently only in Win32, GTK+, Motif, Photon
-	        and Athena GUIs.
+		and Athena GUIs.
 
 	  'r'	Right-hand scrollbar is always present.
 	  'R'	Right-hand scrollbar is present when there is a vertically
@@ -4294,7 +4294,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			is off and there is text preceding the character
 			visible in the first column.
 	  nbsp:c	Character to show for a non-breakable space (character
-	  		0xA0, 160).  Left blank when omitted.
+			0xA0, 160).  Left blank when omitted.
 
 	The characters ':' and ',' should not be used.  UTF-8 characters can
 	be used when 'encoding' is "utf-8", otherwise only printable
@@ -6408,7 +6408,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			also used in all buffer related split commands, for
 			example ":sbuffer", ":sbnext", or ":sbrewind".
 	   usetab	Like "useopen", but also consider windows in other tab
-	   		pages.
+			pages.
 	   split	If included, split the current window before loading
 			a buffer.  Otherwise: do not split, use current window.
 			Supported in |quickfix| commands that display errors.
@@ -6988,7 +6988,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 				"s"  = button state
 				"c"  = column plus 33
 				"r"  = row plus 33
-	   		This only works up to 223 columns!  See "dec" for a
+			This only works up to 223 columns!  See "dec" for a
 			solution.
 	   xterm2	Works like "xterm", but with the xterm reporting the
 			mouse position while the mouse is dragged.  This works
@@ -7479,7 +7479,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	A list of words that change how command line completion is done.
 	Currently only one word is allowed:
 	  tagfile	When using CTRL-D to list matching tags, the kind of
-	   		tag and the file of the tag is listed.  Only one match
+			tag and the file of the tag is listed.	Only one match
 			is displayed per line.  Often used tag kinds are:
 				d	#define
 				f	function
diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt
index 34252b92e..c7ad6f22e 100644
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_390.txt*    For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL	  by Ralf Schandl
diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt
index 4b01bb5cd..e4cc88e15 100644
--- a/runtime/doc/os_amiga.txt
+++ b/runtime/doc/os_amiga.txt
@@ -1,4 +1,4 @@
-*os_amiga.txt*  For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_amiga.txt*  For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt
index fc8155ef7..cd43dfeef 100644
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_beos.txt*	For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
index a6f4594bf..e779dc175 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt*    For Vim version 7.0f.  Last change: 2006 Mar 30
+*os_dos.txt*    For Vim version 7.0g.  Last change: 2006 Mar 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt
index 3a77caa41..503d2bb43 100644
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.0f.  Last change: 2006 Mar 29
+*os_mac.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
@@ -84,7 +84,7 @@ Q: How do I start the GUI from the command line?
 A: Assuming that Vim.app is located in /Applications:
 	open /Applications/Vim.app
    Or:
-   	/Applications/Vim.app/Contents/MacOS/Vim -g  {arguments}
+	/Applications/Vim.app/Contents/MacOS/Vim -g  {arguments}
 
 Q: How can I set $PATH to something reasonable when I start Vim.app from the
    GUI or with open?
diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt
index 45e6ffacd..709b08c6b 100644
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt
index 945300443..4e347d8fe 100644
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt
index 97c47e6f6..6e2b63641 100644
--- a/runtime/doc/os_os2.txt
+++ b/runtime/doc/os_os2.txt
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_os2.txt*    For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Paul Slootman
diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt
index 27ac328b2..e47e4dbd3 100644
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Julian Kinraid
diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt
index af8a37ab9..3fd6417db 100644
--- a/runtime/doc/os_risc.txt
+++ b/runtime/doc/os_risc.txt
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_risc.txt*   For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Thomas Leonard
diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt
index de36c0066..51fffd202 100644
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.0f.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.0g.  Last change: 2005 Mar 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt
index d32987512..414df3240 100644
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.0f.  Last change: 2006 Mar 02
+*os_vms.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL
@@ -50,8 +50,8 @@ To use the precompiled binary version, you need one of these archives:
   vim-XX-exe-ia64-gui.zip       IA64 GUI/Motif executables
   vim-XX-exe-ia64-gtk.zip       IA64 GUI/GTK executables
   vim-XX-exe-ia64-term.zip      IA64 console executables
-  vim-XX-exe-axp-gui.zip        Alpha GUI/Motif executables
-  vim-XX-exe-axp-gtk.zip        Alpha GUI/GTK executables
+  vim-XX-exe-axp-gui.zip	Alpha GUI/Motif executables
+  vim-XX-exe-axp-gtk.zip	Alpha GUI/GTK executables
   vim-XX-exe-axp-term.zip       Alpha console executables
   vim-XX-exe-vax-gui.zip	VAX GUI executables
   vim-XX-exe-vax-term.zip       VAX console executables
@@ -61,7 +61,7 @@ and of course (optional)
 
 The binary archives contain: vim.exe, ctags.exe, xxd.exe files.
 
-For GTK executables you will need GTKLIB that is available for 
+For GTK executables you will need GTKLIB that is available for
 Alpha and IA64 platform.
 
 ==============================================================================
@@ -249,10 +249,10 @@ line parameter is uppercase "/" sign must be used.
 Examples:
   >
 	vim -R  filename  ! means: -r List swap files and exit
-        vim -/r filename  ! means: -R Readonly mode (like "view")
-        vim -u  <vimrc>   ! means: -u Use <vimrc> instead of any .vimrc   
-        vim -/u <gvimrc>  ! means: -U Use <gvimrc> instead of any .gvimrc
-                  
+	vim -/r filename  ! means: -R Readonly mode (like "view")
+	vim -u	<vimrc>   ! means: -u Use <vimrc> instead of any .vimrc
+	vim -/u <gvimrc>  ! means: -U Use <gvimrc> instead of any .gvimrc
+
 ==============================================================================
 
 7. GUI mode questions					*vms-gui*
@@ -356,7 +356,7 @@ number, try these settings. >
 
 	:set nobackup	     " does not create *.*_ backup files
 	:set nowritebackup   " does not have any purpose on VMS.  It's the
-	                     " default.
+			     " default.
 
 Recovery is working perfect as well from the default swap file.
 Read more with :help swapfile
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index f16d76d70..c9b866ec3 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.0f.  Last change: 2006 Apr 02
+*os_win32.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index d68da44bd..8ca5c76bd 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.0f.  Last change: 2006 Apr 29
+*pattern.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1018,13 +1018,13 @@ x	A single character, with no special meaning, matches itself
 	- An equivalence class.  This means that characters are matched that
 	  have almost the same meaning, e.g., when ignoring accents.  The form
 	  is:
-	  	[=a=]
+		[=a=]
 	  Currently this is only implemented for latin1.  Also works for the
 	  latin1 characters in utf-8 and latin9.
 							*/[[.* *[..]*
 	- A collation element.  This currently simply accepts a single
 	  character in the form:
-	  	[.a.]
+		[.a.]
 							  */\]*
 	- To include a literal ']', '^', '-' or '\' in the collection, put a
 	  backslash before it: "[xyz\]]", "[\^xyz]", "[xy\-z]" and "[xyz\\]".
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index 02e968dfc..fac47a06b 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 7.0f.  Last change: 2002 Oct 29
+*pi_gzip.txt*   For Vim version 7.0g.  Last change: 2002 Oct 29
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index a83caaf07..ec855f0b5 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,11 +1,11 @@
-*pi_netrw.txt*  For Vim version 7.0f.  Last change: 2006 Apr 28
+*pi_netrw.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.
 
 
-*dav*           *http*          *network*       *rcp*           *scp*
-*fetch*         *netrw*         *Nread*         *rsync*         *sftp*
-*ftp*           *netrw.vim*     *Nwrite*        *netrw-file*
+*dav*		*http*		*network*	*rcp*		*scp*
+*fetch*		*netrw*		*Nread*		*rsync*		*sftp*
+*ftp*		*netrw.vim*	*Nwrite*	*netrw-file*
 
 ==============================================================================
 0. Contents						*netrw-contents*
@@ -68,8 +68,8 @@ The Netrw plugin is generally sourced automatically as it is a
 have plugins available which can be done with the following
 two lines in your <.vimrc>: >
 
-	set nocp                    " 'compatible' is not set
-	filetype plugin on          " plugins are enabled
+	set nocp		    " 'compatible' is not set
+	filetype plugin on	    " plugins are enabled
 <
 You can avoid loading this plugin by setting the "loaded_netrw" variable
 in your <.vimrc> file: >
@@ -85,8 +85,8 @@ Netrw makes reading, writing, and browsing over a network connection easy!
 First, make sure that you have plugins enabled, so you'll need to have at
 least the following in your <.vimrc>: (or see |netrw-activate|) >
 
-	set nocp                    " 'compatible' is not set
-	filetype plugin on          " plugins are enabled
+	set nocp		    " 'compatible' is not set
+	filetype plugin on	    " plugins are enabled
 <
 (see |'cp'| and |:filetype-plugin-on|)
 
@@ -111,7 +111,7 @@ and has lines resembling >
 	machine HOSTNAME login USERID password "PASSWORD"
 	machine HOSTNAME login USERID password "PASSWORD"
 	...
-	default          login USERID password "PASSWORD"
+	default		 login USERID password "PASSWORD"
 <
 How about browsing -- ie. you just want to look around before editing a
 file.  For browsing on your current host, just "edit" a directory: >
@@ -140,7 +140,7 @@ CONTROLLING EXTERNAL APPLICATIONS			*netrw-externapp*
 	   dav:    *g:netrw_dav_cmd*  = "cadaver"
 	 fetch:  *g:netrw_fetch_cmd*  = "fetch -o"    if fetch is available
 	   ftp:    *g:netrw_ftp_cmd*  = "ftp"
-          http:   *g:netrw_http_cmd*  = "fetch -o"    if fetch is available
+	  http:   *g:netrw_http_cmd*  = "fetch -o"    if fetch is available
 	  http:    g:netrw_http_cmd   = "wget -q -O"  If wget  is available
 	   rcp:    *g:netrw_rcp_cmd*  = "rcp"
 	 rsync:  *g:netrw_rsync_cmd*  = "rsync -a"
@@ -226,7 +226,7 @@ VARIABLES						*netrw-variables*
 			This option is ignored if you're using unix
 
  *g:netrw_use_nt_rcp*	=0 don't use the rcp of WinNT, Win2000 and WinXP
-			=1 use WinNT's rcp in binary mode         (default)
+			=1 use WinNT's rcp in binary mode	  (default)
 
 PATHS								*netrw-path*
 
@@ -303,48 +303,48 @@ additional prompting.
 
 								*netrw-urls*
   +=================================+============================+============+
-  |  Reading                        | Writing                    |  Uses      |
+  |  Reading			    | Writing			 |  Uses      |
   +=================================+============================+============+
-  | DAV:                            |                            |            |
-  |  dav://host/path                |                            | cadaver    |
-  |  :Nread dav://host/path         | :Nwrite dav://host/path    | cadaver    |
+  | DAV:			    |				 |	      |
+  |  dav://host/path		    |				 | cadaver    |
+  |  :Nread dav://host/path	    | :Nwrite dav://host/path	 | cadaver    |
   +---------------------------------+----------------------------+------------+
-  | FETCH:                          |                            |            |
-  |  fetch://[user@]host/path       |                            |            |
-  |  fetch://[user@]host:http/path  |  Not Available             | fetch      |
-  |  :Nread fetch://[user@]host/path|                            |            |
+  | FETCH:			    |				 |	      |
+  |  fetch://[user@]host/path	    |				 |	      |
+  |  fetch://[user@]host:http/path  |  Not Available		 | fetch      |
+  |  :Nread fetch://[user@]host/path|				 |	      |
   +---------------------------------+----------------------------+------------+
-  | FILE:                           |                            |            |
-  |  file:///*                      | file:///*                  |            |
-  |  file://localhost/*             | file://localhost/*         |            |
+  | FILE:			    |				 |	      |
+  |  file:///*			    | file:///*			 |	      |
+  |  file://localhost/*		    | file://localhost/*	 |	      |
   +---------------------------------+----------------------------+------------+
-  | FTP:          (*3)              |              (*3)          |            |
-  |  ftp://[user@]host/path         | ftp://[user@]host/path     | ftp  (*2)  |
-  |  :Nread ftp://host/path         | :Nwrite ftp://host/path    | ftp+.netrc |
-  |  :Nread host path               | :Nwrite host path          | ftp+.netrc |
-  |  :Nread host uid pass path      | :Nwrite host uid pass path | ftp        |
+  | FTP:	  (*3)		    |		   (*3)		 |	      |
+  |  ftp://[user@]host/path	    | ftp://[user@]host/path	 | ftp	(*2)  |
+  |  :Nread ftp://host/path	    | :Nwrite ftp://host/path	 | ftp+.netrc |
+  |  :Nread host path		    | :Nwrite host path		 | ftp+.netrc |
+  |  :Nread host uid pass path	    | :Nwrite host uid pass path | ftp	      |
   +---------------------------------+----------------------------+------------+
-  | HTTP: wget is executable: (*4)  |                            |            |
-  |  http://[user@]host/path        |        Not Available       | wget       |
+  | HTTP: wget is executable: (*4)  |				 |	      |
+  |  http://[user@]host/path	    |	     Not Available	 | wget       |
   +---------------------------------+----------------------------+------------+
-  | HTTP: fetch is executable (*4)  |                            |            |
-  |  http://[user@]host/path        |        Not Available       | fetch      |
+  | HTTP: fetch is executable (*4)  |				 |	      |
+  |  http://[user@]host/path	    |	     Not Available	 | fetch      |
   +---------------------------------+----------------------------+------------+
-  | RCP:                            |                            |            |
-  |  rcp://[user@]host/path         | rcp://[user@]host/path     | rcp        |
+  | RCP:			    |				 |	      |
+  |  rcp://[user@]host/path	    | rcp://[user@]host/path	 | rcp	      |
   +---------------------------------+----------------------------+------------+
-  | RSYNC:                          |                            |            |
-  |  rsync://[user@]host/path       | rsync://[user@]host/path   | rsync      |
-  |  :Nread rsync://host/path       | :Nwrite rsync://host/path  | rsync      |
-  |  :Nread rcp://host/path         | :Nwrite rcp://host/path    | rcp        |
+  | RSYNC:			    |				 |	      |
+  |  rsync://[user@]host/path	    | rsync://[user@]host/path	 | rsync      |
+  |  :Nread rsync://host/path	    | :Nwrite rsync://host/path  | rsync      |
+  |  :Nread rcp://host/path	    | :Nwrite rcp://host/path	 | rcp	      |
   +---------------------------------+----------------------------+------------+
-  | SCP:                            |                            |            |
-  |  scp://[user@]host/path         | scp://[user@]host/path     | scp        |
-  |  :Nread scp://host/path         | :Nwrite scp://host/path    | scp  (*1)  |
+  | SCP:			    |				 |	      |
+  |  scp://[user@]host/path	    | scp://[user@]host/path	 | scp	      |
+  |  :Nread scp://host/path	    | :Nwrite scp://host/path	 | scp	(*1)  |
   +---------------------------------+----------------------------+------------+
-  | SFTP:                           |                            |            |
-  |  sftp://[user@]host/path        | sftp://[user@]host/path    | sftp       |
-  |  :Nread sftp://host/path        | :Nwrite sftp://host/path   | sftp  (*1) |
+  | SFTP:			    |				 |	      |
+  |  sftp://[user@]host/path	    | sftp://[user@]host/path	 | sftp       |
+  |  :Nread sftp://host/path	    | :Nwrite sftp://host/path	 | sftp  (*1) |
   +=================================+============================+============+
 
 	(*1) For an absolute path use scp://machine//path.
@@ -353,7 +353,7 @@ additional prompting.
 	work with your ftp client.  Otherwise the script will
 	prompt for user-id and pasword.
 
-        (*3) for ftp, "machine" may be machine#port or machine:port
+	(*3) for ftp, "machine" may be machine#port or machine:port
 	if a different port is needed than the standard ftp port
 
 	(*4) for http:..., if wget is available it will be used.  Otherwise,
@@ -459,7 +459,7 @@ see |netrw-urls|).
 		strings.
 
 :NetrwSettings  This command is desribed in |netrw-settings| -- used to
-                display netrw settings and change netrw behavior.
+		display netrw settings and change netrw behavior.
 
 
 ==============================================================================
@@ -469,37 +469,37 @@ 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:
 (also see |netrw-settings|) >
 
-                        -------------
-                        Netrw Options
-                        -------------
+			-------------
+			Netrw Options
+			-------------
 	Option			Meaning
 	--------------		-----------------------------------------------
 <
-        b:netrw_col             Holds current cursor position (during NetWrite)
-        g:netrw_cygwin          =1 assume scp under windows is from cygwin
-                                                              (default/windows)
-                                =0 assume scp under windows accepts windows
-                                   style paths                (default/else)
-        g:netrw_ftp             =0 use default ftp            (uid password)
-        g:netrw_ftpmode         ="binary"                     (default)
-                                ="ascii"                      (your choice)
-	g:netrw_ignorenetrc     =1                            (default)
-	                           if you have a <.netrc> file but you don't
+	b:netrw_col		Holds current cursor position (during NetWrite)
+	g:netrw_cygwin		=1 assume scp under windows is from cygwin
+							      (default/windows)
+				=0 assume scp under windows accepts windows
+				   style paths		      (default/else)
+	g:netrw_ftp		=0 use default ftp	      (uid password)
+	g:netrw_ftpmode		="binary"		      (default)
+				="ascii"		      (your choice)
+	g:netrw_ignorenetrc	=1			      (default)
+				   if you have a <.netrc> file but you don't
 				   want it used, then set this variable.  Its
 				   mere existence is enough to cause <.netrc>
 				   to be ignored.
-        b:netrw_lastfile        Holds latest method/machine/path.
-        b:netrw_line            Holds current line number     (during NetWrite)
-        g:netrw_passwd          Holds current password for ftp.
-	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)
-                                (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
-        g:netrw_win95ftp        =0 use unix-style ftp even if win95/98/ME/etc
-                                =1 use default method to do ftp >
+	b:netrw_lastfile	Holds latest method/machine/path.
+	b:netrw_line		Holds current line number     (during NetWrite)
+	g:netrw_passwd		Holds current password for ftp.
+	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)
+				(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
+	g:netrw_win95ftp	=0 use unix-style ftp even if win95/98/ME/etc
+				=1 use default method to do ftp >
 	-----------------------------------------------------------------------
 <
 The script will also make use of the following variables internally, albeit
@@ -522,21 +522,21 @@ Netrw supports a number of protocols.  These protocols are invoked using the
 variables listed below, and may be modified by the user.
 >
 			   ------------------------
-                           Protocol Control Options
+			   Protocol Control Options
 			   ------------------------
-    Option            Type        Setting         Meaning
-    ---------         --------    --------------  ---------------------------
+    Option	      Type	  Setting	  Meaning
+    ---------	      --------	  --------------  ---------------------------
 <
-    netrw_ftp         variable    =doesn't exist  userid set by "user userid"
-                                  =0              userid set by "user userid"
-                                  =1              userid set by "userid"
-    NetReadFixup      function    =doesn't exist  no change
-                                  =exists         Allows user to have files
-                                                  read via ftp automatically
-                                                  transformed however they wish
-                                                  by NetReadFixup()
+    netrw_ftp	      variable	  =doesn't exist  userid set by "user userid"
+				  =0		  userid set by "user userid"
+				  =1		  userid set by "userid"
+    NetReadFixup      function	  =doesn't exist  no change
+				  =exists	  Allows user to have files
+						  read via ftp automatically
+						  transformed however they wish
+						  by NetReadFixup()
     g:netrw_dav_cmd    variable   ="cadaver"
-    g:netrw_fetch_cmd  variable   ="fetch -o"     if fetch is available
+    g:netrw_fetch_cmd  variable   ="fetch -o"	  if fetch is available
     g:netrw_ftp_cmd    variable   ="ftp"
     g:netrw_http_cmd   variable   ="fetch -o"     if      fetch is available
     g:netrw_http_cmd   variable   ="wget -O"      else if wget  is available
@@ -565,11 +565,11 @@ temporary file:
   IF g:netrw_ftp !exists or is not 1     IF g:netrw_ftp exists and is 1
   ----------------------------------     ------------------------------
 <
-       open machine [port]                    open machine [port]
-       user userid password                   userid password
-       [g:netrw_ftpmode]                      password
-       get filename tempfile                  [g:netrw_ftpmode]
-                                              get filename tempfile >
+       open machine [port]		      open machine [port]
+       user userid password		      userid password
+       [g:netrw_ftpmode]		      password
+       get filename tempfile		      [g:netrw_ftpmode]
+					      get filename tempfile >
   ---------------------------------------------------------------------
 <
 Netrw then executes the lines above by use of a filter:
@@ -611,7 +611,7 @@ messages) you may write a NetReadFixup(tmpfile) function:
       elseif a:method == 7 "rsync
       elseif a:method == 8 "fetch
       elseif a:method == 9 "sftp
-      else               " complain
+      else		 " complain
       endif
     endfunction
 >
@@ -625,8 +625,8 @@ itself:
     if has("win95") && g:netrw_win95ftp
      fun! NetReadFixup(method, line1, line2)
        if method == 3   " ftp (no <.netrc>)
-        let fourblanklines= line2 - 3
-        silent fourblanklines.",".line2."g/^\s*/d"
+	let fourblanklines= line2 - 3
+	silent fourblanklines.",".line2."g/^\s*/d"
        endif
      endfunction
     endif
@@ -672,9 +672,9 @@ MAPS								*netrw-maps*
 
 QUICK REFERENCE COMMANDS TABLE				*netrw-browse-cmds*
 >
-        -------	-----------
+	-------	-----------
 	Command	Explanation
-        -------	-----------
+	-------	-----------
 <	<F1>	Causes Netrw to issue help
 	 <cr>	Netrw will enter the directory or read the file |netrw-cr|
 	 <del>	Netrw will attempt to remove the file/directory |netrw-del|
@@ -724,8 +724,8 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 
   *g:netrw_browse_split*	when browsing, <cr> will open the file by:
 				=0: re-using the same window
-				=1: horizontally splitting the window first  
-				=2: vertically   splitting the window first  
+				=1: horizontally splitting the window first
+				=2: vertically   splitting the window first
 
   *g:netrw_browsex_viewer*	specify user's preference for a viewer: >
 					"kfmclient exec"
@@ -772,7 +772,7 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
   *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"
+				 otherwise		       "dir"
 
   *g:netrw_hide*			if true, the hiding list is used
 				 default: =0
@@ -786,7 +786,7 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
 
   *g:netrw_list_cmd*		command for listing remote directories
 				 default: (if ssh is executable)
-				          "ssh HOSTNAME ls -FLa"
+					  "ssh HOSTNAME ls -FLa"
 
   *g:netrw_longlist*		if =1, then long listing will be default
 
@@ -827,7 +827,7 @@ NETRW BROWSER VARIABLES					*netrw-browse-var*
   *g:netrw_sort_sequence*	when sorting by name, first sort by the
 				comma-separated pattern sequence
 				 default: '[\/]$,*,\.bak$,\.o$,\.h$,
-				           \.info$,\.swp$,\.obj$'
+					   \.info$,\.swp$,\.obj$'
 
   *g:netrw_ssh_cmd*		One may specify an executable command
 				to use instead of ssh for remote actions
@@ -894,21 +894,21 @@ DIRECTORY EXPLORING COMMANDS	*netrw-nexplore* *netrw-vexplore*
 
      :Explore[!]   [dir]... Explore directory of current file       *:Explore*
      :Sexplore[!]  [dir]... Split&Explore directory of current file *:Sexplore*
-     :Hexplore[!]  [dir]... Horizontal Split & Explore              *:Hexplore*
-     :Vexplore[!]  [dir]... Vertical   Split & Explore              *:Vexplore*
+     :Hexplore[!]  [dir]... Horizontal Split & Explore		    *:Hexplore*
+     :Vexplore[!]  [dir]... Vertical   Split & Explore		    *:Vexplore*
 
      Used with :Explore **/pattern :
-     :Nexplore............. go to next matching file                *:Nexplore*
-     :Pexplore............. go to previous matching file            *:Pexplore*
+     :Nexplore............. go to next matching file		    *:Nexplore*
+     :Pexplore............. go to previous matching file	    *:Pexplore*
 
 :Explore  will open the local-directory browser on the current file's
-          directory (or on directory [dir] if specified).  The window will be
+	  directory (or on directory [dir] if specified).  The window will be
 	  split only if the file has been modified, otherwise the browsing
 	  window will take over that window.  Normally the splitting is taken
 	  horizontally.
 :Explore! is like :Explore, but will use vertical splitting.
 :Sexplore will always split the window before invoking the local-directory
-          browser.  As with Explore, the splitting is normally done
+	  browser.  As with Explore, the splitting is normally done
 	  horizontally.
 :Sexplore! [dir] is like :Sexplore, but the splitting will be done vertically.
 :Hexplore  [dir] does an :Explore with |:belowright| horizontal splitting.
@@ -1005,7 +1005,7 @@ 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
@@ -1255,7 +1255,7 @@ Netrw determines which special handler by the following method:
     If g:netrw_browsex_viewer == '-', then netrwFileHandler() will be
     invoked first (see |netrw_filehandler|).
 
-  * for Windows 32 or 64, the url and FileProtocolHandler dlls are used.  
+  * for Windows 32 or 64, the url and FileProtocolHandler dlls are used.
   * for Gnome (with gnome-open): gnome-open is used.
   * for KDE (with kfmclient): kfmclient is used.
   * otherwise the netrwFileHandler plugin is used.
@@ -1270,7 +1270,7 @@ 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
 file with mozilla.
@@ -1525,7 +1525,7 @@ which is loaded automatically at startup (assuming :set nocp).
 	     * g:netrw_browsex_viewer implemented
 	     * Mikolaj Machowski pointed out that gnome-open is often
 	       executable under KDE systems, although it is effectively
-	       not functional.  NetBrowseX now looks for "kicker" as 
+	       not functional.  NetBrowseX now looks for "kicker" as
 	       a running process to determine if KDE is actually the
 	       really running.
 	     * Explorer's O functionality was inadvertently left out.
@@ -1583,7 +1583,7 @@ which is loaded automatically at startup (assuming :set nocp).
 	       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
-	v64: * 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)
@@ -1741,12 +1741,12 @@ which is loaded automatically at startup (assuming :set nocp).
 
 	Jérôme Augé		-- also using new buffer method with ftp+.netrc
 	Bram Moolenaar		-- obviously vim itself, :e and v:cmdarg use,
-	                           fetch,...
+				   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
+				   operation
 
 ==============================================================================
  vim:tw=78:ts=8:ft=help:norl:fdm=marker
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
index 7326a4e85..b721de098 100644
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_paren.txt*  For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt
index e0b0e2cbd..8ba0ffa93 100644
--- a/runtime/doc/pi_spec.txt
+++ b/runtime/doc/pi_spec.txt
@@ -1,4 +1,4 @@
-*pi_spec.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_spec.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 by Gustavo Niemeyer ~
 
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index f4c365d18..0738d0778 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,8 +1,8 @@
-*pi_tar.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_tar.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
-       	       	       +====================+
-       	       	       | Tar File Interface |
-       	       	       +====================+
+		       +====================+
+		       | Tar File Interface |
+		       +====================+
 
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
@@ -31,11 +31,11 @@ Copyright: The GPL (gnu public license) applies to	*tar-copyright*
 
    These options are variables that one may change, typically in one's
    <.vimrc> file.
-                         Default
-   Variable               Value   Explanation
+			 Default
+   Variable		  Value   Explanation
    *g:tar_browseoptions*  "Ptf"   used to get a list of contents
-   *g:tar_readoptions*    "OPxf"  used to extract a file from a tarball
-   *g:tar_cmd*            "tar"   the name of the tar program
+   *g:tar_readoptions*	  "OPxf"  used to extract a file from a tarball
+   *g:tar_cmd*		  "tar"   the name of the tar program
    *g:tar_writeoptions*   "uf"    used to update/replace a file
 
 
@@ -44,19 +44,19 @@ Copyright: The GPL (gnu public license) applies to	*tar-copyright*
 
    v7 Mar 22, 2006 * work on making tar plugin work across network
       Mar 27, 2006 * g:tar_cmd now available for users to change the name
-                     of the tar program to be used.  By default, of course,
+		     of the tar program to be used.  By default, of course,
 		     its "tar".
    v6 Dec 21, 2005 * writing to files not in directories caused problems -
-                     fixed (pointed out by Christian Robinson)
+		     fixed (pointed out by Christian Robinson)
    v5 Nov 22, 2005 * report option workaround installed
    v3 Sep 16, 2005 * handles writing files in an archive back to the
-                     archive
+		     archive
       Oct 18, 2005 * <amatch> used instead of <afile> in autocmds
       Oct 18, 2005 * handles writing to compressed archives
       Nov 03, 2005 * handles writing tarfiles across a network using
-                     netrw#NetWrite()
-   v2              * converted to use Vim7's new autoload feature by
-                     Bram Moolenaar
+		     netrw#NetWrite()
+   v2		   * converted to use Vim7's new autoload feature by
+		     Bram Moolenaar
    v1 (original)   * Michael Toren (see http://michael.toren.net/code/)
 
 ==============================================================================
diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt
index d9e87e875..85dab41c1 100644
--- a/runtime/doc/pi_vimball.txt
+++ b/runtime/doc/pi_vimball.txt
@@ -1,4 +1,4 @@
-*pi_vimball.txt*	For Vim version 7.0f.  Last change: 2006 Apr 27
+*pi_vimball.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 			       ----------------
 			       Vimball Archiver
@@ -7,8 +7,8 @@
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
 Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
-           The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-           (see |copyright|) except use "Vimball" instead of "Vim".
+	   The VIM LICENSE applies to Vimball.vim, and Vimball.txt
+	   (see |copyright|) except use "Vimball" instead of "Vim".
 	   No warranty, express or implied.
 	   Use At-Your-Own-Risk!
 
@@ -53,7 +53,7 @@ Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
 	line.
 
 		:VimballList				*vimball-vimballlist*
-	
+
 	This command will tell Vimball to list the files in the archive, along
 	with their lengths in lines.
 
@@ -62,22 +62,22 @@ Copyright: (c) 2004-2006 by Charles E. Campbell, Jr.	*Vimball-copyright*
 3. Vimball History					*vimball-history* {{{1
 
 	11 : Apr 27, 2006 * VimballList would create missing subdirectories that
-	                    the vimball specified were needed.  Fixed.
+			    the vimball specified were needed.	Fixed.
 	10 : Apr 27, 2006 * moved all setting saving/restoration to a pair of
-	                    functions.  Included some more settings in them
+			    functions.	Included some more settings in them
 			    which frequently cause trouble.
 	9  : Apr 26, 2006 * various changes to support Windows prediliction
-	                    for backslashes and spaces in file and directory
+			    for backslashes and spaces in file and directory
 			    names.
 	7  : Apr 25, 2006 * bypasses foldenable
-	                  * uses more exe and less norm! (:yank :put etc)
+			  * uses more exe and less norm! (:yank :put etc)
 			  * does better at insuring a "Press ENTER" prompt
 			    appears to keep its messages visible
 	4  : Mar 31, 2006 * BufReadPost seems to fire twice; BufReadEnter
-	                    only fires once, so the "Source this file..."
+			    only fires once, so the "Source this file..."
 			    message is now issued only once.
 	3  : Mar 20, 2006 * removed query, now requires sourcing to be
-	                    extracted (:so %).  Message to that effect
+			    extracted (:so %).	Message to that effect
 			    included.
 			  * :VimballList  now shows files that would be
 			    extracted.
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 3fba03d93..10a62f605 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*pi_zip.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*pi_zip.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 				+====================+
 				| Zip File Interface |
@@ -7,7 +7,7 @@
 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
 Copyright: Copyright (C) 2005,2006 Charles E Campbell, Jr {{{1 *zip-copyright*
-           Permission is hereby granted to use and distribute this code,
+	   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, zipPlugin.vim, and pi_zip.txt are provided *as is*
@@ -34,21 +34,21 @@ Copyright: Copyright (C) 2005,2006 Charles E Campbell, Jr {{{1 *zip-copyright*
 ==============================================================================
 3. History					*zip-history*
    v8 Apr 10, 2006 * Bram Moolenaar reported that he received an error message
-                     due to "Pattern not found: ^.*\%0c"; this was caused by
+		     due to "Pattern not found: ^.*\%0c"; this was caused by
 		     stridx finding a Name... at the beginning of the line;
 		     zip.vim tried 4,$s/^.*\%0c//, but that doesn't work.
 		     Fixed.
    v7 Mar 22, 2006 * escaped some characters that can cause filename handling
-                     problems.
+		     problems.
    v6 Dec 21, 2005 * writing to files not in directories caused problems -
-                     fixed (pointed out by Christian Robinson)
+		     fixed (pointed out by Christian Robinson)
    v5 Nov 22, 2005 * report option workaround installed
    v3 Oct 18, 2005 * <amatch> used instead of <afile> in autocmds
    v2 Sep 16, 2005 * silenced some commands (avoiding hit-enter prompt)
-                   * began testing under Windows; works thus far
+		   * began testing under Windows; works thus far
 		   * filetype detection fixed
       Nov 03, 2005 * handles writing zipfiles across a network using
-                     netrw#NetWrite()
+		     netrw#NetWrite()
    v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing
 
 ==============================================================================
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 4844f000a..64f087a23 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 7.0f.  Last change: 2006 Apr 24
+*print.txt*     For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,7 +10,7 @@ Printing						*printing*
 2. Print options			|print-options|
 3. PostScript Printing			|postscript-printing|
 4. PostScript Printing Encoding		|postscript-print-encoding|
-5. PostScript CJK Printing 		|postscript-cjk-printing|
+5. PostScript CJK Printing		|postscript-cjk-printing|
 6. PostScript Printing Troubleshooting	|postscript-print-trouble|
 7. PostScript Utilities			|postscript-print-util|
 8. Formfeed Characters			|printing-formfeed|
@@ -218,7 +218,7 @@ Sets the CJK character set to be used when generating CJK output from
   Japanese	JIS_C_1978
 		JIS_X_1983
 		JIS_X_1990
-		MSWINDOWS	Win3.1/95J (JIS X 1997 + NEC + 
+		MSWINDOWS	Win3.1/95J (JIS X 1997 + NEC +
 				  IBM extensions)
 		KANJITALK6	Apple Mac KanjiTalk V6.x
 		KANJITALK7	Apple Mac KanjiTalk V7.x
@@ -254,7 +254,7 @@ possible.  The following tables show the valid combinations:
 		KANJITALK7	   x
 
 				euc-kr	 cp949	ucs-2	utf-8 ~
-  Korean	KS_X_1992	   x   
+  Korean	KS_X_1992	   x
 		MAC		   x
 		MSWINDOWS		   x
 		ISO10646			  x	  x
@@ -307,7 +307,7 @@ character set: >
 	:set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,c:yes
 <
 							*popt-option*
-'printoptions' 'popt' 	string (default "")
+'printoptions' 'popt'	string (default "")
 			global
 This is a comma-separated list of items that control the format of the output
 of |:hardcopy|:
@@ -336,7 +336,7 @@ of |:hardcopy|:
 			thus useful when printing large files.
   syntax:y		Do syntax highlighting.
   syntax:a  (default)	Use syntax highlighting if the printer appears to be
-  			able to print color or grey.
+			able to print color or grey.
 
   number:y		Include line numbers in the printed output.
   number:n  (default)	No line numbers.
@@ -346,16 +346,16 @@ of |:hardcopy|:
 
   duplex:off		Print on one side.
   duplex:long (default)	Print on both sides (when possible), bind on long
-  			side.
+			side.
   duplex:short		Print on both sides (when possible), bind on short
-  			side.
+			side.
 
   collate:y  (default)	Collating: 1 2 3, 1 2 3, 1 2 3
   collate:n		No collating: 1 1 1, 2 2 2, 3 3 3
 
   jobsplit:n (default)	Do all copies in one print job
   jobsplit:y		Do each copy as a separate print job.  Useful when
-  			doing N-up postprocessing.
+			doing N-up postprocessing.
 
   portrait:y (default)	Orientation is portrait.
   portrait:n		Orientation is landscape.
@@ -379,7 +379,7 @@ of |:hardcopy|:
 			tabloid     27.96 x 43.13    11    x 17
 
   formfeed:n (default)	Treat form feed characters (0x0c) as a normal print
-  			character.
+			character.
   formfeed:y		When a form feed character is encountered, continue
 			printing of the current line at the beginning of the
 			first line on a new page.
@@ -484,7 +484,7 @@ Traditional Chinese fonts available at:
 
   http://examples.oreilly.com/cjkvinfo/adobe/samples/
 
-You can find descriptions of the various fonts in the read me file at 
+You can find descriptions of the various fonts in the read me file at
 
   http://examples.oreilly.com/cjkvinfo/adobe/00README
 
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 7331c897e..4008a6e63 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*quickfix.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -88,7 +88,7 @@ command with 'l'.
 			all, go to the [count] previous error.  See |:cc| for
 			[!] and 'switchbuf'.
 
-				
+
 :[count]lN[ext][!]			*:lp* *:lprevious* *:lN* *:lNext*
 :[count]lp[revious][!]	Same as ":cNext" and ":cprevious", except the location
 			list for the current window is used instead of the
@@ -158,12 +158,12 @@ command with 'l'.
 			You can not use the -q command-line option to set
 			the location list.
 
-		
+
 :cg[etfile][!] [errorfile]				*:cg* *:cgetfile*
 			Read the error file.  Just like ":cfile" but don't
 			jump to the first error.
 
-			
+
 :lg[etfile][!] [errorfile]				*:lg* *:lgetfile*
 			Same as ":cgetfile", except the location list for the
 			current window is used instead of the quickfix list.
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 45a3a7dbb..dd68b2b6e 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*quickref.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -588,58 +588,58 @@ In Insert or Command-line mode:
 					  the help.
 
 Short explanation of each option:		*option-list*
-'aleph'           'al'      ASCII code of the letter Aleph (Hebrew)
-'allowrevins'     'ari'     allow CTRL-_ in Insert and Command-line mode
-'altkeymap'       'akm'     for default second language (Farsi/Hebrew)
-'ambiwidth'       'ambw'    what to do with Unicode chars of ambiguous width
-'antialias'       'anti'    Mac OS X: use smooth, antialiased fonts
-'autochdir'       'acd'     change directory to the file in the current window
-'arabic'          'arab'    for Arabic as a default second language
-'arabicshape'     'arshape' do shaping for Arabic characters
-'autoindent'      'ai'      take indent for new line from previous line
-'autoread'        'ar'      autom. read file when changed outside of Vim
-'autowrite'       'aw'      automatically write file if changed
-'autowriteall'    'awa'     as 'autowrite', but works with more commands
-'background'      'bg'      "dark" or "light", used for highlight colors
-'backspace'       'bs'      how backspace works at start of line
-'backup'          'bk'      keep backup file after overwriting a file
-'backupcopy'      'bkc'     make backup as a copy, don't rename the file
-'backupdir'       'bdir'    list of directories for the backup file
-'backupext'       'bex'     extension used for the backup file
-'backupskip'      'bsk'     no backup for files that match these patterns
-'balloondelay'    'bdlay'   delay in mS before a balloon may pop up
-'ballooneval'     'beval'   switch on balloon evaluation
-'balloonexpr'     'bexpr'   expression to show in balloon
-'binary'          'bin'     read/write/edit file in binary mode
-'bioskey'         'biosk'   MS-DOS: use bios calls for input characters
-'bomb'                      prepend a Byte Order Mark to the file
-'breakat'         'brk'     characters that may cause a line break
-'browsedir'       'bsdir'   which directory to start browsing in
-'bufhidden'       'bh'      what to do when buffer is no longer in window
-'buflisted'       'bl'      whether the buffer shows up in the buffer list
-'buftype'         'bt'      special type of buffer
-'casemap'         'cmp'     specifies how case of letters is changed
-'cdpath'          'cd'      list of directories searched with ":cd"
-'cedit'                     key used to open the command-line window
-'charconvert'     'ccv'     expression for character encoding conversion
-'cindent'         'cin'     do C program indenting
-'cinkeys'         'cink'    keys that trigger indent when 'cindent' is set
-'cinoptions'      'cino'    how to do indenting when 'cindent' is set
-'cinwords'        'cinw'    words where 'si' and 'cin' add an indent
-'clipboard'       'cb'      use the clipboard as the unnamed register
-'cmdheight'       'ch'      number of lines to use for the command-line
-'cmdwinheight'    'cwh'     height of the command-line window
-'columns'         'co'      number of columns in the display
-'comments'        'com'     patterns that can start a comment line
+'aleph'		  'al'	    ASCII code of the letter Aleph (Hebrew)
+'allowrevins'	  'ari'     allow CTRL-_ in Insert and Command-line mode
+'altkeymap'	  'akm'     for default second language (Farsi/Hebrew)
+'ambiwidth'	  'ambw'    what to do with Unicode chars of ambiguous width
+'antialias'	  'anti'    Mac OS X: use smooth, antialiased fonts
+'autochdir'	  'acd'     change directory to the file in the current window
+'arabic'	  'arab'    for Arabic as a default second language
+'arabicshape'	  'arshape' do shaping for Arabic characters
+'autoindent'	  'ai'	    take indent for new line from previous line
+'autoread'	  'ar'	    autom. read file when changed outside of Vim
+'autowrite'	  'aw'	    automatically write file if changed
+'autowriteall'	  'awa'     as 'autowrite', but works with more commands
+'background'	  'bg'	    "dark" or "light", used for highlight colors
+'backspace'	  'bs'	    how backspace works at start of line
+'backup'	  'bk'	    keep backup file after overwriting a file
+'backupcopy'	  'bkc'     make backup as a copy, don't rename the file
+'backupdir'	  'bdir'    list of directories for the backup file
+'backupext'	  'bex'     extension used for the backup file
+'backupskip'	  'bsk'     no backup for files that match these patterns
+'balloondelay'	  'bdlay'   delay in mS before a balloon may pop up
+'ballooneval'	  'beval'   switch on balloon evaluation
+'balloonexpr'	  'bexpr'   expression to show in balloon
+'binary'	  'bin'     read/write/edit file in binary mode
+'bioskey'	  'biosk'   MS-DOS: use bios calls for input characters
+'bomb'			    prepend a Byte Order Mark to the file
+'breakat'	  'brk'     characters that may cause a line break
+'browsedir'	  'bsdir'   which directory to start browsing in
+'bufhidden'	  'bh'	    what to do when buffer is no longer in window
+'buflisted'	  'bl'	    whether the buffer shows up in the buffer list
+'buftype'	  'bt'	    special type of buffer
+'casemap'	  'cmp'     specifies how case of letters is changed
+'cdpath'	  'cd'	    list of directories searched with ":cd"
+'cedit'			    key used to open the command-line window
+'charconvert'	  'ccv'     expression for character encoding conversion
+'cindent'	  'cin'     do C program indenting
+'cinkeys'	  'cink'    keys that trigger indent when 'cindent' is set
+'cinoptions'	  'cino'    how to do indenting when 'cindent' is set
+'cinwords'	  'cinw'    words where 'si' and 'cin' add an indent
+'clipboard'	  'cb'	    use the clipboard as the unnamed register
+'cmdheight'	  'ch'	    number of lines to use for the command-line
+'cmdwinheight'	  'cwh'     height of the command-line window
+'columns'	  'co'	    number of columns in the display
+'comments'	  'com'     patterns that can start a comment line
 'commentstring'   'cms'     template for comments; used for fold marker
-'compatible'      'cp'      behave Vi-compatible as much as possible
-'complete'        'cpt'     specify how Insert mode completion works
-'completefunc'    'cfu'     function to be used for Insert mode completion
-'completeopt'     'cot'     options for Insert mode completion
-'confirm'         'cf'      ask what to do about unsaved/read-only files
-'conskey'         'consk'   get keys directly from console (MS-DOS only)
-'copyindent'      'ci'      make 'autoindent' use existing indent structure
-'cpoptions'       'cpo'     flags for Vi-compatible behavior
+'compatible'	  'cp'	    behave Vi-compatible as much as possible
+'complete'	  'cpt'     specify how Insert mode completion works
+'completefunc'	  'cfu'     function to be used for Insert mode completion
+'completeopt'	  'cot'     options for Insert mode completion
+'confirm'	  'cf'	    ask what to do about unsaved/read-only files
+'conskey'	  'consk'   get keys directly from console (MS-DOS only)
+'copyindent'	  'ci'	    make 'autoindent' use existing indent structure
+'cpoptions'	  'cpo'     flags for Vi-compatible behavior
 'cscopepathcomp'  'cspc'    how many components of the path to show
 'cscopeprg'       'csprg'   command to execute cscope
 'cscopequickfix'  'csqf'    use quickfix window for cscope results
@@ -648,288 +648,288 @@ Short explanation of each option:		*option-list*
 'cscopeverbose'   'csverb'  give messages when adding a cscope database
 'cursorcolumn'	  'cuc'	    highlight the screen column of the cursor
 'cursorline'	  'cul'	    highlight the screen line of the cursor
-'debug'                     set to "msg" to see all error messages
-'define'          'def'     pattern to be used to find a macro definition
-'delcombine'      'deco'    delete combining characters on their own
-'dictionary'      'dict'    list of file names used for keyword completion
-'diff'                      use diff mode for the current window
-'diffexpr'        'dex'     expression used to obtain a diff file
-'diffopt'         'dip'     options for using diff mode
-'digraph'         'dg'      enable the entering of digraphs in Insert mode
-'directory'       'dir'     list of directory names for the swap file
-'display'         'dy'      list of flags for how to display text
-'eadirection'     'ead'     in which direction 'equalalways' works
-'edcompatible'    'ed'      toggle flags of ":substitute" command
-'encoding'        'enc'     encoding used internally
-'endofline'       'eol'     write <EOL> for last line in file
-'equalalways'     'ea'      windows are automatically made the same size
-'equalprg'        'ep'      external program to use for "=" command
-'errorbells'      'eb'      ring the bell for error messages
-'errorfile'       'ef'      name of the errorfile for the QuickFix mode
-'errorformat'     'efm'     description of the lines in the error file
-'esckeys'         'ek'      recognize function keys in Insert mode
-'eventignore'     'ei'      autocommand events that are ignored
-'expandtab'       'et'      use spaces when <Tab> is inserted
-'exrc'            'ex'      read .vimrc and .exrc in the current directory
-'fileencoding'    'fenc'    file encoding for multi-byte text
+'debug'			    set to "msg" to see all error messages
+'define'	  'def'     pattern to be used to find a macro definition
+'delcombine'	  'deco'    delete combining characters on their own
+'dictionary'	  'dict'    list of file names used for keyword completion
+'diff'			    use diff mode for the current window
+'diffexpr'	  'dex'     expression used to obtain a diff file
+'diffopt'	  'dip'     options for using diff mode
+'digraph'	  'dg'	    enable the entering of digraphs in Insert mode
+'directory'	  'dir'     list of directory names for the swap file
+'display'	  'dy'	    list of flags for how to display text
+'eadirection'	  'ead'     in which direction 'equalalways' works
+'edcompatible'	  'ed'	    toggle flags of ":substitute" command
+'encoding'	  'enc'     encoding used internally
+'endofline'	  'eol'     write <EOL> for last line in file
+'equalalways'	  'ea'	    windows are automatically made the same size
+'equalprg'	  'ep'	    external program to use for "=" command
+'errorbells'	  'eb'	    ring the bell for error messages
+'errorfile'	  'ef'	    name of the errorfile for the QuickFix mode
+'errorformat'	  'efm'     description of the lines in the error file
+'esckeys'	  'ek'	    recognize function keys in Insert mode
+'eventignore'	  'ei'	    autocommand events that are ignored
+'expandtab'	  'et'	    use spaces when <Tab> is inserted
+'exrc'		  'ex'	    read .vimrc and .exrc in the current directory
+'fileencoding'	  'fenc'    file encoding for multi-byte text
 'fileencodings'   'fencs'   automatically detected character encodings
-'fileformat'      'ff'      file format used for file I/O
-'fileformats'     'ffs'     automatically detected values for 'fileformat'
-'filetype'        'ft'      type of file, used for autocommands
-'fillchars'       'fcs'     characters to use for displaying special items
-'fkmap'           'fk'      Farsi keyboard mapping
-'foldclose'       'fcl'     close a fold when the cursor leaves it
-'foldcolumn'      'fdc'     width of the column used to indicate folds
-'foldenable'      'fen'     set to display all folds open
-'foldexpr'        'fde'     expression used when 'foldmethod' is "expr"
-'foldignore'      'fdi'     ignore lines when 'foldmethod' is "indent"
-'foldlevel'       'fdl'     close folds with a level higher than this
+'fileformat'	  'ff'	    file format used for file I/O
+'fileformats'	  'ffs'     automatically detected values for 'fileformat'
+'filetype'	  'ft'	    type of file, used for autocommands
+'fillchars'	  'fcs'     characters to use for displaying special items
+'fkmap'		  'fk'	    Farsi keyboard mapping
+'foldclose'	  'fcl'     close a fold when the cursor leaves it
+'foldcolumn'	  'fdc'     width of the column used to indicate folds
+'foldenable'	  'fen'     set to display all folds open
+'foldexpr'	  'fde'     expression used when 'foldmethod' is "expr"
+'foldignore'	  'fdi'     ignore lines when 'foldmethod' is "indent"
+'foldlevel'	  'fdl'     close folds with a level higher than this
 'foldlevelstart'  'fdls'    'foldlevel' when starting to edit a file
-'foldmarker'      'fmr'     markers used when 'foldmethod' is "marker"
-'foldmethod'      'fdm'     folding type
-'foldminlines'    'fml'     minimum number of lines for a fold to be closed
-'foldnestmax'     'fdn'     maximum fold depth
-'foldopen'        'fdo'     for which commands a fold will be opened
-'foldtext'        'fdt'     expression used to display for a closed fold
+'foldmarker'	  'fmr'     markers used when 'foldmethod' is "marker"
+'foldmethod'	  'fdm'     folding type
+'foldminlines'	  'fml'     minimum number of lines for a fold to be closed
+'foldnestmax'	  'fdn'     maximum fold depth
+'foldopen'	  'fdo'     for which commands a fold will be opened
+'foldtext'	  'fdt'     expression used to display for a closed fold
 'formatlistpat'   'flp'     pattern used to recognize a list header
-'formatoptions'   'fo'      how automatic formatting is to be done
-'formatprg'       'fp'      name of external program used with "gq" command
-'formatexpr'      'fex'     expression used with "gq" command
-'fsync'           'fs'      whether to invoke fsync() after file write
-'gdefault'        'gd'      the ":substitute" flag 'g' is default on
-'grepformat'      'gfm'     format of 'grepprg' output
-'grepprg'         'gp'      program to use for ":grep"
-'guicursor'       'gcr'     GUI: settings for cursor shape and blinking
-'guifont'         'gfn'     GUI: Name(s) of font(s) to be used
-'guifontset'      'gfs'     GUI: Names of multi-byte fonts to be used
-'guifontwide'     'gfw'     list of font names for double-wide characters
-'guiheadroom'     'ghr'     GUI: pixels room for window decorations
-'guioptions'      'go'      GUI: Which components and options are used
-'guipty'                    GUI: try to use a pseudo-tty for ":!" commands
-'guitablabel'     'gtl'     GUI: custom label for a tab page
+'formatoptions'   'fo'	    how automatic formatting is to be done
+'formatprg'	  'fp'	    name of external program used with "gq" command
+'formatexpr'	  'fex'     expression used with "gq" command
+'fsync'		  'fs'	    whether to invoke fsync() after file write
+'gdefault'	  'gd'	    the ":substitute" flag 'g' is default on
+'grepformat'	  'gfm'     format of 'grepprg' output
+'grepprg'	  'gp'	    program to use for ":grep"
+'guicursor'	  'gcr'     GUI: settings for cursor shape and blinking
+'guifont'	  'gfn'     GUI: Name(s) of font(s) to be used
+'guifontset'	  'gfs'     GUI: Names of multi-byte fonts to be used
+'guifontwide'	  'gfw'     list of font names for double-wide characters
+'guiheadroom'	  'ghr'     GUI: pixels room for window decorations
+'guioptions'	  'go'	    GUI: Which components and options are used
+'guipty'		    GUI: try to use a pseudo-tty for ":!" commands
+'guitablabel'	  'gtl'     GUI: custom label for a tab page
 'guitabtooltip'   'gtt'     GUI: custom tooltip for a tab page
-'helpfile'        'hf'      full path name of the main help file
-'helpheight'      'hh'      minimum height of a new help window
-'helplang'        'hlg'     preferred help languages
-'hidden'          'hid'     don't unload buffer when it is |abandon|ed
-'highlight'       'hl'      sets highlighting mode for various occasions
-'hlsearch'        'hls'     highlight matches with last search pattern
-'history'         'hi'      number of command-lines that are remembered
-'hkmap'           'hk'      Hebrew keyboard mapping
-'hkmapp'          'hkp'     phonetic Hebrew keyboard mapping
-'icon'                      let Vim set the text of the window icon
-'iconstring'                string to use for the Vim icon text
-'ignorecase'      'ic'      ignore case in search patterns
+'helpfile'	  'hf'	    full path name of the main help file
+'helpheight'	  'hh'	    minimum height of a new help window
+'helplang'	  'hlg'     preferred help languages
+'hidden'	  'hid'     don't unload buffer when it is |abandon|ed
+'highlight'	  'hl'	    sets highlighting mode for various occasions
+'hlsearch'	  'hls'     highlight matches with last search pattern
+'history'	  'hi'	    number of command-lines that are remembered
+'hkmap'		  'hk'	    Hebrew keyboard mapping
+'hkmapp'	  'hkp'     phonetic Hebrew keyboard mapping
+'icon'			    let Vim set the text of the window icon
+'iconstring'		    string to use for the Vim icon text
+'ignorecase'	  'ic'	    ignore case in search patterns
 'imactivatekey'   'imak'    key that activates the X input method
-'imcmdline'       'imc'     use IM when starting to edit a command line
-'imdisable'       'imd'     do not use the IM in any mode
-'iminsert'        'imi'     use :lmap or IM in Insert mode
-'imsearch'        'ims'     use :lmap or IM when typing a search pattern
-'include'         'inc'     pattern to be used to find an include file
-'includeexpr'     'inex'    expression used to process an include line
-'incsearch'       'is'      highlight match while typing search pattern
-'indentexpr'      'inde'    expression used to obtain the indent of a line
-'indentkeys'      'indk'    keys that trigger indenting with 'indentexpr'
-'infercase'       'inf'     adjust case of match for keyword completion
-'insertmode'      'im'      start the edit of a file in Insert mode
-'isfname'         'isf'     characters included in file names and pathnames
-'isident'         'isi'     characters included in identifiers
-'iskeyword'       'isk'     characters included in keywords
-'isprint'         'isp'     printable characters
-'joinspaces'      'js'      two spaces after a period with a join command
-'key'                       encryption key
-'keymap'          'kmp'     name of a keyboard mapping
-'keymodel'        'km'      enable starting/stopping selection with keys
-'keywordprg'      'kp'      program to use for the "K" command
-'langmap'         'lmap'    alphabetic characters for other language mode
-'langmenu'        'lm'      language to be used for the menus
-'laststatus'      'ls'      tells when last window has status lines
-'lazyredraw'      'lz'      don't redraw while executing macros
-'linebreak'       'lbr'     wrap long lines at a blank
-'lines'                     number of lines in the display
-'linespace'       'lsp'     number of pixel lines to use between characters
-'lisp'                      automatic indenting for Lisp
-'lispwords'       'lw'      words that change how lisp indenting works
-'list'                      show <Tab> and <EOL>
-'listchars'       'lcs'     characters for displaying in list mode
-'loadplugins'     'lpl'     load plugin scripts when starting up
+'imcmdline'	  'imc'     use IM when starting to edit a command line
+'imdisable'	  'imd'     do not use the IM in any mode
+'iminsert'	  'imi'     use :lmap or IM in Insert mode
+'imsearch'	  'ims'     use :lmap or IM when typing a search pattern
+'include'	  'inc'     pattern to be used to find an include file
+'includeexpr'	  'inex'    expression used to process an include line
+'incsearch'	  'is'	    highlight match while typing search pattern
+'indentexpr'	  'inde'    expression used to obtain the indent of a line
+'indentkeys'	  'indk'    keys that trigger indenting with 'indentexpr'
+'infercase'	  'inf'     adjust case of match for keyword completion
+'insertmode'	  'im'	    start the edit of a file in Insert mode
+'isfname'	  'isf'     characters included in file names and pathnames
+'isident'	  'isi'     characters included in identifiers
+'iskeyword'	  'isk'     characters included in keywords
+'isprint'	  'isp'     printable characters
+'joinspaces'	  'js'	    two spaces after a period with a join command
+'key'			    encryption key
+'keymap'	  'kmp'     name of a keyboard mapping
+'keymodel'	  'km'	    enable starting/stopping selection with keys
+'keywordprg'	  'kp'	    program to use for the "K" command
+'langmap'	  'lmap'    alphabetic characters for other language mode
+'langmenu'	  'lm'	    language to be used for the menus
+'laststatus'	  'ls'	    tells when last window has status lines
+'lazyredraw'	  'lz'	    don't redraw while executing macros
+'linebreak'	  'lbr'     wrap long lines at a blank
+'lines'			    number of lines in the display
+'linespace'	  'lsp'     number of pixel lines to use between characters
+'lisp'			    automatic indenting for Lisp
+'lispwords'	  'lw'	    words that change how lisp indenting works
+'list'			    show <Tab> and <EOL>
+'listchars'	  'lcs'     characters for displaying in list mode
+'loadplugins'	  'lpl'     load plugin scripts when starting up
 'macatsui'		    Mac GUI: use ATSUI text drawing
-'magic'                     changes special characters in search patterns
-'makeef'          'mef'     name of the errorfile for ":make"
-'makeprg'         'mp'      program to use for the ":make" command
-'matchpairs'      'mps'     pairs of characters that "%" can match
-'matchtime'       'mat'     tenths of a second to show matching paren
-'maxcombine'      'mco'     maximum nr of combining characters displayed
-'maxfuncdepth'    'mfd'     maximum recursive depth for user functions
-'maxmapdepth'     'mmd'     maximum recursive depth for mapping
-'maxmem'          'mm'      maximum memory (in Kbyte) used for one buffer
+'magic'			    changes special characters in search patterns
+'makeef'	  'mef'     name of the errorfile for ":make"
+'makeprg'	  'mp'	    program to use for the ":make" command
+'matchpairs'	  'mps'     pairs of characters that "%" can match
+'matchtime'	  'mat'     tenths of a second to show matching paren
+'maxcombine'	  'mco'     maximum nr of combining characters displayed
+'maxfuncdepth'	  'mfd'     maximum recursive depth for user functions
+'maxmapdepth'	  'mmd'     maximum recursive depth for mapping
+'maxmem'	  'mm'	    maximum memory (in Kbyte) used for one buffer
 '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
-'modified'        'mod'     buffer has been modified
-'more'                      pause listings when the whole screen is filled
-'mouse'                     enable the use of mouse clicks
-'mousefocus'      'mousef'  keyboard focus follows the mouse
-'mousehide'       'mh'      hide mouse pointer while typing
-'mousemodel'      'mousem'  changes meaning of mouse buttons
-'mouseshape'      'mouses'  shape of the mouse pointer in different modes
-'mousetime'       'mouset'  max time between mouse double-click
-'mzquantum'       'mzq'     the interval between polls for MzScheme threads
-'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
-'operatorfunc'    'opfunc'  funtion to be called for |g@| operator
-'osfiletype'      'oft'     operating system-specific filetype information
-'paragraphs'      'para'    nroff macros that separate paragraphs
-'paste'                     allow pasting text
-'pastetoggle'     'pt'      key code that causes 'paste' to toggle
-'patchexpr'       'pex'     expression used to patch a file
-'patchmode'       'pm'      keep the oldest version of a file
-'path'            'pa'      list of directories searched with "gf" et.al.
-'preserveindent'  'pi'      preserve the indent structure when reindenting
+'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
+'modified'	  'mod'     buffer has been modified
+'more'			    pause listings when the whole screen is filled
+'mouse'			    enable the use of mouse clicks
+'mousefocus'	  'mousef'  keyboard focus follows the mouse
+'mousehide'	  'mh'	    hide mouse pointer while typing
+'mousemodel'	  'mousem'  changes meaning of mouse buttons
+'mouseshape'	  'mouses'  shape of the mouse pointer in different modes
+'mousetime'	  'mouset'  max time between mouse double-click
+'mzquantum'	  'mzq'     the interval between polls for MzScheme threads
+'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
+'operatorfunc'	  'opfunc'  funtion to be called for |g@| operator
+'osfiletype'	  'oft'     operating system-specific filetype information
+'paragraphs'	  'para'    nroff macros that separate paragraphs
+'paste'			    allow pasting text
+'pastetoggle'	  'pt'	    key code that causes 'paste' to toggle
+'patchexpr'	  'pex'     expression used to patch a file
+'patchmode'	  'pm'	    keep the oldest version of a file
+'path'		  'pa'	    list of directories searched with "gf" et.al.
+'preserveindent'  'pi'	    preserve the indent structure when reindenting
 'previewheight'   'pvh'     height of the preview window
 'previewwindow'   'pvw'     identifies the preview window
-'printdevice'     'pdev'    name of the printer to be used for :hardcopy
+'printdevice'	  'pdev'    name of the printer to be used for :hardcopy
 'printencoding'   'penc'    encoding to be used for printing
-'printexpr'       'pexpr'   expression used to print PostScript for :hardcopy
-'printfont'       'pfn'     name of the font to be used for :hardcopy
-'printheader'     'pheader' format of the header used for :hardcopy
+'printexpr'	  'pexpr'   expression used to print PostScript for :hardcopy
+'printfont'	  'pfn'     name of the font to be used for :hardcopy
+'printheader'	  'pheader' format of the header used for :hardcopy
 'printmbcharset'  'pmbcs'   CJK character set to be used for :hardcopy
-'printmbfont'     'pmbfn'   font names to be used for CJK output of :hardcopy
-'printoptions'    'popt'    controls the format of :hardcopy output
-'pumheight''      'ph'      maximum height of the popup menu
-'quoteescape'     'qe'      escape characters used in a string
-'readonly'        'ro'      disallow writing the buffer
-'remap'                     allow mappings to work recursively
-'report'                    threshold for reporting nr. of lines changed
-'restorescreen'   'rs'      Win32: restore screen when exiting
-'revins'          'ri'      inserting characters will work backwards
-'rightleft'       'rl'      window is right-to-left oriented
-'rightleftcmd'    'rlc'     commands for which editing works right-to-left
-'ruler'           'ru'      show cursor line and column in the status line
-'rulerformat'     'ruf'     custom format for the ruler
-'runtimepath'     'rtp'     list of directories used for runtime files
-'scroll'          'scr'     lines to scroll with CTRL-U and CTRL-D
-'scrollbind'      'scb'     scroll in window as other windows scroll
-'scrolljump'      'sj'      minimum number of lines to scroll
-'scrolloff'       'so'      minimum nr. of lines above and below cursor
-'scrollopt'       'sbo'     how 'scrollbind' should behave
-'sections'        'sect'    nroff macros that separate sections
-'secure'                    secure mode for reading .vimrc in current dir
-'selection'       'sel'     what type of selection to use
-'selectmode'      'slm'     when to use Select mode instead of Visual mode
+'printmbfont'	  'pmbfn'   font names to be used for CJK output of :hardcopy
+'printoptions'	  'popt'    controls the format of :hardcopy output
+'pumheight''	  'ph'	    maximum height of the popup menu
+'quoteescape'	  'qe'	    escape characters used in a string
+'readonly'	  'ro'	    disallow writing the buffer
+'remap'			    allow mappings to work recursively
+'report'		    threshold for reporting nr. of lines changed
+'restorescreen'   'rs'	    Win32: restore screen when exiting
+'revins'	  'ri'	    inserting characters will work backwards
+'rightleft'	  'rl'	    window is right-to-left oriented
+'rightleftcmd'	  'rlc'     commands for which editing works right-to-left
+'ruler'		  'ru'	    show cursor line and column in the status line
+'rulerformat'	  'ruf'     custom format for the ruler
+'runtimepath'	  'rtp'     list of directories used for runtime files
+'scroll'	  'scr'     lines to scroll with CTRL-U and CTRL-D
+'scrollbind'	  'scb'     scroll in window as other windows scroll
+'scrolljump'	  'sj'	    minimum number of lines to scroll
+'scrolloff'	  'so'	    minimum nr. of lines above and below cursor
+'scrollopt'	  'sbo'     how 'scrollbind' should behave
+'sections'	  'sect'    nroff macros that separate sections
+'secure'		    secure mode for reading .vimrc in current dir
+'selection'	  'sel'     what type of selection to use
+'selectmode'	  'slm'     when to use Select mode instead of Visual mode
 'sessionoptions'  'ssop'    options for |:mksession|
-'shell'           'sh'      name of shell to use for external commands
-'shellcmdflag'    'shcf'    flag to shell to execute one command
-'shellpipe'       'sp'      string to put output of ":make" in error file
-'shellquote'      'shq'     quote character(s) for around shell command
-'shellredir'      'srr'     string to put output of filter in a temp file
-'shellslash'      'ssl'     use forward slash for shell file names
-'shelltemp'       'stmp'    whether to use a temp file for shell commands
-'shelltype'       'st'      Amiga: influences how to use a shell
-'shellxquote'     'sxq'     like 'shellquote', but include redirection
-'shiftround'      'sr'      round indent to multiple of shiftwidth
-'shiftwidth'      'sw'      number of spaces to use for (auto)indent step
-'shortmess'       'shm'     list of flags, reduce length of messages
-'shortname'       'sn'      non-MS-DOS: Filenames assumed to be 8.3 chars
-'showbreak'       'sbr'     string to use at the start of wrapped lines
-'showcmd'         'sc'      show (partial) command in status line
-'showfulltag'     'sft'     show full tag pattern when completing tag
-'showmatch'       'sm'      briefly jump to matching bracket if insert one
-'showmode'        'smd'     message on status line to show current mode
-'showtabline'     'stal'    tells when the tab pages line is displayed
-'sidescroll'      'ss'      minimum number of columns to scroll horizontal
+'shell'		  'sh'	    name of shell to use for external commands
+'shellcmdflag'	  'shcf'    flag to shell to execute one command
+'shellpipe'	  'sp'	    string to put output of ":make" in error file
+'shellquote'	  'shq'     quote character(s) for around shell command
+'shellredir'	  'srr'     string to put output of filter in a temp file
+'shellslash'	  'ssl'     use forward slash for shell file names
+'shelltemp'	  'stmp'    whether to use a temp file for shell commands
+'shelltype'	  'st'	    Amiga: influences how to use a shell
+'shellxquote'	  'sxq'     like 'shellquote', but include redirection
+'shiftround'	  'sr'	    round indent to multiple of shiftwidth
+'shiftwidth'	  'sw'	    number of spaces to use for (auto)indent step
+'shortmess'	  'shm'     list of flags, reduce length of messages
+'shortname'	  'sn'	    non-MS-DOS: Filenames assumed to be 8.3 chars
+'showbreak'	  'sbr'     string to use at the start of wrapped lines
+'showcmd'	  'sc'	    show (partial) command in status line
+'showfulltag'	  'sft'     show full tag pattern when completing tag
+'showmatch'	  'sm'	    briefly jump to matching bracket if insert one
+'showmode'	  'smd'     message on status line to show current mode
+'showtabline'	  'stal'    tells when the tab pages line is displayed
+'sidescroll'	  'ss'	    minimum number of columns to scroll horizontal
 'sidescrolloff'   'siso'    min. nr. of columns to left and right of cursor
-'smartcase'       'scs'     no ignore case when pattern has uppercase
-'smartindent'     'si'      smart autoindenting for C programs
-'smarttab'        'sta'     use 'shiftwidth' when inserting <Tab>
-'softtabstop'     'sts'     number of spaces that <Tab> uses while editing
-'spell'                     enable spell checking
+'smartcase'	  'scs'     no ignore case when pattern has uppercase
+'smartindent'	  'si'	    smart autoindenting for C programs
+'smarttab'	  'sta'     use 'shiftwidth' when inserting <Tab>
+'softtabstop'	  'sts'     number of spaces that <Tab> uses while editing
+'spell'			    enable spell checking
 'spellcapcheck'   'spc'     pattern to locate end of a sentence
-'spellfile'       'spf'     files where |zg| and |zw| store words
-'spelllang'       'spl'     language(s) to do spell checking for
-'spellsuggest'    'sps'     method(s) used to suggest spelling corrections
-'splitbelow'      'sb'      new window from split is below the current one
-'splitright'      'spr'     new window is put right of the current one
-'startofline'     'sol'     commands move cursor to first blank in line
-'statusline'      'stl'     custom format for the status line
-'suffixes'        'su'      suffixes that are ignored with multiple match
-'suffixesadd'     'sua'     suffixes added when searching for a file
-'swapfile'        'swf'     whether to use a swapfile for a buffer
-'swapsync'        'sws'     how to sync the swap file
-'switchbuf'       'swb'     sets behavior when switching to another buffer
-'synmaxcol'       'smc'     maximum column to find syntax items
-'syntax'          'syn'     syntax to be loaded for current buffer
-'tabstop'         'ts'      number of spaces that <Tab> in file uses
-'tabline'         'tal'     custom format for the console tab pages line
-'tabpagemax'      'tpm'     maximum number of tab pages for |-p| and "tab all"
-'tagbsearch'      'tbs'     use binary searching in tags files
-'taglength'       'tl'      number of significant characters for a tag
-'tagrelative'     'tr'      file names in tag file are relative
-'tags'            'tag'     list of file names used by the tag command
-'tagstack'        'tgst'    push tags onto the tag stack
-'term'                      name of the terminal
-'termbidi'        'tbidi'   terminal takes care of bi-directionality
-'termencoding'    'tenc'    character encoding used by the terminal
-'terse'                     shorten some messages
-'textauto'        'ta'      obsolete, use 'fileformats'
-'textmode'        'tx'      obsolete, use 'fileformat'
-'textwidth'       'tw'      maximum width of text that is being inserted
-'thesaurus'       'tsr'     list of thesaurus files for keyword completion
-'tildeop'         'top'     tilde command "~" behaves like an operator
-'timeout'         'to'      time out on mappings and key codes
-'timeoutlen'      'tm'      time out time in milliseconds
-'title'                     let Vim set the title of the window
-'titlelen'                  percentage of 'columns' used for window title
-'titleold'                  old title, restored when exiting
-'titlestring'               string to use for the Vim window title
-'toolbar'         'tb'      GUI: which items to show in the toolbar
+'spellfile'	  'spf'     files where |zg| and |zw| store words
+'spelllang'	  'spl'     language(s) to do spell checking for
+'spellsuggest'	  'sps'     method(s) used to suggest spelling corrections
+'splitbelow'	  'sb'	    new window from split is below the current one
+'splitright'	  'spr'     new window is put right of the current one
+'startofline'	  'sol'     commands move cursor to first blank in line
+'statusline'	  'stl'     custom format for the status line
+'suffixes'	  'su'	    suffixes that are ignored with multiple match
+'suffixesadd'	  'sua'     suffixes added when searching for a file
+'swapfile'	  'swf'     whether to use a swapfile for a buffer
+'swapsync'	  'sws'     how to sync the swap file
+'switchbuf'	  'swb'     sets behavior when switching to another buffer
+'synmaxcol'	  'smc'     maximum column to find syntax items
+'syntax'	  'syn'     syntax to be loaded for current buffer
+'tabstop'	  'ts'	    number of spaces that <Tab> in file uses
+'tabline'	  'tal'     custom format for the console tab pages line
+'tabpagemax'	  'tpm'     maximum number of tab pages for |-p| and "tab all"
+'tagbsearch'	  'tbs'     use binary searching in tags files
+'taglength'	  'tl'	    number of significant characters for a tag
+'tagrelative'	  'tr'	    file names in tag file are relative
+'tags'		  'tag'     list of file names used by the tag command
+'tagstack'	  'tgst'    push tags onto the tag stack
+'term'			    name of the terminal
+'termbidi'	  'tbidi'   terminal takes care of bi-directionality
+'termencoding'	  'tenc'    character encoding used by the terminal
+'terse'			    shorten some messages
+'textauto'	  'ta'	    obsolete, use 'fileformats'
+'textmode'	  'tx'	    obsolete, use 'fileformat'
+'textwidth'	  'tw'	    maximum width of text that is being inserted
+'thesaurus'	  'tsr'     list of thesaurus files for keyword completion
+'tildeop'	  'top'     tilde command "~" behaves like an operator
+'timeout'	  'to'	    time out on mappings and key codes
+'timeoutlen'	  'tm'	    time out time in milliseconds
+'title'			    let Vim set the title of the window
+'titlelen'		    percentage of 'columns' used for window title
+'titleold'		    old title, restored when exiting
+'titlestring'		    string to use for the Vim window title
+'toolbar'	  'tb'	    GUI: which items to show in the toolbar
 'toolbariconsize' 'tbis'    size of the toolbar icons (for GTK 2 only)
-'ttimeout'                  time out on mappings
-'ttimeoutlen'     'ttm'     time out time for key codes in milliseconds
-'ttybuiltin'      'tbi'     use built-in termcap before external termcap
-'ttyfast'         'tf'      indicates a fast terminal connection
-'ttymouse'        'ttym'    type of mouse codes generated
-'ttyscroll'       'tsl'     maximum number of lines for a scroll
-'ttytype'         'tty'     alias for 'term'
-'undolevels'      'ul'      maximum number of changes that can be undone
-'updatecount'     'uc'      after this many characters flush swap file
-'updatetime'      'ut'      after this many milliseconds flush swap file
-'verbose'         'vbs'     give informative messages
-'verbosefile'     'vfile'   file to write messages in
-'viewdir'         'vdir'    directory where to store files with :mkview
-'viewoptions'     'vop'     specifies what to save for :mkview
-'viminfo'         'vi'      use .viminfo file upon startup and exiting
-'virtualedit'     've'      when to use virtual editing
-'visualbell'      'vb'      use visual bell instead of beeping
-'warn'                      warn for shell command when buffer was changed
-'weirdinvert'     'wi'      for terminals that have weird inversion method
-'whichwrap'       'ww'      allow specified keys to cross line boundaries
-'wildchar'        'wc'      command-line character for wildcard expansion
-'wildcharm'       'wcm'     like 'wildchar' but also works when mapped
-'wildignore'      'wig'     files matching these patterns are not completed
-'wildmenu'        'wmnu'    use menu for command line completion
-'wildmode'        'wim'     mode for 'wildchar' command-line expansion
-'wildoptions'     'wop'     specifies how command line completion is done.
-'winaltkeys'      'wak'     when the windows system handles ALT keys
-'winheight'       'wh'      minimum number of lines for the current window
-'winfixheight'    'wfh'     keep window height when opening/closing windows
-'winfixwidth'     'wfw'     keep window width when opening/closing windows
-'winminheight'    'wmh'     minimum number of lines for any window
-'winminwidth'     'wmw'     minimal number of columns for any window
-'winwidth'        'wiw'     minimal number of columns for current window
-'wrap'                      long lines wrap and continue on the next line
-'wrapmargin'      'wm'      chars from the right where wrapping starts
-'wrapscan'        'ws'      searches wrap around the end of the file
-'write'                     writing to a file is allowed
-'writeany'        'wa'      write to file with no need for "!" override
-'writebackup'     'wb'      make a backup before overwriting a file
-'writedelay'      'wd'      delay this many msec for each char (for debug)
+'ttimeout'		    time out on mappings
+'ttimeoutlen'	  'ttm'     time out time for key codes in milliseconds
+'ttybuiltin'	  'tbi'     use built-in termcap before external termcap
+'ttyfast'	  'tf'	    indicates a fast terminal connection
+'ttymouse'	  'ttym'    type of mouse codes generated
+'ttyscroll'	  'tsl'     maximum number of lines for a scroll
+'ttytype'	  'tty'     alias for 'term'
+'undolevels'	  'ul'	    maximum number of changes that can be undone
+'updatecount'	  'uc'	    after this many characters flush swap file
+'updatetime'	  'ut'	    after this many milliseconds flush swap file
+'verbose'	  'vbs'     give informative messages
+'verbosefile'	  'vfile'   file to write messages in
+'viewdir'	  'vdir'    directory where to store files with :mkview
+'viewoptions'	  'vop'     specifies what to save for :mkview
+'viminfo'	  'vi'	    use .viminfo file upon startup and exiting
+'virtualedit'	  've'	    when to use virtual editing
+'visualbell'	  'vb'	    use visual bell instead of beeping
+'warn'			    warn for shell command when buffer was changed
+'weirdinvert'	  'wi'	    for terminals that have weird inversion method
+'whichwrap'	  'ww'	    allow specified keys to cross line boundaries
+'wildchar'	  'wc'	    command-line character for wildcard expansion
+'wildcharm'	  'wcm'     like 'wildchar' but also works when mapped
+'wildignore'	  'wig'     files matching these patterns are not completed
+'wildmenu'	  'wmnu'    use menu for command line completion
+'wildmode'	  'wim'     mode for 'wildchar' command-line expansion
+'wildoptions'	  'wop'     specifies how command line completion is done.
+'winaltkeys'	  'wak'     when the windows system handles ALT keys
+'winheight'	  'wh'	    minimum number of lines for the current window
+'winfixheight'	  'wfh'     keep window height when opening/closing windows
+'winfixwidth'	  'wfw'     keep window width when opening/closing windows
+'winminheight'	  'wmh'     minimum number of lines for any window
+'winminwidth'	  'wmw'     minimal number of columns for any window
+'winwidth'	  'wiw'     minimal number of columns for current window
+'wrap'			    long lines wrap and continue on the next line
+'wrapmargin'	  'wm'	    chars from the right where wrapping starts
+'wrapscan'	  'ws'	    searches wrap around the end of the file
+'write'			    writing to a file is allowed
+'writeany'	  'wa'	    write to file with no need for "!" override
+'writebackup'	  'wb'	    make a backup before overwriting a file
+'writedelay'	  'wd'	    delay this many msec for each char (for debug)
 ------------------------------------------------------------------------------
 *Q_ur*		Undo/Redo commands
 
@@ -975,7 +975,7 @@ Short explanation of each option:		*option-list*
 |ga|		   ga		show ascii value of character under cursor in
 				   decimal, hex, and octal
 |g8|		   g8		for utf-8 encoding: show byte sequence for
-			 	   character under cursor in hex.
+				   character under cursor in hex.
 |g_CTRL-G|	   g CTRL-G	show cursor column, line, and character
 				   position
 |CTRL-C|	   CTRL-C	during searches: Interrupt the search
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
index e99be2611..e639b3541 100644
--- a/runtime/doc/quotes.txt
+++ b/runtime/doc/quotes.txt
@@ -1,4 +1,4 @@
-*quotes.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*quotes.txt*    For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index 44d695273..d6e176e27 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*recover.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index d3d4a3878..557918d94 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -1,4 +1,4 @@
-*remote.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*remote.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -45,19 +45,19 @@ The following command line arguments are available:
    --remote-wait-silent [+{cmd}] {file} ...		*--remote-wait-silent*
 				As --remote-wait, but don't complain if there
 				is no server.
-    							*--remote-tab*
+							*--remote-tab*
    --remote-tab			Like --remote but open each file in a new
-    				tabpage.
-    							*--remote-tab-silent*
+				tabpage.
+							*--remote-tab-silent*
    --remote-tab-silent		Like --remote-silent but open each file in a
-    				new tabpage.
+				new tabpage.
 							*--remote-tab-wait*
    --remote-tab-wait		Like --remote-wait but open each file in a new
-    				tabpage.
+				tabpage.
 
-    						*--remote-tab-wait-silent*
+						*--remote-tab-wait-silent*
    --remote-tab-wait-silent	Like --remote-wait-silent but open each file
-    				in a new tabpage.
+				in a new tabpage.
 								*--servername*
    --servername {name}		Become the server {name}.  When used together
 				with one of the --remote commands: connect to
@@ -67,7 +67,7 @@ The following command line arguments are available:
    --remote-send {keys}		Send {keys} to server and exit.
 								*--remote-expr*
    --remote-expr {expr}		Evaluate {expr} in server and print the result
-   				on stdout.
+				on stdout.
 								*--serverlist*
    --serverlist			Output a list of server names.
 
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 7c3ad67c1..6b9a55b88 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*repeat.txt*    For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -606,11 +606,11 @@ numbers prepended for the explanation:
   4  Self time:   0.002006 ~
   5  ~
   6 count  total (s)   self (s) ~
-  7     9              0.000096   for i in range(8) ~
-  8     8   0.153655   0.000410     call Test3() ~
-  9     8              0.000070   endfor ~
- 10                               " Ask a question ~
- 11     1              0.001341   echo input("give me an answer: ") ~
+  7	9	       0.000096   for i in range(8) ~
+  8	8   0.153655   0.000410     call Test3() ~
+  9	8	       0.000070   endfor ~
+ 10				  " Ask a question ~
+ 11	1	       0.001341   echo input("give me an answer: ") ~
 
 The header (lines 1-4) gives the time for the whole function.  The "Total"
 time is the time passed while the function was executing.  The "Self" time is
@@ -649,7 +649,7 @@ mind there are various things that may clobber the results:
 
 - Functions that are deleted before Vim exits will not produce profiling
   information.  You can check the |v:profiling| variable if needed: >
-  	:if !v:profiling
+	:if !v:profiling
 	:   delfunc MyFunc
 	:endif
 <
diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt
index eea287183..8d5f152a9 100644
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*rileft.txt*    For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Avner Lottem
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
index 0f6dcec01..db3cc9949 100644
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*russian.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Vassily Ragosin
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 5a834a5f1..2881a2afb 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -1,4 +1,4 @@
-*scroll.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*scroll.txt*    For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 0e8233e0e..54ae6d64b 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.0f.  Last change: 2006 Apr 24
+*sign.txt*      For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 8b0c8838e..d69c7adcc 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*spell.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -698,11 +698,11 @@ Additionally the following items are recognized:
   know something won't work.
 
 - A "/" may follow the word with the following items:
-    =   	Case must match exactly.
+    =		Case must match exactly.
     ?		Rare word.
     !		Bad (wrong) word.
     digit	A region in which the word is valid.  If no regions are
-    		specified the word is valid in all regions.
+		specified the word is valid in all regions.
 
 Example:
 
@@ -857,12 +857,12 @@ right encoding.
 
 				*spell-NAME* *spell-VERSION* *spell-HOME*
 				*spell-AUTHOR* *spell-EMAIL* *spell-COPYRIGHT*
-	NAME	  	Name of the language
-	VERSION   	1.0.1  with fixes
+	NAME		Name of the language
+	VERSION		1.0.1  with fixes
 	HOME		http://www.myhome.eu
 	AUTHOR		John Doe
 	EMAIL		john AT Doe DOT net
-	COPYRIGHT   	LGPL
+	COPYRIGHT	LGPL
 
 These fields are put in the .spl file as-is.  The |:spellinfo| command can be
 used to view the info.
@@ -1023,7 +1023,7 @@ Note: Myspell ignores any extra text after the relevant info.  Vim requires
 this text to start with a "#" so that mistakes don't go unnoticed.  Example:
 
 	SFX F 0 in   [^i]n      # Spion > Spionin  ~
-	SFX F 0 nen  in         # Bauerin > Bauerinnen ~
+	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
@@ -1087,7 +1087,7 @@ An alternative is to only specify the suffix, and give the that suffix two
 flags: The required prefix and the NEEDAFFIX flag.  |spell-NEEDAFFIX|
 
 
-PFXPOSTPONE					    	*spell-PFXPOSTPONE*
+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
@@ -1434,10 +1434,10 @@ 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.
 Simplistic example:
 
-	SAL CIA                  X ~
-	SAL CH                   X ~
-	SAL C                    K ~
-	SAL K                    K ~
+	SAL CIA			 X ~
+	SAL CH			 X ~
+	SAL C			 K ~
+	SAL K			 K ~
 
 There are a few rules and this can become quite complicated.  An explanation
 how it works can be found in the Aspell manual:
@@ -1510,10 +1510,10 @@ COMPLEXPREFIXES  (Hunspell)				*spell-COMPLEXPREFIXES*
 		Enables using two prefixes.  Not supported.
 
 COMPOUND	(Hunspell)				*spell-COMPOUND*
-                This is one line with the count of COMPOUND items, followd by
-                that many COMPOUND lines with a pattern.
-                Remove the first line with the count and rename the other
-                items to COMPOUNDRULE |spell-COMPOUNDRULE|
+		This is one line with the count of COMPOUND items, followd by
+		that many COMPOUND lines with a pattern.
+		Remove the first line with the count and rename the other
+		items to COMPOUNDRULE |spell-COMPOUNDRULE|
 
 COMPOUNDFIRST	(Hunspell)				*spell-COMPOUNDFIRST*
 		Use COMPOUNDRULE instead. |spell-COMPOUNDRULE|
diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt
index d08de49f5..70a3ae595 100644
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*sponsor.txt*   For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -208,7 +208,7 @@ to let him know that the donation is done because of the use of Vim.
 
 Can you send me a bill?
 
-No, because there is no relation between the money you send and the work that 
+No, because there is no relation between the money you send and the work that
 is done.  But a receipt is possible.
 
 
diff --git a/runtime/doc/sql.txt b/runtime/doc/sql.txt
index e7d40d667..f089012b8 100644
--- a/runtime/doc/sql.txt
+++ b/runtime/doc/sql.txt
@@ -1,4 +1,4 @@
-*sql.txt*   	For Vim version 7.0f.  Last change: Wed Apr 26 2006 3:05:33 PM
+*sql.txt*	For Vim version 7.0g.  Last change: Wed Apr 26 2006 3:05:33 PM
 
 by David Fishburn
 
@@ -8,40 +8,40 @@ The Structured Query Language (SQL) is a standard which specifies statements
 that allow a user to interact with a relational database.  Vim includes
 features for navigation, indentation and syntax highlighting.
 
-1. Navigation                                   |sql-navigation|
-    1.1 Matchit		        		|sql-matchit|
-    1.2 Text Object Motions		        |sql-object-motions|
-    1.3 Predefined Object Motions               |sql-predefined-objects|
-    1.4 Macros                                  |sql-macros|
-2. SQL Dialects		                        |sql-dialects|
-    2.1 SQLSetType		        	|SQLSetType|
-    2.2 SQL Dialect Default		        |sql-type-default|
-3. Adding new SQL Dialects		        |sql-adding-dialects|
-4. OMNI SQL Completion  		        |sql-completion|
-    4.1 Static mode		        	|sql-completion-static|
-    4.2 Dynamic mode    		        |sql-completion-dynamic|
+1. Navigation					|sql-navigation|
+    1.1 Matchit					|sql-matchit|
+    1.2 Text Object Motions			|sql-object-motions|
+    1.3 Predefined Object Motions		|sql-predefined-objects|
+    1.4 Macros					|sql-macros|
+2. SQL Dialects					|sql-dialects|
+    2.1 SQLSetType				|SQLSetType|
+    2.2 SQL Dialect Default			|sql-type-default|
+3. Adding new SQL Dialects			|sql-adding-dialects|
+4. OMNI SQL Completion				|sql-completion|
+    4.1 Static mode				|sql-completion-static|
+    4.2 Dynamic mode				|sql-completion-dynamic|
     4.3 Tutorial				|sql-completion-tutorial|
-        4.3.1 Complete Tables			|sql-completion-tables|
-        4.3.2 Complete Columns			|sql-completion-columns|
-        4.3.3 Complete Procedures		|sql-completion-procedures|
-        4.3.4 Complete Views			|sql-completion-views|
+	4.3.1 Complete Tables			|sql-completion-tables|
+	4.3.2 Complete Columns			|sql-completion-columns|
+	4.3.3 Complete Procedures		|sql-completion-procedures|
+	4.3.4 Complete Views			|sql-completion-views|
     4.4 Completion Customization		|sql-completion-customization|
-    4.5 SQL Maps	        		|sql-completion-maps|
+    4.5 SQL Maps				|sql-completion-maps|
     4.6 Using with other filetypes		|sql-completion-filetypes|
 
 ==============================================================================
-1. Navigation	        			*sql-navigation*
+1. Navigation					*sql-navigation*
 
 The SQL ftplugin provides a number of options to assist with file
 navigation.
 
 
-1.1 Matchit		        		*sql-matchit*
+1.1 Matchit					*sql-matchit*
 -----------
 The matchit plugin (http://www.vim.org/scripts/script.php?script_id=39)
 provides many additional features and can be customized for different
-languages.  The matchit plugin is configured by defining a local 
-buffer variable, b:match_words.  Pressing the % key while on various 
+languages.  The matchit plugin is configured by defining a local
+buffer variable, b:match_words.  Pressing the % key while on various
 keywords will move the cursor to its match.  For example, if the cursor
 is on an "if", pressing % will cycle between the "else", "elseif" and
 "end if" keywords.
@@ -51,40 +51,40 @@ The following keywords are supported: >
     elseif | elsif
     else [if]
     end if
-    
+
     [while condition] loop
-        leave
-        break
-        continue
-        exit
+	leave
+	break
+	continue
+	exit
     end loop
-    
+
     for
-        leave
-        break
-        continue
-        exit
+	leave
+	break
+	continue
+	exit
     end loop
-    
+
     do
-        statements
+	statements
     doend
-    
+
     case
-    when 
+    when
     when
     default
     end case
-    
+
     merge
     when not matched
     when matched
 
     create[ or replace] procedure|function|event
     returns
- 
 
-1.2 Text Object Motions		        	*sql-object-motions*
+
+1.2 Text Object Motions				*sql-object-motions*
 -----------------------
 Vim has a number of predefined keys for working with text |object-motions|.
 This filetype plugin attempts to translate these keys to maps which make sense
@@ -92,13 +92,13 @@ for the SQL language.
 
 The following |Normal| mode and |Visual| mode maps exist (when you edit a SQL
 file): >
-    ]]              move forward to the next 'begin'
-    [[              move backwards to the previous 'begin'
-    ][              move forward to the next 'end'
-    []              move backwards to the previous 'end'
- 
+    ]]		    move forward to the next 'begin'
+    [[		    move backwards to the previous 'begin'
+    ][		    move forward to the next 'end'
+    []		    move backwards to the previous 'end'
 
-1.3 Predefined Object Motions                   *sql-predefined-objects*
+
+1.3 Predefined Object Motions			*sql-predefined-objects*
 -----------------------------
 Most relational databases support various standard features, tables, indices,
 triggers and stored procedures.  Each vendor also has a variety of proprietary
@@ -109,44 +109,44 @@ standard objects, plus many additional ones.  In order to make this as
 flexible as possible, you can override the list of objects from within your
 |vimrc| with the following: >
     let g:ftplugin_sql_objects = 'function,procedure,event,table,trigger' .
-                \ ',schema,service,publication,database,datatype,domain' .
-                \ ',index,subscription,synchronization,view,variable'
-                 
+		\ ',schema,service,publication,database,datatype,domain' .
+		\ ',index,subscription,synchronization,view,variable'
+
 The following |Normal| mode and |Visual| mode maps have been created which use
 the above list: >
-    ]}              move forward to the next 'create <object name>'
-    [{              move backward to the previous 'create <object name>'
+    ]}		    move forward to the next 'create <object name>'
+    [{		    move backward to the previous 'create <object name>'
 
 Repeatedly pressing ]} will cycle through each of these create statements: >
     create table t1 (
-        ...
+	...
     );
 
     create procedure p1
     begin
-        ...
+	...
     end;
 
     create index i1 on t1 (c1);
- 
+
 The default setting for g:ftplugin_sql_objects is: >
     let g:ftplugin_sql_objects = 'function,procedure,event,' .
-                \ '\\(existing\\\\|global\\s\\+temporary\\s\\+\\)\\\{,1}' .
-                \ 'table,trigger' .
-                \ ',schema,service,publication,database,datatype,domain' .
-                \ ',index,subscription,synchronization,view,variable'
- 
+		\ '\\(existing\\\\|global\\s\\+temporary\\s\\+\\)\\\{,1}' .
+		\ 'table,trigger' .
+		\ ',schema,service,publication,database,datatype,domain' .
+		\ ',index,subscription,synchronization,view,variable'
+
 The above will also handle these cases: >
     create table t1 (
-        ...
+	...
     );
     create existing table t2 (
-        ...
+	...
     );
     create global temporary table t3 (
-        ...
+	...
     );
- 
+
 By default, the ftplugin only searches for CREATE statements.  You can also
 override this via your |vimrc| with the following: >
     let g:ftplugin_sql_statements = 'create,alter'
@@ -155,43 +155,43 @@ The filetype plugin defines three types of comments: >
     1.  --
     2.  //
     3.  /*
-         *
-         */
-          
+	 *
+	 */
+
 The following |Normal| mode and |Visual| mode maps have been created to work
 with comments: >
-    ]"              move forward to the beginning of a comment
-    ["              move forward to the end of a comment
+    ]"		    move forward to the beginning of a comment
+    ["		    move forward to the end of a comment
 
 
 
-1.4 Macros                                         *sql-macros*
+1.4 Macros					   *sql-macros*
 ----------
 Vim's feature to find macro definitions, |'define'|, is supported using this
 regular expression: >
     \c\<\(VARIABLE\|DECLARE\|IN\|OUT\|INOUT\)\>
- 
+
 This addresses the following code: >
     CREATE VARIABLE myVar1 INTEGER;
 
     CREATE PROCEDURE sp_test(
-        IN myVar2 INTEGER,
-        OUT myVar3 CHAR(30),
-        INOUT myVar4 NUMERIC(20,0)
+	IN myVar2 INTEGER,
+	OUT myVar3 CHAR(30),
+	INOUT myVar4 NUMERIC(20,0)
     )
     BEGIN
-        DECLARE myVar5 INTEGER;
+	DECLARE myVar5 INTEGER;
 
-        SELECT c1, c2, c3
-          INTO myVar2, myVar3, myVar4
-          FROM T1
-         WHERE c4 = myVar1;
+	SELECT c1, c2, c3
+	  INTO myVar2, myVar3, myVar4
+	  FROM T1
+	 WHERE c4 = myVar1;
     END;
- 
+
 Place your cursor on "myVar1" on this line: >
-         WHERE c4 = myVar1;
-                     ^
- 
+	 WHERE c4 = myVar1;
+		     ^
+
 Press any of the following keys: >
     [d
     [D
@@ -199,17 +199,17 @@ Press any of the following keys: >
 
 
 ==============================================================================
-2. SQL Dialects	        			*sql-dialects* *sql-types*
-                                                *sybase* *TSQL* *Transact-SQL*
-                                                *sqlanywhere* 
-                                                *oracle* *plsql* *sqlj*
-                                                *sqlserver*
-                                                *mysql* *postgress* *psql*
-                                                *informix*
+2. SQL Dialects					*sql-dialects* *sql-types*
+						*sybase* *TSQL* *Transact-SQL*
+						*sqlanywhere*
+						*oracle* *plsql* *sqlj*
+						*sqlserver*
+						*mysql* *postgress* *psql*
+						*informix*
 
 All relational databases support SQL.  There is a portion of SQL that is
 portable across vendors (ex. CREATE TABLE, CREATE INDEX), but there is a
-great deal of vendor specific extensions to SQL.  Oracle supports the 
+great deal of vendor specific extensions to SQL.  Oracle supports the
 "CREATE OR REPLACE" syntax, column defaults specified in the CREATE TABLE
 statement and the procedural language (for stored procedures and triggers).
 
@@ -229,13 +229,13 @@ The majority of people work with only one vendor's database product, it would
 be nice to specify a default in your |vimrc|.
 
 
-2.1 SQLSetType		        		*sqlsettype* *SQLSetType*
+2.1 SQLSetType					*sqlsettype* *SQLSetType*
 --------------
 For the people that work with many different databases, it would be nice to be
 able to flip between the various vendors rules (indent, syntax) on a per
 buffer basis, at any time.  The ftplugin/sql.vim file defines this function: >
     SQLSetType
- 
+
 Executing this function without any parameters will set the indent and syntax
 scripts back to their defaults, see |sql-type-default|.  If you have turned
 off Vi's compatibility mode, |'compatible'|, you can use the <Tab> key to
@@ -247,19 +247,19 @@ source.  Using the |cmdline-completion| feature, the SQLSetType function will
 search the |'runtimepath'| for all Vim scripts with a name containing 'sql'.
 This takes the guess work out of the spelling of the names.  The following are
 examples: >
-    :SQLSetType 
+    :SQLSetType
     :SQLSetType sqloracle
     :SQLSetType sqlanywhere
     :SQLSetType sqlinformix
     :SQLSetType mysql
- 
+
 The easiest approach is to the use <Tab> character which will first complete
 the command name (SQLSetType), after a space and another <Tab>, display a list
 of available Vim script names: >
     :SQL<Tab><space><Tab>
- 
 
-2.2 SQL Dialect Default		        	*sql-type-default*
+
+2.2 SQL Dialect Default				*sql-type-default*
 -----------------------
 As mentioned earlier, the default syntax rules for Vim is based on Oracle
 (PL/SQL).  You can override this default by placing one of the following in
@@ -267,11 +267,11 @@ your |vimrc|: >
     let g:sql_type_default = 'sqlanywhere'
     let g:sql_type_default = 'sqlinformix'
     let g:sql_type_default = 'mysql'
- 
+
 If you added the following to your |vimrc|: >
     let g:sql_type_default = 'sqlinformix'
- 
-The next time edit a SQL file the following scripts will be automatically 
+
+The next time edit a SQL file the following scripts will be automatically
 loaded by Vim: >
     ftplugin/sql.vim
     syntax/sqlinformix.vim
@@ -283,7 +283,7 @@ exist.
 
 
 ==============================================================================
-3. Adding new SQL Dialects		        *sql-adding-dialects*
+3. Adding new SQL Dialects			*sql-adding-dialects*
 
 If you begin working with a SQL dialect which does not have any customizations
 available with the default Vim distribution you can check http://www.vim.org
@@ -294,22 +294,22 @@ To help identify these scripts, try to create the files with a "sql" prefix.
 If you decide you wish to create customizations for the SQLite database, you
 can create any of the following: >
     Unix
-        ~/.vim/syntax/sqlite.vim
-        ~/.vim/indent/sqlite.vim
+	~/.vim/syntax/sqlite.vim
+	~/.vim/indent/sqlite.vim
     Windows
-        $VIM/vimfiles/syntax/sqlite.vim
-        $VIM/vimfiles/indent/sqlite.vim
- 
+	$VIM/vimfiles/syntax/sqlite.vim
+	$VIM/vimfiles/indent/sqlite.vim
+
 No changes are necessary to the SQLSetType function.  It will automatically
-pickup the new SQL files and load them when you issue the SQLSetType command. 
+pickup the new SQL files and load them when you issue the SQLSetType command.
 
 
 ==============================================================================
-4. OMNI SQL Completion  		        *sql-completion* 
-                                                *omni-sql-completion*
+4. OMNI SQL Completion				*sql-completion*
+						*omni-sql-completion*
 
 Vim 7 includes a code completion interface and functions which allows plugin
-developers to build in code completion for any language.  Vim 7 includes 
+developers to build in code completion for any language.  Vim 7 includes
 code completion for the SQL language.
 
 There are two modes to the SQL completion plugin, static and dynamic.  The
@@ -318,7 +318,7 @@ highlight rules.  The dynamic mode populates the popups with data retrieved
 directly from a database.  This includes, table lists, column lists,
 procedures names and more.
 
-4.1 Static Mode  		                *sql-completion-static*
+4.1 Static Mode					*sql-completion-static*
 ---------------
 The static popups created contain items defined by the active syntax rules
 while editing a file with a filetype of SQL.  The plugin defines (by default)
@@ -330,39 +330,39 @@ The defaults static maps are: >
     imap <buffer> <C-C>o <C-\><C-O>:call sqlcomplete#Map('sqlOption')<CR><C-X><C-O>
     imap <buffer> <C-C>T <C-\><C-O>:call sqlcomplete#Map('sqlType')<CR><C-X><C-O>
     imap <buffer> <C-C>s <C-\><C-O>:call sqlcomplete#Map('sqlStatement')<CR><C-X><C-O>
-  
+
 The static maps (which are based on the syntax highlight groups) follow this
 format: >
     imap <buffer> <C-C>k <C-\><C-O>:call sqlcomplete#Map('sqlKeyword')<CR><C-X><C-O>
- 
+
 This command breaks down as: >
-    imap                   - Create an insert map
-    <buffer>               - Only for this buffer
-    <C-C>k                 - Your choice of key map
-    <C-\><C-O>             - Execute one command, return to Insert mode
+    imap		   - Create an insert map
+    <buffer>		   - Only for this buffer
+    <C-C>k		   - Your choice of key map
+    <C-\><C-O>		   - Execute one command, return to Insert mode
     :call sqlcomplete#Map( - Allows the SQL completion plugin to perform some
-                             housekeeping functions to allow it to be used in
-                             conjunction with other completion plugins.
-                             Indicate which item you want the SQL completion
-                             plugin to complete.
-                             In this case we are asking the plugin to display
-                             items from the syntax highlight group
-                             'sqlKeyword'.
-                             You can view a list of highlight group names to
-                             choose from by executing the
-                                 :syntax list
-                             command while editing a SQL file.
-    'sqlKeyword'           - Display the items for the sqlKeyword highlight
-                             group
-    )<CR>                  - Execute the :let command
-    <C-X><C-O>             - Trigger the standard omni completion key stroke.
-                             Passing in 'sqlKeyword' instructs the SQL
-                             completion plugin to populate the popup with
-                             items from the sqlKeyword highlight group.  The
-                             plugin will also cache this result until Vim is
-                             restarted.  The syntax list is retrieved using
-                             the syntaxcomplete plugin.
- 
+			     housekeeping functions to allow it to be used in
+			     conjunction with other completion plugins.
+			     Indicate which item you want the SQL completion
+			     plugin to complete.
+			     In this case we are asking the plugin to display
+			     items from the syntax highlight group
+			     'sqlKeyword'.
+			     You can view a list of highlight group names to
+			     choose from by executing the
+				 :syntax list
+			     command while editing a SQL file.
+    'sqlKeyword'	   - Display the items for the sqlKeyword highlight
+			     group
+    )<CR>		   - Execute the :let command
+    <C-X><C-O>		   - Trigger the standard omni completion key stroke.
+			     Passing in 'sqlKeyword' instructs the SQL
+			     completion plugin to populate the popup with
+			     items from the sqlKeyword highlight group.  The
+			     plugin will also cache this result until Vim is
+			     restarted.  The syntax list is retrieved using
+			     the syntaxcomplete plugin.
+
 Using the 'syntax' keyword is a special case.  This instructs the
 syntaxcomplete plugin to retrieve all syntax items.  So this will effectively
 work for any of Vim's SQL syntax files.  At the time of writing this includes
@@ -371,77 +371,77 @@ above, |sql-dialects|).
 
 Here are some examples of the entries which are pulled from the syntax files: >
      All
-         - Contains the contents of all syntax highlight groups
+	 - Contains the contents of all syntax highlight groups
      Statements
-         - Select, Insert, Update, Delete, Create, Alter, ...
+	 - Select, Insert, Update, Delete, Create, Alter, ...
      Functions
-         - Min, Max, Trim, Round, Date, ...
+	 - Min, Max, Trim, Round, Date, ...
      Keywords
-         - Index, Database, Having, Group, With
+	 - Index, Database, Having, Group, With
      Options
-         - Isolation_level, On_error, Qualify_owners, Fire_triggers, ...
+	 - Isolation_level, On_error, Qualify_owners, Fire_triggers, ...
      Types
-         - Integer, Char, Varchar, Date, DateTime, Timestamp, ...
- 
- 
-4.2 Dynamic Mode  		                *sql-completion-dynamic*
+	 - Integer, Char, Varchar, Date, DateTime, Timestamp, ...
+
+
+4.2 Dynamic Mode				*sql-completion-dynamic*
 ----------------
 Dynamic mode populates the popups with data directly from a database.  In
 order for the dynamic feature to be enabled you must have the dbext.vim
 plugin installed, (http://vim.sourceforge.net/script.php?script_id=356).
 
-Dynamic mode is used by several features of the SQL completion plugin.  
+Dynamic mode is used by several features of the SQL completion plugin.
 After installing the dbext plugin see the dbext-tutorial for additional
 configuration and usage.  The dbext plugin allows the SQL completion plugin
 to display a list of tables, procedures, views and columns. >
      Table List
-         - All tables for all schema owners
+	 - All tables for all schema owners
      Procedure List
-         - All stored procedures for all schema owners
+	 - All stored procedures for all schema owners
      View List
-         - All stored procedures for all schema owners
+	 - All stored procedures for all schema owners
      Column List
-         - For the selected table, the columns that are part of the table
- 
+	 - For the selected table, the columns that are part of the table
+
 To enable the popup, while in INSERT mode, use the following key combinations
-for each group (where <C-C> means hold the CTRL key down while pressing 
+for each group (where <C-C> means hold the CTRL key down while pressing
 the space bar):
-     Table List             - <C-C>t
-                            - <C-X><C-O> (the default map assumes tables)
+     Table List		    - <C-C>t
+			    - <C-X><C-O> (the default map assumes tables)
      Stored Procedure List  - <C-C>p
-     View List              - <C-C>v
-     Column List            - <C-C>c
+     View List		    - <C-C>v
+     Column List	    - <C-C>c
 
      Windows platform only  - When viewing a popup window displaying the list
-                              of tables, you can press <C-Right>, this will
-                              replace the table currently highlighted with
-                              the column list for that table.
-                            - When viewing a popup window displaying the list
-                              of columns, you can press <C-Left>, this will
-                              replace the column list with the list of tables.
-                            - This allows you to quickly drill down into a
-                              table to view it's columns and back again.
- 
+			      of tables, you can press <C-Right>, this will
+			      replace the table currently highlighted with
+			      the column list for that table.
+			    - When viewing a popup window displaying the list
+			      of columns, you can press <C-Left>, this will
+			      replace the column list with the list of tables.
+			    - This allows you to quickly drill down into a
+			      table to view it's columns and back again.
+
 The SQL completion plugin caches various lists that are displayed in
 the popup window.  This makes the re-displaying of these lists very
-fast.  If new tables or columns are added to the database it may become 
+fast.  If new tables or columns are added to the database it may become
 necessary to clear the plugins cache.  The default map for this is: >
     imap <buffer> <C-C>R <C-\><C-O>:call sqlcomplete#Map('ResetCache')<CR><C-X><C-O>
- 
- 
+
+
 4.3 SQL Tutorial				*sql-completion-tutorial*
 ----------------
- 
+
 This tutorial is designed to take you through the common features of the SQL
 completion plugin so that: >
      a) You gain familiarity with the plugin
      b) You are introduced to some of the more common features
      c) Show how to customize it to your preferences
      d) Demonstrate "Best of Use" of the plugin (easiest way to configure).
- 
+
 First, create a new buffer: >
      :e tutorial.sql
- 
+
 
 Static features
 ---------------
@@ -450,8 +450,8 @@ To take you through the various lists, simply enter insert mode, hit:
 At this point, you can page down through the list until you find "select".
 If you are familiar with the item you are looking for, for example you know
 the statement begins with the letter "s".  You can type ahead (without the
-quotes) "se" then press: 
-    <C-Spact>t 
+quotes) "se" then press:
+    <C-Space>t
 Assuming "select" is highlighted in the popup list press <Enter> to choose
 the entry.  Now type:
     * fr<C-C>a (show all syntax items)
@@ -462,12 +462,12 @@ a list of all the database supported types.  This may or may not be true
 depending on the syntax file you are using.  The SQL Anywhere syntax file
 (sqlanywhere.vim) has support for this: >
      BEGIN
-        DECLARE customer_id <C-C>T <-- Choose a type from the list
-  
+	DECLARE customer_id <C-C>T <-- Choose a type from the list
+
 
 Dynamic features
 ----------------
-To take advantage of the dynamic features you must first install the 
+To take advantage of the dynamic features you must first install the
 dbext.vim plugin (http://vim.sourceforge.net/script.php?script_id=356).  It
 also comes with a tutorial.  From the SQL completion plugin's perspective,
 the main feature dbext provides is a connection to a database.  dbext
@@ -477,24 +477,24 @@ uses the features of dbext in the background to populate the popups.
 
 What follows assumes dbext.vim has been correctly configured, a simple test
 is to run the command, :DBListTable.  If a list of tables is shown, you know
-dbext.vim is working as expected.  If not, please consult the dbext.txt 
+dbext.vim is working as expected.  If not, please consult the dbext.txt
 documentation.
 
 Assuming you have followed the dbext-tutorial you can press <C-C>t to
 display a list of tables.  There is a delay while dbext is creating the table
-list.  After the list is displayed press <C-W>.  This will remove both the 
+list.  After the list is displayed press <C-W>.  This will remove both the
 popup window and the table name already chosen when the list became active. >
- 
+
  4.3.1 Table Completion:			*sql-completion-tables*
- 
+
 Press <C-C>t to display a list of tables from within the database you
-have connected via the dbext plugin.  
+have connected via the dbext plugin.
 NOTE: All of the SQL completion popups support typing a prefix before pressing
 the key map.  This will limit the contents of the popup window to just items
 beginning with those characters.  >
- 
+
  4.3.2 Column Completion:			*sql-completion-columns*
- 
+
 The SQL completion plugin can also display a list of columns for particular
 tables.  The column completion is trigger via <C-C>c.
 
@@ -506,64 +506,64 @@ a key and create one of these mappings (see |sql-completion-maps| for further
 details on where to create this imap): >
     imap <buffer> <your_keystroke> <C-R>=sqlcomplete#DrillIntoTable()<CR>
     imap <buffer> <your_keystroke> <C-Y><C-\><C-O>:call sqlcomplete#Map('column')<CR><C-X><C-O>
- 
+
 Example of using column completion:
-     - Press <C-C>t again to display the list of tables.  
+     - Press <C-C>t again to display the list of tables.
      - When the list is displayed in the completion window, press <C-Right>,
        this will replace the list of tables, with a list of columns for the
-       table highlighted (after the same short delay).  
+       table highlighted (after the same short delay).
      - If you press <C-Left>, this will again replace the column list with the
        list of tables.  This allows you to drill into tables and column lists
-       very quickly.  
+       very quickly.
      - Press <C-Right> again while the same table is highlighted.  You will
        notice there is no delay since the column list has been cached.  If you
        change the schema of a cached table you can press <C-C>R, which
-       clears the SQL completion cache.  
+       clears the SQL completion cache.
      - NOTE: <C-Right> and <C-Left> have been designed to work while the
-       completion window is active.  If the completion popup window is 
+       completion window is active.  If the completion popup window is
        not active, a normal <C-Right> or <C-Left> will be executed.
- 
+
 Lets look how we can build a SQL statement dynamically.  A select statement
 requires a list of columns.  There are two ways to build a column list using
 the SQL completion plugin. >
     One column at a time:
 <       1. After typing SELECT press <C-C>t to display a list of tables.
-        2. Choose a table from the list.
-        3. Press <C-Right> to display a list of columns.
-        4. Choose the column from the list and press enter.
-        5. Enter a "," and press <C-C>c.  Generating a column list
-           generally requires having the cursor on a table name.  The plugin
-           uses this name to determine what table to retrieve the column list.  
-           In this step, since we are pressing <C-C>c without the cursor 
-           on a table name the column list displayed will be for the previous 
-           table.  Choose a different column and move on. 
-        6. Repeat step 5 as often as necessary. >
-    All columns for a table: 
-<       1. After typing SELECT press <C-C>t to display a list of tables.
-        2. Highlight the table you need the column list for.
-        3. Press <Enter> to choose the table from the list.
-        4. Press <C-C>l to request a comma separated list of all columns
-           for this table.
-        5. Based on the table name chosen in step 3, the plugin attempts to
-           decide on a reasonable table alias.  You are then prompted to
-           either accept of change the alias.  Press OK.
-        6. The table name is replaced with the column list of the table is
-           replaced with the comma separate list of columns with the alias
-           prepended to each of the columns.
-        7. Step 3 and 4 can be replaced by pressing <C-C>L, which has
-           a <C-Y> embedded in the map to choose the currently highlighted 
-           table in the list.
+	2. Choose a table from the list.
+	3. Press <C-Right> to display a list of columns.
+	4. Choose the column from the list and press enter.
+	5. Enter a "," and press <C-C>c.  Generating a column list
+	   generally requires having the cursor on a table name.  The plugin
+	   uses this name to determine what table to retrieve the column list.
+	   In this step, since we are pressing <C-C>c without the cursor
+	   on a table name the column list displayed will be for the previous
+	   table.  Choose a different column and move on.
+	6. Repeat step 5 as often as necessary. >
+    All columns for a table:
+<	1. After typing SELECT press <C-C>t to display a list of tables.
+	2. Highlight the table you need the column list for.
+	3. Press <Enter> to choose the table from the list.
+	4. Press <C-C>l to request a comma separated list of all columns
+	   for this table.
+	5. Based on the table name chosen in step 3, the plugin attempts to
+	   decide on a reasonable table alias.	You are then prompted to
+	   either accept of change the alias.  Press OK.
+	6. The table name is replaced with the column list of the table is
+	   replaced with the comma separate list of columns with the alias
+	   prepended to each of the columns.
+	7. Step 3 and 4 can be replaced by pressing <C-C>L, which has
+	   a <C-Y> embedded in the map to choose the currently highlighted
+	   table in the list.
 
 There is a special provision when writing select statements.  Consider the
 following statement: >
-     select * 
+     select *
        from customer c,
-            contact cn,
-            department as dp,
-            employee e,
-            site_options so
+	    contact cn,
+	    department as dp,
+	    employee e,
+	    site_options so
       where c.
- 
+
 In INSERT mode after typing the final "c." which is an alias for the
 "customer" table, you can press either <C-C>c or <C-X><C-O>.  This will
 popup a list of columns for the customer table.  It does this by looking back
@@ -571,19 +571,19 @@ to the beginning of the select statement and finding a list of the tables
 specified in the FROM clause.  In this case it notes that in the string
 "customer c", "c" is an alias for the customer table.  The optional "AS"
 keyword is also supported, "customer AS c". >
- 
- 
+
+
  4.3.3 Procedure Completion:			*sql-completion-procedures*
- 
+
 Similar to the table list, <C-C>p, will display a list of stored
 procedures stored within the database. >
- 
+
  4.3.4 View Completion:				*sql-completion-views*
- 
+
 Similar to the table list, <C-C>v, will display a list of views in the
 database.
 
- 
+
 4.4 Completion Customization			*sql-completion-customization*
 ----------------------------
 
@@ -591,60 +591,60 @@ The SQL completion plugin can be customized through various options set in
 your |vimrc|: >
     omni_sql_no_default_maps
 <       - Default: This variable is not defined
-        - If this variable is defined, no maps are created for OMNI
-          completion.  See |sql-completion-maps| for further discussion.
+	- If this variable is defined, no maps are created for OMNI
+	  completion.  See |sql-completion-maps| for further discussion.
 >
     omni_sql_use_tbl_alias
-<       - Default: a
-        - This setting is only used when generating a comma separated
-          column list.  By default the map is <C-C>l.  When generating
-          a column list, an alias can be prepended to the beginning of each
-          column, for example:  e.emp_id, e.emp_name.  This option has three 
-          settings: >
-                n - do not use an alias
-                d - use the default (calculated) alias
-                a - ask to confirm the alias name
+<	- Default: a
+	- This setting is only used when generating a comma separated
+	  column list.	By default the map is <C-C>l.  When generating
+	  a column list, an alias can be prepended to the beginning of each
+	  column, for example:	e.emp_id, e.emp_name.  This option has three
+	  settings: >
+		n - do not use an alias
+		d - use the default (calculated) alias
+		a - ask to confirm the alias name
 <
-          An alias is determined following a few rules:
-               1.  If the table name has an '_', then use it as a separator: >
-                   MY_TABLE_NAME --> MTN
-                   my_table_name --> mtn
-                   My_table_NAME --> MtN
-<              2.  If the table name does NOT contain an '_', but DOES use
-                   mixed case then the case is used as a separator: >
-                   MyTableName --> MTN
-<              3.  If the table name does NOT contain an '_', and does NOT 
-                   use mixed case then the first letter of the table is used: >
-                   mytablename --> m
-                   MYTABLENAME --> M
- 
+	  An alias is determined following a few rules:
+	       1.  If the table name has an '_', then use it as a separator: >
+		   MY_TABLE_NAME --> MTN
+		   my_table_name --> mtn
+		   My_table_NAME --> MtN
+<	       2.  If the table name does NOT contain an '_', but DOES use
+		   mixed case then the case is used as a separator: >
+		   MyTableName --> MTN
+<	       3.  If the table name does NOT contain an '_', and does NOT
+		   use mixed case then the first letter of the table is used: >
+		   mytablename --> m
+		   MYTABLENAME --> M
+
     omni_sql_ignorecase
-<       - Default: Current setting for|ignorecase|
-        - Valid settings are 0 or 1.  
-        - When entering a few letters before initiating completion, the list
-          will be filtered to display only the entries which begin with the
-          list of characters.  When this option is set to 0, the list will be
-          filtered using case sensitivity. >
- 
+<	- Default: Current setting for|ignorecase|
+	- Valid settings are 0 or 1.
+	- When entering a few letters before initiating completion, the list
+	  will be filtered to display only the entries which begin with the
+	  list of characters.  When this option is set to 0, the list will be
+	  filtered using case sensitivity. >
+
     omni_sql_include_owner
-<       - Default: 0, unless dbext.vim 3.00 has been installed
-        - Valid settings are 0 or 1.  
-        - When completing tables, procedure or views and using dbext.vim 3.00 
-          or higher the list of objects will also include the owner name.
-          When completing these objects and omni_sql_include_owner is enabled
-          the owner name will be be replaced. >
- 
+<	- Default: 0, unless dbext.vim 3.00 has been installed
+	- Valid settings are 0 or 1.
+	- When completing tables, procedure or views and using dbext.vim 3.00
+	  or higher the list of objects will also include the owner name.
+	  When completing these objects and omni_sql_include_owner is enabled
+	  the owner name will be be replaced. >
+
     omni_sql_precache_syntax_groups
-<       - Default: 
-          ['syntax','sqlKeyword','sqlFunction','sqlOption','sqlType','sqlStatement']
-        - sqlcomplete can be used in conjunction with other completion
-          plugins.  This is outlined at |sql-completion-filetypes|.  When the 
-          filetype is changed temporarily to SQL, the sqlcompletion plugin
-          will cache the syntax groups listed in the List specified in this
-          option.
+<	- Default:
+	  ['syntax','sqlKeyword','sqlFunction','sqlOption','sqlType','sqlStatement']
+	- sqlcomplete can be used in conjunction with other completion
+	  plugins.  This is outlined at |sql-completion-filetypes|.  When the
+	  filetype is changed temporarily to SQL, the sqlcompletion plugin
+	  will cache the syntax groups listed in the List specified in this
+	  option.
 >
- 
-4.5 SQL Maps	        			*sql-completion-maps*
+
+4.5 SQL Maps					*sql-completion-maps*
 ------------
 
 The default SQL maps have been described in other sections of this document in
@@ -656,9 +656,9 @@ These are maps which use populate the completion list using Vim's syntax
 highlighting rules. >
     <C-C>a
 <       - Displays all SQL syntax items. >
-    <C-C>k 
+    <C-C>k
 <       - Displays all SQL syntax items defined as 'sqlKeyword'. >
-    <C-C>f 
+    <C-C>f
 <       - Displays all SQL syntax items defined as 'sqlFunction. >
     <C-C>o
 <       - Displays all SQL syntax items defined as 'sqlOption'. >
@@ -671,7 +671,7 @@ Dynamic Maps
 ------------
 These are maps which use populate the completion list using the dbext.vim
 plugin. >
-    <C-C>t  
+    <C-C>t
 <       - Displays a list of tables. >
     <C-C>p
 <       - Displays a list of procedures. >
@@ -683,33 +683,33 @@ plugin. >
 <       - Displays a comma separated list of columns for a specific table. >
     <C-C>L
 <       - Displays a comma separated list of columns for a specific table.
-          This should only be used when the completion window is active. >
+	  This should only be used when the completion window is active. >
     <C-Right>
-<       - Displays a list of columns for the table currently highlighted in
-          the completion window.  <C-Right> is not recognized on most Unix
-          systems, so this maps is only created on the Windows platform.
-          If you would like the same feature on Unix, choose a different key
-          and make the same map in your vimrc. >
+<	- Displays a list of columns for the table currently highlighted in
+	  the completion window.  <C-Right> is not recognized on most Unix
+	  systems, so this maps is only created on the Windows platform.
+	  If you would like the same feature on Unix, choose a different key
+	  and make the same map in your vimrc. >
     <C-Left>
-<       - Displays the list of tables.
-          <C-Left> is not recognized on most Unix systems, so this maps is
-          only created on the Windows platform.  If you would like the same
-          feature on Unix, choose a different key and make the same map in
-          your vimrc. >
+<	- Displays the list of tables.
+	  <C-Left> is not recognized on most Unix systems, so this maps is
+	  only created on the Windows platform.  If you would like the same
+	  feature on Unix, choose a different key and make the same map in
+	  your vimrc. >
     <C-C>R
-<       - This maps removes all cached items and forces the SQL completion 
-          to regenerate the list of items.
+<	- This maps removes all cached items and forces the SQL completion
+	  to regenerate the list of items.
 
 Customizing Maps
 ----------------
 You can create as many additional key maps as you like.  Generally, the maps
-will be specifying different syntax highlight groups.  
+will be specifying different syntax highlight groups.
 
 If you do not wish the default maps created or the key choices do not work on
 your platform (often a case on *nix) you define the following variable in
 your |vimrc|: >
     let g:omni_sql_no_default_maps = 1
-  
+
 Do no edit ftplugin/sql.vim directly!  If you change this file your changes
 will be over written on future updates.  Vim has a special directory structure
 which allows you to make customizations without changing the files that are
@@ -718,9 +718,9 @@ create an after/ftplugin/sql.vim (see |after-directory|) and place the same
 maps from the ftplugin/sql.vim in it using your own key strokes.  <C-C> was
 chosen since it will work on both Windows and *nix platforms.  On the windows
 platform you can also use <C-Space> or ALT keys.
- 
 
-4.6 Using with other filetypes		        *sql-completion-filetypes*
+
+4.6 Using with other filetypes			*sql-completion-filetypes*
 ------------------------------
 
 Many times SQL can be used with different filetypes.  For example Perl, Java,
@@ -758,6 +758,6 @@ Step 3
 ------
 Setting the filetype back to Perl sets all the usual "perl" related items back
 as they were.
-     
+
 
 vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 77cabaa3c..e799d47f9 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0f.  Last change: 2006 Apr 25
+*starting.txt*  For Vim version 7.0g.  Last change: 2006 Apr 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index cfeeec67a..1e09992e7 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0f.  Last change: 2006 Apr 27
+*syntax.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -610,7 +610,7 @@ For Visual Basic use: >
 	:let g:filetype_asp = "aspvbs"
 
 
-BAAN 						    *baan.vim* *baan-syntax*
+BAAN						    *baan.vim* *baan-syntax*
 
 The baan.vim gives syntax support for BaanC of release BaanIV upto SSA ERP LN
 for both 3 GL and 4 GL programming. Large number of standard defines/constants
@@ -633,10 +633,10 @@ indentation preceding the begin/end keywords has to match (spaces are not
 considered equal to a tab). >
 	let baan_fold_block=1
 Folding can be enabled for embedded SQL blocks as SELECT, SELECTDO,
-SELECTEMPTY, ... The indentation preceding the begin/end keywords has to 
+SELECTEMPTY, ... The indentation preceding the begin/end keywords has to
 match (spaces are not considered equal to a tab). >
 	let baan_fold_sql=1
-Note: Block folding can result in many small folds. It is suggested to |:set| 
+Note: Block folding can result in many small folds. It is suggested to |:set|
 the options 'foldminlines' and 'foldnestmax' in |.vimrc| or use |:setlocal| in
 .../after/syntax/baan.vim (see |after-directory|). Eg: >
 	set foldminlines=5
@@ -927,7 +927,7 @@ doxygen_javadoc_autobrief	1	Set to 0 to disable javadoc autobrief
 					colour highlighting.
 
 doxygen_end_punctuation		'[.]'	Set to regexp match for the ending
-					punctuation of brief 
+					punctuation of brief
 
 There are also some hilight groups worth mentioning as they can be useful in
 configuration.
@@ -2002,8 +2002,8 @@ If you want to fold blocks in if statements, etc. as well set the following: >
 To avoid folding packages or subs when perl_fold is let, let the appropriate
 variable(s): >
 
- 	:unlet perl_nofold_packages
- 	:unlet perl_nofold_subs
+	:unlet perl_nofold_packages
+	:unlet perl_nofold_subs
 
 
 
@@ -2064,7 +2064,7 @@ PLAINTEX				*plaintex.vim* *ft-plaintex-syntax*
 
 TeX is a typesetting language, and plaintex is the file type for the "plain"
 variant of TeX.  If you never want your *.tex files recognized as plain TeX,
-see |ft-tex-plugin|.  
+see |ft-tex-plugin|.
 
 This syntax file has the option >
 
@@ -2328,7 +2328,7 @@ By default only R5RS keywords are highlighted and properly indented.
 
 MzScheme-specific stuff will be used if b:is_mzscheme or g:is_mzscheme
 variables are defined.
- 
+
 Also scheme.vim supports keywords of the Chicken Scheme->C compiler.  Define
 b:is_chicken or g:is_chicken, if you need them.
 
@@ -3745,7 +3745,7 @@ faster.]
 	Without a "groupthere" argument.  Define a region or match that is
 	skipped while searching for a sync point.
 
-    						*syn-sync-linecont*
+						*syn-sync-linecont*
     :syntax sync linecont {pattern}
 
 	When {pattern} matches in a line, it is considered to continue in
@@ -3851,12 +3851,12 @@ specified field is used, and settings are merged with previous ones.  So, the
 result is like this single command has been used: >
    :hi Comment	term=bold ctermfg=Cyan guifg=#80a0ff gui=bold
 <
-						    	*:highlight-verbose*
+							*:highlight-verbose*
 When listing a highlight group and 'verbose' is non-zero, the listing will
 also tell where it was last set.  Example: >
 	:verbose hi Comment
 <	Comment        xxx term=bold ctermfg=4 guifg=Blue ~
-           Last set from /home/mool/vim/vim7/runtime/syntax/syncolor.vim ~
+	   Last set from /home/mool/vim/vim7/runtime/syntax/syncolor.vim ~
 
 When ":hi clear" is used then the script where this command is used will be
 mentioned for the default values. See |:verbose-cmd| for more information.
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index df7305578..1cb05764d 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.0f.  Last change: 2006 Apr 26
+*tabpage.txt*   For Vim version 7.0g.  Last change: 2006 Apr 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index b09dae42d..2f3bf599f 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*tagsrch.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index d5a20f373..98a7e1130 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0f.  Last change: 2006 Apr 29
+*term.txt*      For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -289,8 +289,8 @@ Added by Vim (there are no standard codes for these):
 	t_IE	set icon text end				*t_IE* *'t_IE'*
 	t_WP	set window position (Y, X) in pixels		*t_WP* *'t_WP'*
 	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'*
+	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|
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index dcecc29ee..d1d415c5d 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.0f.  Last change: 2006 Apr 24
+*tips.txt*      For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -489,8 +489,8 @@ A slightly more advanced version is used in the |matchparen| plugin.
 	    let c2 = '\]'
 	  endif
 	  let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
- 	  	\ '=~?  "string\\|comment"'
- 	  execute 'if' s_skip '| let s_skip = 0 | endif'
+		\ '=~?	"string\\|comment"'
+	  execute 'if' s_skip '| let s_skip = 0 | endif'
 
 	  let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip)
 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a55c9fb62..fe045f595 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0f.  Last change: 2006 Apr 29
+*todo.txt*      For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,10 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Darren Hiebert is including the patch for omni completion in ctags.  A new
-version still isn't available for download.
-
-
 Awaiting updated patches:
 9   Mac unicode patch (Da Woon Jung, Eckehard Berns):
     8   Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
@@ -48,8 +44,7 @@ Awaiting updated patches:
     be used instead?
 8   Win32: Add minidump generation. (George Reilly, 2006 Apr 24)
 8   Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
-    Aric Blumer has a patch for this.
-    He will update the patch for 6.3.
+    Aric Blumer has a patch for this.  He will update the patch for 6.3.
 7   Completion of network shares, patch by Yasuhiro Matsumoto.
     Update 2004 Sep 6.
     How does this work?  Missing comments.
@@ -697,6 +692,8 @@ Macintosh:
 8   The script ID that is stored with an option and displayed with ":verbose
     set" isn't reset when the option is set internally.  For example when
     'foldlevel' is set from 'foldlevelstart'.
+8   Also store the line number with the script ID and use it for ":verbose",
+    so that "set nocompatible" is found when it changes other option values.
 8   In the fileformat dialog, "Cancel" isn't translated.  Add a global
     variable for this. (Eduardo Fernandez)
 9   When editing a file with 'readonly' set, there is no check for an existing
@@ -2794,7 +2791,7 @@ Sessions:
 7   With ":mksession" also store the tag stack and jump history. (Michal
     Malecki)
 7   Persistent variables: "p:var"; stored in viminfo file and sessions files.
- 
+
 
 Options:
 7   ":with option=value | command": temporarily set an option value and
diff --git a/runtime/doc/uganda.nsis.txt b/runtime/doc/uganda.nsis.txt
new file mode 100644
index 000000000..bd8024c94
--- /dev/null
+++ b/runtime/doc/uganda.nsis.txt
@@ -0,0 +1,292 @@
+    For Vim version 7.0g.  Last change: 2006 Apr 24
+
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
+
+SUMMARY
+
+Vim is Charityware.  You can use and copy it as much as you like, but you are
+encouraged to make a donation for needy children in Uganda.  Please see |kcc|
+below or visit the ICCF web site, available at these URLs:
+
+	http://iccf-holland.org/
+	http://www.vim.org/iccf/
+
+You can also sponsor the development of Vim.  Vim sponsors can vote for
+features.  See |sponsor|.  The money goes to Uganda anyway.
+
+The Open Publication License applies to the Vim documentation, see
+|manual-copyright|.
+
+=== begin of license ===
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
+
+=== end of license ===
+
+Note:
+
+- If you are happy with Vim, please express that by reading the rest of this
+  file and consider helping needy children in Uganda.
+
+- If you want to support further Vim development consider becoming a
+  |sponsor|.  The money goes to Uganda anyway.
+
+- According to Richard Stallman the Vim license is GNU GPL compatible.
+  A few minor changes have been made since he checked it, but that should not
+  make a difference.
+
+- If you link Vim with a library that goes under the GNU GPL, this limits
+  further distribution to the GNU GPL.  Also when you didn't actually change
+  anything in Vim.
+
+- Once a change is included that goes under the GNU GPL, this forces all
+  further changes to also be made under the GNU GPL or a compatible license.
+
+- If you distribute a modified version of Vim, you can include your name and
+  contact information with the "--with-modified-by" configure argument or the
+  MODIFIED_BY define.
+
+==============================================================================
+Kibaale Children's Centre
+
+Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the
+south of Uganda, near Tanzania, in East Africa.  The area is known as Rakai
+District.  The population is mostly farmers.  Although people are poor, there
+is enough food.  But this district is suffering from AIDS more than any other
+part of the world.  Some say that it started there.  Estimations are that 10
+to 30% of the Ugandans are infected with HIV.  Because parents die, there are
+many orphans.  In this district about 60,000 children have lost one or both
+parents, out of a population of 350,000.  And this is still continuing.
+
+The children need a lot of help.  The KCC is working hard to provide the needy
+with food, medical care and education.  Food and medical care to keep them
+healthy now, and education so that they can take care of themselves in the
+future.  KCC works on a Christian base, but help is given to children of any
+religion.
+
+The key to solving the problems in this area is education.  This has been
+neglected in the past years with president Idi Amin and the following civil
+wars.  Now that the government is stable again, the children and parents have
+to learn how to take care of themselves and how to avoid infections.  There is
+also help for people who are ill and hungry, but the primary goal is to
+prevent people from getting ill and to teach them how to grow healthy food.
+
+Most of the orphans are living in an extended family.  An uncle or older
+sister is taking care of them.  Because these families are big and the income
+(if any) is low, a child is lucky if it gets healthy food.  Clothes, medical
+care and schooling is beyond its reach.  To help these needy children, a
+sponsorship program was put into place.  A child can be financially adopted.
+For a few dollars a month KCC sees to it that the child gets indispensable
+items, is healthy, goes to school and KCC takes care of anything else that
+needs to be done for the child and the family that supports it.
+
+Besides helping the child directly, the environment where the child grows up
+needs to be improved.  KCC helps schools to improve their teaching methods.
+There is a demonstration school at the centre and teacher trainings are given.
+Health workers are being trained, hygiene education is carried out and
+households are stimulated to build a proper latrine.  I helped setting up a
+production site for cement slabs.  These are used to build a good latrine.
+They are sold below cost price.
+
+There is a small clinic at the project, which provides children and their
+family with medical help.  When needed, transport to a hospital is offered.
+Immunization programs are carried out and help is provided when an epidemic is
+breaking out (measles and cholera have been a problem).
+
+Summer 1994 to summer 1995 I spent a whole year at the centre, working as a
+volunteer.  I have helped to expand the centre and worked in the area of water
+and sanitation.  I learned that the help that the KCC provides really helps.
+Now that I'm back in Holland, I would like to continue supporting KCC.  To do
+this I'm raising funds and organizing the sponsorship program.  Please
+consider one of these possibilities:
+
+1.  Sponsor a child in primary school: 17 euro a month (or more).
+2.  Sponsor a child in secondary school: 25 euro a month (or more).
+3.  Sponsor the clinic: Any amount a month or quarter
+4.  A one-time donation
+
+Compared with other organizations that do child sponsorship the amounts are
+very low.  This is because the money goes directly to the centre.  Less than
+5% is used for administration.  This is possible because this is a small
+organization that works with volunteers.  If you would like to sponsor a
+child, you should have the intention to do this for at least one year.
+
+How do you know that the money will be spent right?  First of all you have my
+personal guarantee as the author of Vim.  I trust the people that are working
+at the centre, I know them personally.  Further more, the centre is
+co-sponsored and inspected by World Vision, Save the Children Fund and
+International Child Care Fund.  The centre is visited about once a year to
+check the progress (at our own cost).  I have visited the centre myself in
+1996, 1998, 2000, 2001 and 2003.  The visit reports are on the ICCF web site.
+
+If you have any further questions, send me e-mail: <Bram@vim.org>.
+
+The address of the centre is:
+			Kibaale Children's Centre
+			p.o. box 1658
+			Masaka, Uganda, East Africa
+
+Sending money:
+
+Check the ICCF web site for the latest information!  See |iccf| for the URL.
+
+USA:		The methods mentioned below can be used.  Alternatively, you
+		can send a check to the Nehemiah Group Outreach Society
+		(NGOS).  This will reduce banking costs and you can get an IRS
+		tax receipt.  The NGOS forwards the funds directly to the
+		Kibaale project in Uganda.  Checks must be made payable to
+		NGOS but please note on the check "donation Kibaale".  Mail
+		checks to:
+			NGOS
+			P.O. Box 50862
+			Indianapolis, IN 45250
+		Questions regarding the Nehemiah Group Outreach Society (NGOS)
+		should be directed to: Ross deMerchant, Executive Director -
+		r.demerchant AT sbcglobal DOT net.
+		For sponsoring a child contact KCF in Canada (see below) and
+		send the check to NGOS in Indianapolis.
+
+Canada:		Contact Kibaale Children's Fund (KCF) in Surrey, Canada.  They
+		take care of the Canadian sponsors for the children in
+		Kibaale.  KCF forwards 100% of the money to the project in
+		Uganda.  You can send them a one time donation directly.
+		Please send me a note so that I know what has been donated
+		because of Vim.  Ask KCF for information about sponsorship.
+			Kibaale Children's Fund c/o Pacific Academy
+			10238-168 Street
+			Surrey, B.C. V4N 1Z4
+			Canada
+			Phone: 604-581-5353
+		If you make a donation to Kibaale Children's Fund (KCF) you
+		will receive a tax receipt which can be submitted with your
+		tax return.
+
+Holland:	Transfer to the account of "Stichting ICCF Holland" in Venlo.
+		This will allow for tax deduction if you live in Holland.
+			Postbank, nr. 4548774
+
+Germany:	It is possible to make donations that allow for a tax return.
+		Check the ICCF web site for the latest information:
+			http://iccf-holland.org/germany.html
+
+World:		Use a postal money order.  That should be possible from any
+		country, mostly from the post office.  Use this name (which is
+		in my passport): "Abraham Moolenaar".  Use Euro for the
+		currency if possible.
+
+Europe:		Use a bank transfer if possible.  Your bank should have a form
+		that you can use for this.  See "Others" below for the swift
+		code and IBAN number.
+		Any other method should work.  Ask for information about
+		sponsorship.
+
+Credit Card:	You can use PayPal to send money with a Credit card.  This is
+		the most widely used Internet based payment system.  It's
+		really simple to use.  Use this link to find more info:
+		    https://www.paypal.com/affil/pal=Bram%40iccf-holland.org
+		The e-mail address for sending the money to is:
+		    Bram@iccf-holland.org
+		For amounts above 400 Euro ($500) sending a check is
+		preferred.
+
+Others:		Transfer to one of these accounts if possible:
+		    Postbank, account 4548774
+				Swift code: INGB NL 2A
+				IBAN: NL47 PSTB 0004 5487 74
+			under the name "stichting ICCF Holland", Venlo
+		    If that doesn't work:
+		    Rabobank Venlo, account 3765.05.117
+				Swift code: RABO NL 2U
+			under the name "Bram Moolenaar", Venlo
+		Otherwise, send a check in euro or US dollars to the address
+		below.  Minimal amount: $70 (my bank does not accept smaller
+		amounts for foreign check, sorry)
+
+Address to send checks to:
+			stichting ICCF Holland
+			Bram Moolenaar
+			Molenstraat 2
+			2161 HP Lisse
+			The Netherlands
+
+This address is expected to be valid for a long time.  The address in Venlo
+will not be valid after June 2006.
+
+ ts=8:ft=help:norl:
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index dabce9359..c0a50c847 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*uganda.txt*    For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index 10b328d90..8c7da9bc9 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.0f.  Last change: 2006 Apr 24
+*undo.txt*      For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -119,8 +119,8 @@ This is explained in the user manual: |usr_32.txt|.
 							*:undol* *:undolist*
 :undol[ist]		List the leafs in the tree of changes.  Example:
 				number changes   time ~
-				4      10        10:34:11
-				18     4         11:01:46
+				4      10	 10:34:11
+				18     4	 11:01:46
 
 			The "number" column is the change number.  This number
 			continuously increases and can be used to identify a
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index 8b48430ee..898742dc8 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -1,4 +1,4 @@
-*usr_01.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_01.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index 6074ebf00..1559c0bbc 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_02.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index a0bcd60de..53ef056d1 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_03.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
index 2d2fa391b..dba3b5ef9 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -1,4 +1,4 @@
-*usr_04.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_04.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 02d82894e..d4e189ce7 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_05.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
index e834f8df5..dc911ff81 100644
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -1,4 +1,4 @@
-*usr_06.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_06.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt
index 2961c7c63..2dff42743 100644
--- a/runtime/doc/usr_07.txt
+++ b/runtime/doc/usr_07.txt
@@ -1,4 +1,4 @@
-*usr_07.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_07.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
index 7aab030f0..3038c0d98 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_08.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -521,12 +521,12 @@ window.  And you will notice a bar at the top with the two file names:
 
 	+----------------------------------+
 	| thisfile | /thatfile/ __________X|    (thatfile is bold)
-	|/* thatfile */  		   |
+	|/* thatfile */			   |
 	|that				   |
 	|that				   |
-	|~                                 |
-	|~                                 |
-	|~                                 |
+	|~				   |
+	|~				   |
+	|~				   |
 	|				   |
 	+----------------------------------+
 
@@ -538,12 +538,12 @@ Now use the mouse to click on "thisfile" in the top line.  The result is
 
 	+----------------------------------+
 	| /thisfile/ | thatfile __________X|    (thisfile is bold)
-	|/* thisfile */  		   |
+	|/* thisfile */			   |
 	|this				   |
 	|this				   |
-	|~                                 |
-	|~                                 |
-	|~                                 |
+	|~				   |
+	|~				   |
+	|~				   |
 	|				   |
 	+----------------------------------+
 
@@ -560,12 +560,12 @@ the window we were in:
 
 	+-------------------------------------+
 	| thisfile | /thisfile/ | thatfile __X|   (thisfile is bold)
-	|/* thisfile */  		      |
+	|/* thisfile */			      |
 	|this				      |
 	|this				      |
-	|~                                    |
-	|~                                    |
-	|~                                    |
+	|~				      |
+	|~				      |
+	|~				      |
 	|				      |
 	+-------------------------------------+
 
@@ -579,17 +579,17 @@ Will show the help text for "gt" in a new tab page.
 A few more things you can do with tab pages:
 
 - click with the mouse in the space after the last label
-  	The next tab page will be selected, like with "gt".
+	The next tab page will be selected, like with "gt".
 
 - click with the mouse on the "X" in the top right corner
-  	The current tab page will be closed.  Unless there are unsaved
+	The current tab page will be closed.  Unless there are unsaved
 	changes in the current tab page.
 
 - double click with the mouse in the top line
-  	A new tab page will be created.
+	A new tab page will be created.
 
 - the "tabonly" command
-  	Closes all tab pages except the current one.  Unless there are unsaved
+	Closes all tab pages except the current one.  Unless there are unsaved
 	changes in other tab pages.
 
 For more information about tab pages see |tab-page|.
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index fa90242db..d15f89eee 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_09.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index ec87bee4b..2c046735b 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_10.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 479cdb158..41205ec5d 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -1,4 +1,4 @@
-*usr_11.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_11.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index b59b3eca8..044549efd 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -1,4 +1,4 @@
-*usr_12.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_12.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt
index 2cbd42888..de26aab53 100644
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -1,4 +1,4 @@
-*usr_20.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_20.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index a43f024bb..f99e811a3 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 7.0f.  Last change: 2006 Apr 25
+*usr_21.txt*	For Vim version 7.0g.  Last change: 2006 Apr 25
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 31e5d3841..90e2b0843 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_22.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt
index 1cf759529..e168abcd0 100644
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -1,4 +1,4 @@
-*usr_23.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_23.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
index 98c2a252d..175d09f6f 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_24.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index a033afbc8..49625e1bf 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_25.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt
index 1a21e668e..c084afd8f 100644
--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_26.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt
index 76b572129..40e50901e 100644
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -1,4 +1,4 @@
-*usr_27.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_27.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
index 7c5ebbf0d..a69081ffb 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -1,4 +1,4 @@
-*usr_28.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_28.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index 25567f088..109487323 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_29.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt
index 13449a049..9e1ced27e 100644
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -1,4 +1,4 @@
-*usr_30.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_30.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index c94d3ca66..2b6f8e9cb 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_31.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt
index 9fab186e1..5e600d397 100644
--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -1,4 +1,4 @@
-*usr_32.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_32.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -31,11 +31,11 @@ two changes, numbered 1 and 2, and three states of the text:
 		one ~
 		 |
 	      change 1
-	         |
+		 |
 	      one too ~
-	         |
+		 |
 	      change 2
-	         |
+		 |
 	      one two ~
 
 If we now undo one change, back to "one too", and change "one" to "me" we
@@ -44,12 +44,12 @@ create a branch in the undo tree:
 		one ~
 		 |
 	      change 1
-	         |
+		 |
 	      one too ~
 	      /     \
-         change 2  change 3
-            |         |
-         one two    me too ~
+	 change 2  change 3
+	    |	      |
+	 one two    me too ~
 
 You can now use the |u| command to undo.  If you do this twice you get to
 "one".  Use |CTRL-R| to redo, and you will go to "one too".  One more |CTRL-R|
@@ -80,12 +80,12 @@ Now make another change: change "one" to "not":
 		one ~
 		 |
 	      change 1
-	         |
+		 |
 	      one too ~
 	      /     \
-         change 2  change 3
-            |         |
-         one two    me too ~
+	 change 2  change 3
+	    |	      |
+	 one two    me too ~
 	    |
 	 change 4
 	    |
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index fff28aec1..b46ae5b0c 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -1,4 +1,4 @@
-*usr_40.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_40.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 811cc9fa0..9b04a6796 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_41.txt*	For Vim version 7.0g.  Last change: 2006 Apr 30
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -209,7 +209,7 @@ exists() checks.  That's not what you want.
 becomes false.  When it was false, it becomes true.  You can read it as "not".
 Thus "if !exists()" can be read as "if not exists()".
    What Vim calls true is anything that is not zero.  Zero is false.
-   	Note:
+	Note:
 	Vim automatically converts a string to a number when it is looking for
 	a number.  When using a string that doesn't start with a digit the
 	resulting number is zero.  Thus look out for this: >
@@ -1076,16 +1076,16 @@ A List is an ordered sequence of things.  The things can be any kind of value,
 thus you can make a List of numbers, a List of Lists and even a List of mixed
 items.  To create a List with three strings: >
 
-   	:let alist = ['aap', 'mies', 'noot']
+	:let alist = ['aap', 'mies', 'noot']
 
 The List items are enclosed in square brackets and separated by commas.  To
 create an empty List: >
 
-   	:let alist = []
+	:let alist = []
 
 You can add items to a List with the add() function: >
 
-   	:let alist = []
+	:let alist = []
 	:call add(alist, 'foo')
 	:call add(alist, 'bar')
 	:echo alist
@@ -1098,14 +1098,14 @@ List concatenation is done with +: >
 
 Or, if you want to extend a List directly: >
 
-   	:let alist = ['one']
+	:let alist = ['one']
 	:call extend(alist, ['two', 'three'])
 	:echo alist
 <	['one', 'two', 'three'] ~
 
 Notice that using add() will have a different effect: >
 
-   	:let alist = ['one']
+	:let alist = ['one']
 	:call add(alist, ['two', 'three'])
 	:echo alist
 <	['one', ['two', 'three']] ~
@@ -1155,11 +1155,11 @@ last item is one less than the length of the list.
 
 A more useful example, looping over lines in the buffer: >
 
-        :for line in getline(1, 20)
-        :  if line =~ "Date: "
-        :    echo matchstr(line, 'Date: \zs.*')
-        :  endif
-        :endfor
+	:for line in getline(1, 20)
+	:  if line =~ "Date: "
+	:    echo matchstr(line, 'Date: \zs.*')
+	:  endif
+	:endfor
 
 This looks into lines 1 to 20 (inclusive) and echoes any date found in there.
 
@@ -1168,7 +1168,7 @@ DICTIONARIES
 
 A Dictionary stores key-value pairs.  You can quickly lookup a value if you
 know the key.  A Dictionary is created with curly braces: >
-   	
+
 	:let uk2nl = {'one': 'een', 'two': 'twee', 'three': 'drie'}
 
 Now you can lookup words by putting the key in square brackets: >
@@ -2274,7 +2274,7 @@ startup.  This is the sequence of events that happens:
 
 2. The user types the BNRead command or presses the <F19> key.  The
    BufNetRead() or BufNetWrite() function will be called.
-   
+
 3. Vim can't find the function and triggers the |FuncUndefined| autocommand
    event.  Since the pattern "BufNet*" matches the invoked function, the
    command "source fname" will be executed.  "fname" will be equal to the name
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
index 37e1f38d9..8b70d9d59 100644
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_42.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
index cddbf5415..4de298f7c 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_43.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
index 845ca3c6d..21873f120 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_44.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index 169d2e7f4..bd69ad967 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_45.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt
index 28ed18084..5409ed1ef 100644
--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -1,4 +1,4 @@
-*usr_90.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_90.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index 8648f7e58..89c9a2c53 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 7.0f.  Last change: 2006 Apr 24
+*usr_toc.txt*	For Vim version 7.0g.  Last change: 2006 Apr 24
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 601f17b38..8aafab792 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.0f.  Last change: 2006 Apr 25
+*various.txt*   For Vim version 7.0g.  Last change: 2006 Apr 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version4.txt b/runtime/doc/version4.txt
index c1f946d12..3ceee5349 100644
--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*version4.txt*  For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt
index 6e94245dd..92297d22e 100644
--- a/runtime/doc/version5.txt
+++ b/runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*version5.txt*  For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/version6.txt b/runtime/doc/version6.txt
index de9dccbbb..a46514352 100644
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*version6.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -14135,7 +14135,7 @@ Solution:   Check that the mapping has ended after obtaining all characters of
 Files:	    src/normal.c
 
 Patch 6.3.034
-Problem:    VMS: crash when using ":help". 
+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
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index a874cf85a..80bff77b9 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt*  For Vim version 7.0f.  Last change: 2006 Apr 29
+*version7.txt*  For Vim version 7.0g.  Last change: 2006 Apr 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -64,9 +64,9 @@ In an argument list double quotes could be used to include spaces in a file
 name.  This caused a difference between ":edit" and ":next" for escaping
 double quotes and it is incompatible with some versions of Vi.
 	Command			Vim 6.x	file name	Vim 7.x file name ~
-	:edit foo\"888          foo"888         	foo"888
-	:next foo\"888          foo888          	foo"888
-	:next a\"b c\"d         ab cd           	a"b  and  c"d
+	:edit foo\"888		foo"888			foo"888
+	:next foo\"888		foo888			foo"888
+	:next a\"b c\"d		ab cd			a"b  and  c"d
 
 In a |literal-string| a single quote can be doubled to get one.
 ":echo 'a''b'" would result in "a b", but now that two quotes stand for one it
@@ -106,7 +106,7 @@ The "2html.vim" script now converts closed folds to HTML.  This means the HTML
 looks like its displayed, with the same folds open and closed.  Use "zR", or
 "let html_ignore_folding=1", if no folds should appear in the HTML. (partly by
 Carl Osterwisch)
-Diff mode now is also converted to HTML as it is displayed.
+Diff mode is now also converted to HTML as it is displayed.
 
 Win32: The effect of the <F10> key depended on 'winaltkeys'.  Now it depends
 on whether <F10> has been mapped or not.  This allows mapping <F10> without
@@ -216,7 +216,7 @@ The 'spellsuggest' option specifies the methods used for making suggestions
 
 The |[s| and |]s| commands can be used to move to the next or previous error
 The |zg| and |zw| commands can be used to add good and wrong words
-The |z=|          command can be used to list suggestions and correct the word
+The |z=|	  command can be used to list suggestions and correct the word
 The |:mkspell|    command is used to generate a Vim spell file from word lists
 
 The "undercurl" highlighting attribute was added to nicely point out spelling
@@ -324,7 +324,7 @@ into 'undolevels', when undo information is freed up to limit the memory used.
 
 To be able to navigate the undo branches each change is numbered sequentially.
 The commands |g-| and |:earlier| go back in time, to older changes.  The
-commands |g+| and |:later| go forward in time, to newer changes.  
+commands |g+| and |:later| go forward in time, to newer changes.
 
 The changes are also timestamped.  Use ":earlier 10m" to go to the text as it
 was about ten minutes earlier.
@@ -748,7 +748,7 @@ Win32: The ":winpos" command now also works in the console. (Vipin Aravind)
 |:spellundo|		Remove a word from list of good and bad words.
 
 |:mzscheme|		Execute MzScheme commands.
-|:mzfile|   		Execute an MzScheme script file.
+|:mzfile|		Execute an MzScheme script file.
 
 |:nbkey|		Pass a key to NetBeans for processing.
 
@@ -816,7 +816,7 @@ New and extended functions: ~
 |argv()|		without an argument return the whole argument list
 |browsedir()|		dialog to select a directory
 |bufnr()|		takes an extra argument: create buffer
-|byteidx()| 		index of a character (Ilya Sher)
+|byteidx()|		index of a character (Ilya Sher)
 |call()|		call a function with List as arguments
 |changenr()|		number of current change
 |complete()|		set matches for Insert mode completion
@@ -837,7 +837,7 @@ New and extended functions: ~
 |filter()|		remove selected items from a List or Dictionary
 |finddir()|		find a directory in 'path'
 |findfile()|		find a file in 'path' (Johannes Zellner)
-|foldtextresult()|  	the text displayed for a closed fold at line "lnum"
+|foldtextresult()|	the text displayed for a closed fold at line "lnum"
 |function()|		make a Funcref out of a function name
 |garbagecollect()|	cleanup unused |Lists| and |Dictionaries| with circular
 			references
@@ -846,7 +846,7 @@ New and extended functions: ~
 			(Yegappan Lakshmanan)
 |getcmdtype()|		return the current command-line type
 			(Yegappan Lakshmanan)
-|getfontname()| 	get actual font name being used
+|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
@@ -885,13 +885,13 @@ New and extended functions: ~
 |reltime()|		get time value, possibly relative
 |reltimestr()|		turn a time value into a string
 |remove()|		remove one or more items from a List or Dictionary
-|repeat()| 		repeat "expr" "count" times (Christophe Poucet)
+|repeat()|		repeat "expr" "count" times (Christophe Poucet)
 |reverse()|		reverse the order of a List
 |search()|		extra argument:
 |searchdecl()|		search for declaration of variable
 |searchpair()|		extra argument: line to stop searching
 |searchpairpos()|	return a List with the position of the match
-|searchpos()|	        return a List with the position of the match
+|searchpos()|		return a List with the position of the match
 |setloclist()|		modify a location list (Yegappan Lakshmanan)
 |setpos()|		set cursor or mark to a position
 |setqflist()|		modify a quickfix list (Yegappan Lakshmanan)
@@ -928,8 +928,8 @@ New Vim variables: ~
 |v:val|			item value in a |map()| or |filter()| function
 |v:key|			item key in a |map()| or |filter()| function
 |v:profiling|		non-zero after a ":profile start" command
-|v:fcs_reason| 		the reason why |FileChangedShell| was triggered
-|v:fcs_choice| 		what should happen after |FileChangedShell|
+|v:fcs_reason|		the reason why |FileChangedShell| was triggered
+|v:fcs_choice|		what should happen after |FileChangedShell|
 |v:beval_bufnr|		buffer number for 'balloonexpr'
 |v:beval_winnr|		window number for 'balloonexpr'
 |v:beval_lnum|		line number for 'balloonexpr'
@@ -2822,5 +2822,13 @@ When 'virtualedit' contains "onemore" CTRL-O in Insert mode still moved the
 cursor left when it was after the end of the line, even though it's allowed to
 be there.
 
+Added test for using tab pages.
+
+towupper() and towlower() were not used, because of checking for
+__STDC__ISO_10646__ instead of __STDC_ISO_10646__. (sertacyildiz)
+
+For ":map <expr>" forbid changing the text, jumping to another buffer and
+using ":normal" to avoid nasty side effects.
+
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index cb42db1ff..048b83f77 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*vi_diff.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1
index 820985715..3753a3b21 100644
--- a/runtime/doc/vim-fr.1
+++ b/runtime/doc/vim-fr.1
@@ -44,7 +44,7 @@ Il comporte de nombreuses am�liorations par rapport � Vi : annulation sur
 plusieurs niveaux, fen�tres et tampons multiples, coloration syntaxique,
 �dition en ligne de commande, compl�tement des noms de fichiers, aide en
 ligne, s�lection visuelle, etc.
-Voir ":help vi_diff.txt" pour un r�sum� des diff�rences entre 
+Voir ":help vi_diff.txt" pour un r�sum� des diff�rences entre
 .B Vim
 et Vi.
 .PP
@@ -96,7 +96,7 @@ Voir ":help tag\-commands".
 \-q [fichiererreurs]
 D�marre en mode Mise-au-point (QuickFix).
 Le fichier [fichiererreurs] est lu et la premi�re erreur est affich�e.
-Si [fichiererreurs] est omis, le nom du fichier est lu dans 
+Si [fichiererreurs] est omis, le nom du fichier est lu dans
 l'option 'errorfile' ("AztecC.Err" par d�faut sur Amiga, "errors.err" sur les
 autres syst�mes).
 La commande ":cn" permet de sauter aux erreurs suivantes.
@@ -259,7 +259,7 @@ quitte.
 .TP
 \-h
 Donne une aide succinte sur les arguments et les options de la ligne de
-commande. Apr�s cela, 
+commande. Apr�s cela,
 .B Vim
 quitte.
 .TP
diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1
index a21ad0665..72009f29d 100644
--- a/runtime/doc/vim-fr.UTF-8.1
+++ b/runtime/doc/vim-fr.UTF-8.1
@@ -44,7 +44,7 @@ Il comporte de nombreuses améliorations par rapport à Vi : annulation sur
 plusieurs niveaux, fenêtres et tampons multiples, coloration syntaxique,
 édition en ligne de commande, complètement des noms de fichiers, aide en
 ligne, sélection visuelle, etc.
-Voir ":help vi_diff.txt" pour un résumé des différences entre 
+Voir ":help vi_diff.txt" pour un résumé des différences entre
 .B Vim
 et Vi.
 .PP
@@ -96,7 +96,7 @@ Voir ":help tag\-commands".
 \-q [fichiererreurs]
 Démarre en mode Mise-au-point (QuickFix).
 Le fichier [fichiererreurs] est lu et la première erreur est affichée.
-Si [fichiererreurs] est omis, le nom du fichier est lu dans 
+Si [fichiererreurs] est omis, le nom du fichier est lu dans
 l'option 'errorfile' ("AztecC.Err" par défaut sur Amiga, "errors.err" sur les
 autres systèmes).
 La commande ":cn" permet de sauter aux erreurs suivantes.
@@ -259,7 +259,7 @@ quitte.
 .TP
 \-h
 Donne une aide succinte sur les arguments et les options de la ligne de
-commande. Après cela, 
+commande. Après cela,
 .B Vim
 quitte.
 .TP
diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1
index b7e9dab69..d712af466 100755
--- a/runtime/doc/vim-it.1
+++ b/runtime/doc/vim-it.1
@@ -363,14 +363,14 @@ Dovrebbe essere un terminale noto a
 Usa i comandi nel file {vimrc} per inizializzazioni.
 Tutte le altre inizializzazioni non sono eseguite.
 Usate questa opzione per editare qualche file di tipo speciale.
-Pu� anche essere usato per non fare alcuna inizializzazione dando 
+Pu� anche essere usato per non fare alcuna inizializzazione dando
 come nome "NONE".
 Vedere ":help initialization" da vim per ulteriori dettagli.
 .TP
 \-U {gvimrc}
 Usa i comandi nel file {gvimrc} per inizializzazioni GUI.
 Tutte le altre inizializzazioni GUI non sono eseguite.
-Pu� anche essere usata per non fare alcuna inizializzazione GUI dando 
+Pu� anche essere usata per non fare alcuna inizializzazione GUI dando
 come nome "NONE".
 Vedere ":help gui-init" da vim per ulteriori dettagli.
 .TP
diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1
index 47d66884e..f41691df9 100644
--- a/runtime/doc/vim-it.UTF-8.1
+++ b/runtime/doc/vim-it.UTF-8.1
@@ -363,14 +363,14 @@ Dovrebbe essere un terminale noto a
 Usa i comandi nel file {vimrc} per inizializzazioni.
 Tutte le altre inizializzazioni non sono eseguite.
 Usate questa opzione per editare qualche file di tipo speciale.
-Può anche essere usato per non fare alcuna inizializzazione dando 
+Può anche essere usato per non fare alcuna inizializzazione dando
 come nome "NONE".
 Vedere ":help initialization" da vim per ulteriori dettagli.
 .TP
 \-U {gvimrc}
 Usa i comandi nel file {gvimrc} per inizializzazioni GUI.
 Tutte le altre inizializzazioni GUI non sono eseguite.
-Può anche essere usata per non fare alcuna inizializzazione GUI dando 
+Può anche essere usata per non fare alcuna inizializzazione GUI dando
 come nome "NONE".
 Vedere ":help gui-init" da vim per ulteriori dettagli.
 .TP
diff --git a/runtime/doc/vimtutor-fr.1 b/runtime/doc/vimtutor-fr.1
index e6ae6484a..ab5d29890 100644
--- a/runtime/doc/vimtutor-fr.1
+++ b/runtime/doc/vimtutor-fr.1
@@ -28,12 +28,12 @@ est toujours lanc� en mode Compatible Vi.
 .SH FICHIERS
 .TP 15
 /usr/local/lib/vim/tutor/tutor[.langue]
-Les fichiers textes de 
+Les fichiers textes de
 .B Vimtutor
 \.
 .TP 15
 /usr/local/lib/vim/tutor/tutor.vim
-Le script Vim utilis� pour copier les fichiers texte de 
+Le script Vim utilis� pour copier les fichiers texte de
 .B Vimtutor
 \.
 .SH AUTEUR
diff --git a/runtime/doc/vimtutor-fr.UTF-8.1 b/runtime/doc/vimtutor-fr.UTF-8.1
index e36c34d78..a41e16311 100644
--- a/runtime/doc/vimtutor-fr.UTF-8.1
+++ b/runtime/doc/vimtutor-fr.UTF-8.1
@@ -28,12 +28,12 @@ est toujours lancé en mode Compatible Vi.
 .SH FICHIERS
 .TP 15
 /usr/local/lib/vim/tutor/tutor[.langue]
-Les fichiers textes de 
+Les fichiers textes de
 .B Vimtutor
 \.
 .TP 15
 /usr/local/lib/vim/tutor/tutor.vim
-Le script Vim utilisé pour copier les fichiers texte de 
+Le script Vim utilisé pour copier les fichiers texte de
 .B Vimtutor
 \.
 .SH AUTEUR
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index a630df8e0..e9fbc72b5 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.0f.  Last change: 2006 Apr 24
+*visual.txt*    For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 10ff9decf..65d5cf29a 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.0f.  Last change: 2006 Apr 24
+*windows.txt*   For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt
index d58ef28c8..6998b4cc5 100644
--- a/runtime/doc/workshop.txt
+++ b/runtime/doc/workshop.txt
@@ -1,4 +1,4 @@
-*workshop.txt*  For Vim version 7.0f.  Last change: 2006 Apr 24
+*workshop.txt*  For Vim version 7.0g.  Last change: 2006 Apr 24
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
diff --git a/runtime/doc/xxd-fr.1 b/runtime/doc/xxd-fr.1
index b00251cce..dfbc29103 100644
--- a/runtime/doc/xxd-fr.1
+++ b/runtime/doc/xxd-fr.1
@@ -118,7 +118,7 @@ hexdumd style).
 Op�ration inverse : convertit un fichier hexad�cimal en un fichier binaire (ou
 applique une rustine � un fichier binaire).
 Si l'�criture n'a pas lieu sur la sortie standard, xxd �crit dans le fichier
-qu'il produit sans le tronquer. Utilisez la combinaison 
+qu'il produit sans le tronquer. Utilisez la combinaison
 .I \-r \-p
 pour lire de l'hexad�cimal brut sans information sur le num�ro des lignes et
 sans format de colonnes particulier. Des espaces blancs et coupures de lignes
@@ -180,7 +180,7 @@ et
 \fI% xxd \-i < fichier\fR
 .PP
 .I xxd \-s \+seek
-peut diff�rer de 
+peut diff�rer de
 .IR "xxd \-s seek" ,
 car lseek(2) est utilis� pour � revenir en arri�re �. Le '+' fait une
 diff�rence quand la source des donn�es est l'entr�e standard et si la position
diff --git a/runtime/doc/xxd-fr.UTF-8.1 b/runtime/doc/xxd-fr.UTF-8.1
index bab572c81..7bdb655ba 100644
--- a/runtime/doc/xxd-fr.UTF-8.1
+++ b/runtime/doc/xxd-fr.UTF-8.1
@@ -118,7 +118,7 @@ hexdumd style).
 Opération inverse : convertit un fichier hexadécimal en un fichier binaire (ou
 applique une rustine à un fichier binaire).
 Si l'écriture n'a pas lieu sur la sortie standard, xxd écrit dans le fichier
-qu'il produit sans le tronquer. Utilisez la combinaison 
+qu'il produit sans le tronquer. Utilisez la combinaison
 .I \-r \-p
 pour lire de l'hexadécimal brut sans information sur le numéro des lignes et
 sans format de colonnes particulier. Des espaces blancs et coupures de lignes
@@ -180,7 +180,7 @@ et
 \fI% xxd \-i < fichier\fR
 .PP
 .I xxd \-s \+seek
-peut différer de 
+peut différer de
 .IR "xxd \-s seek" ,
 car lseek(2) est utilisé pour « revenir en arrière ». Le '+' fait une
 différence quand la source des données est l'entrée standard et si la position
diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/xxd-it.UTF-8.1
index f919a1831..9e3742d36 100644
--- a/runtime/doc/xxd-it.UTF-8.1
+++ b/runtime/doc/xxd-it.UTF-8.1
@@ -169,7 +169,7 @@ salta il resto della linea, dopo aver letto abbastanza caratteri contenenti
 dati esadecimali (vedere opzione \-c). Ciò implica pure che le modifiche alle
 colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate.
 La ricostruzione da un file immagine esadecimale in stile semplice
-(postscript) con xxd \-r \-p non dipende dal numero corrretto di colonne. 
+(postscript) con xxd \-r \-p non dipende dal numero corrretto di colonne.
 IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali
 è interpretata [e utilizzata].
 .PP
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index fdeb5fd73..71a485e8c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 28
+" Last Change:	2006 Apr 30
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -2049,7 +2049,7 @@ au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
 " like are used.
 
 " Asterisk config file
-au BufNewFile,BufRead *asterisk/*.conf*         call s:StarSetf('asterisk')
+au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
 au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 
 " BIND zone
diff --git a/runtime/ftplugin.vim b/runtime/ftplugin.vim
index 64294ca5b..a434b9372 100644
--- a/runtime/ftplugin.vim
+++ b/runtime/ftplugin.vim
@@ -1,7 +1,7 @@
 " Vim support file to switch on loading plugins for file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2006 Mar 18
+" Last change:	2006 Apr 30
 
 if exists("did_load_ftplugin")
   finish
@@ -10,13 +10,13 @@ let did_load_ftplugin = 1
 
 augroup filetypeplugin
   au FileType * call s:LoadFTPlugin()
- 
+
   func! s:LoadFTPlugin()
     if exists("b:undo_ftplugin")
       exe b:undo_ftplugin
       unlet! b:undo_ftplugin b:did_ftplugin
     endif
-   
+
     let s = expand("<amatch>")
     if s != ""
       if &cpo =~# "S" && exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/flexwiki.vim b/runtime/ftplugin/flexwiki.vim
index 1e749f69d..7513e6614 100644
--- a/runtime/ftplugin/flexwiki.vim
+++ b/runtime/ftplugin/flexwiki.vim
@@ -55,5 +55,5 @@ if exists("g:flexwiki_maps")
   if v:version >= 700
       imap <buffer> <Down>   <C-o>gj
       imap <buffer> <Up>     <C-o>gk
-  endif 
+  endif
 endif
diff --git a/runtime/ftplugin/matlab.vim b/runtime/ftplugin/matlab.vim
index c75326677..1800dc8a6 100644
--- a/runtime/ftplugin/matlab.vim
+++ b/runtime/ftplugin/matlab.vim
@@ -3,8 +3,8 @@
 " Maintainer:	Jake Wasserman <jwasserman at gmail dot com>
 " Last Changed: 2006 Jan 12
 
-if exists("b:did_ftplugin") 
-	finish 
+if exists("b:did_ftplugin")
+	finish
 endif
 let b:did_ftplugin = 1
 
@@ -13,7 +13,7 @@ set cpo-=C
 
 if exists("loaded_matchit")
 	let s:conditionalEnd = '\(([^()]*\)\@!\<end\>\([^()]*)\)\@!'
-	let b:match_words = '\<if\>\|\<while\>\|\<for\>\|\<switch\>:' . 
+	let b:match_words = '\<if\>\|\<while\>\|\<for\>\|\<switch\>:' .
 		\ s:conditionalEnd . ',\<if\>:\<elseif\>:\<else\>:' .
 		\ s:conditionalEnd
 endif
diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 021c23a39..f4cee0c2a 100644
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:      Scheme
 " Maintainer:    Sergey Khorev <sergey.khorev@gmail.com>
-" URL:		 http://iamphet.nm.ru/vim 
+" URL:		 http://iamphet.nm.ru/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
 " Last Change:   Nov 22, 2004
diff --git a/runtime/indent/GenericIndent.vim b/runtime/indent/GenericIndent.vim
index 83523df71..67afd70ce 100644
--- a/runtime/indent/GenericIndent.vim
+++ b/runtime/indent/GenericIndent.vim
@@ -319,4 +319,4 @@ endfunction
 "
 " BUGS:  You tell me!  Probably.  I just haven't found one yet or haven't been
 "        told about one.
-"        
+"
diff --git a/runtime/indent/ada.vim b/runtime/indent/ada.vim
index 9601181bd..8cf915dc4 100644
--- a/runtime/indent/ada.vim
+++ b/runtime/indent/ada.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Ada
 " Maintainer:	Neil Bird <neil@fnxweb.com>
-" Last Change:	2004 Nov 23
+" Last Change:	2006 Apr 30
 " Version:	$Id$
 " Look for the latest version at http://vim.sourceforge.net/
 "
@@ -44,25 +44,25 @@ function s:MainBlockIndent( prev_indent, prev_lnum, blockstart, stop_at )
    let line = substitute( getline(lnum), s:AdaComment, '', '' )
    while lnum > 1
       if a:stop_at != ''  &&  line =~ '^\s*' . a:stop_at  &&  indent(lnum) < a:prev_indent
-         return a:prev_indent
+	 return a:prev_indent
       elseif line =~ '^\s*' . a:blockstart
-         let ind = indent(lnum)
-         if ind < a:prev_indent
-            return ind
-         endif
+	 let ind = indent(lnum)
+	 if ind < a:prev_indent
+	    return ind
+	 endif
       endif
 
       let lnum = prevnonblank(lnum - 1)
       " Get previous non-blank/non-comment-only line
       while 1
-         let line = substitute( getline(lnum), s:AdaComment, '', '' )
-         if line !~ '^\s*$' && line !~ '^\s*#'
-            break
-         endif
-         let lnum = prevnonblank(lnum - 1)
-         if lnum <= 0
-            return a:prev_indent
-         endif
+	 let line = substitute( getline(lnum), s:AdaComment, '', '' )
+	 if line !~ '^\s*$' && line !~ '^\s*#'
+	    break
+	 endif
+	 let lnum = prevnonblank(lnum - 1)
+	 if lnum <= 0
+	    return a:prev_indent
+	 endif
       endwhile
    endwhile
    " Fallback - just move back one
@@ -82,15 +82,15 @@ function s:EndBlockIndent( prev_indent, prev_lnum, blockstart, blockend )
    while lnum > 1
       if getline(lnum) =~ '^\s*' . a:blockstart
 	 let ind = indent(lnum)
-         if ends <= 0
-            if ind < a:prev_indent
+	 if ends <= 0
+	    if ind < a:prev_indent
 	       return ind
-            endif
-         else
-            let ends = ends - 1
+	    endif
+	 else
+	    let ends = ends - 1
 	 endif
       elseif getline(lnum) =~ '^\s*' . a:blockend
-         let ends = ends + 1
+	 let ends = ends + 1
       endif
 
       let lnum = prevnonblank(lnum - 1)
@@ -122,25 +122,25 @@ function s:StatementIndent( current_indent, prev_lnum )
       let lnum = prevnonblank(lnum - 1)
       " Get previous non-blank/non-comment-only line
       while 1
-         let line = substitute( getline(lnum), s:AdaComment, '', '' )
-         if line !~ '^\s*$' && line !~ '^\s*#'
-            break
-         endif
-         let lnum = prevnonblank(lnum - 1)
-         if lnum <= 0
-            return a:current_indent
-         endif
+	 let line = substitute( getline(lnum), s:AdaComment, '', '' )
+	 if line !~ '^\s*$' && line !~ '^\s*#'
+	    break
+	 endif
+	 let lnum = prevnonblank(lnum - 1)
+	 if lnum <= 0
+	    return a:current_indent
+	 endif
       endwhile
       " Leave indent alone if our ';' line is part of a ';'-delineated
       " aggregate (e.g., procedure args.) or first line after a block start.
       if line =~ s:AdaBlockStart || line =~ '(\s*$'
-         return a:current_indent
+	 return a:current_indent
       endif
       if line !~ '[.=(]\s*$'
-         let ind = indent(prev_lnum)
-         if ind < a:current_indent
-            return ind
-         endif
+	 let ind = indent(prev_lnum)
+	 if ind < a:current_indent
+	    return ind
+	 endif
       endif
    endwhile
    " Fallback - just use current one
@@ -159,11 +159,11 @@ function GetAdaIndent()
    while 1
       let line = substitute( getline(lnum), s:AdaComment, '', '' )
       if line !~ '^\s*$' && line !~ '^\s*#'
-         break
+	 break
       endif
       let lnum = prevnonblank(lnum - 1)
       if lnum <= 0
-         return ind
+	 return ind
       endif
    endwhile
 
@@ -176,15 +176,15 @@ function GetAdaIndent()
       " Check for false matches to AdaBlockStart
       let false_match = 0
       if line =~ '^\s*\(procedure\|function\|package\)\>.*\<is\s*new\>'
-         " Generic instantiation
-         let false_match = 1
+	 " Generic instantiation
+	 let false_match = 1
       elseif line =~ ')\s*;\s*$'  ||  line =~ '^\([^(]*([^)]*)\)*[^(]*;\s*$'
-         " forward declaration
-         let false_match = 1
+	 " forward declaration
+	 let false_match = 1
       endif
       " Move indent in
       if ! false_match
-         let ind = ind + &sw
+	 let ind = ind + &sw
       endif
    elseif line =~ '^\s*\(case\|exception\)\>'
       " Move indent in twice (next 'when' will move back)
@@ -198,10 +198,10 @@ function GetAdaIndent()
       exe lnum
       exe 'normal! $F)%'
       if getline('.') =~ '^\s*('
-         " Dire layout - use previous indent (could check for AdaComment here)
-         let ind = indent( prevnonblank( line('.')-1 ) )
+	 " Dire layout - use previous indent (could check for AdaComment here)
+	 let ind = indent( prevnonblank( line('.')-1 ) )
       else
-         let ind = indent('.')
+	 let ind = indent('.')
       endif
       exe v:lnum
    elseif line =~ '[.=(]\s*$'
@@ -227,7 +227,7 @@ function GetAdaIndent()
    elseif continuation && line =~ '^\s*('
       " Don't do this if we've already indented due to the previous line
       if ind == initind
-         let ind = ind + &sw
+	 let ind = ind + &sw
       endif
    elseif line =~ '^\s*\(begin\|is\)\>'
       let ind = s:MainBlockIndent( ind, lnum, '\(procedure\|function\|declare\|package\|task\)\>', 'begin\>' )
diff --git a/runtime/indent/automake.vim b/runtime/indent/automake.vim
index 28d77a814..5fbc222bc 100644
--- a/runtime/indent/automake.vim
+++ b/runtime/indent/automake.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         automake
+" Language:	    automake
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/ch.vim b/runtime/indent/ch.vim
index 12d583d06..e1bd8a356 100644
--- a/runtime/indent/ch.vim
+++ b/runtime/indent/ch.vim
@@ -1,9 +1,9 @@
 " Vim indent file
 " Language:	Ch
-" Maintainer:   SoftIntegration, Inc. <info@softintegration.com>
-" URL:          http://www.softintegration.com/download/vim/indent/ch.vim
-" Last change:  2003 Aug 05
-"               Created based on cpp.vim
+" Maintainer:	SoftIntegration, Inc. <info@softintegration.com>
+" URL:		http://www.softintegration.com/download/vim/indent/ch.vim
+" Last change:	2006 Apr 30
+"		Created based on cpp.vim
 "
 " Ch is a C/C++ interpreter with many high level extensions
 
diff --git a/runtime/indent/cmake.vim b/runtime/indent/cmake.vim
index a1ad832f2..46184c688 100644
--- a/runtime/indent/cmake.vim
+++ b/runtime/indent/cmake.vim
@@ -1,11 +1,11 @@
 " =============================================================================
-" 
+"
 "   Program:   CMake - Cross-Platform Makefile Generator
 "   Module:    $RCSfile$
 "   Language:  VIM
 "   Date:      $Date$
 "   Version:   $Revision$
-" 
+"
 " =============================================================================
 
 " Vim indent file
diff --git a/runtime/indent/config.vim b/runtime/indent/config.vim
index d763db0dc..77b4ebf1e 100644
--- a/runtime/indent/config.vim
+++ b/runtime/indent/config.vim
@@ -1,16 +1,16 @@
 " Vim indent file
-" Language:         Autoconf configure.{ac,in} file
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Language:	    Autoconf configure.{ac,in} file
+" Maintainer:	    Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
-" TODO:             how about nested [()]'s in one line
-"                   what's wrong with '\\\@!'?
+" TODO:		    how about nested [()]'s in one line
+"		    what's wrong with '\\\@!'?
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/sh.vim          " will set b:did_indent
+runtime! indent/sh.vim		" will set b:did_indent
 
 setlocal indentexpr=GetConfigIndent()
 setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
diff --git a/runtime/indent/css.vim b/runtime/indent/css.vim
index 8c6f114fb..be1c4d73e 100644
--- a/runtime/indent/css.vim
+++ b/runtime/indent/css.vim
@@ -22,12 +22,12 @@ function s:prevnonblanknoncomment(lnum)
     let line = getline(lnum)
     if line =~ '\*/'
       while lnum > 1 && line !~ '/\*'
-        let lnum -= 1
+	let lnum -= 1
       endwhile
       if line =~ '^\s*/\*'
-        let lnum -= 1
+	let lnum -= 1
       else
-        break
+	break
       endif
     else
       break
@@ -45,13 +45,13 @@ function s:count_braces(lnum, count_open)
   while i != -1
     if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
       if line[i] == '{'
-        let n_open += 1
+	let n_open += 1
       elseif line[i] == '}'
-        if n_open > 0
-          let n_open -= 1
-        else
-          let n_close += 1
-        endif
+	if n_open > 0
+	  let n_open -= 1
+	else
+	  let n_close += 1
+	endif
       endif
     endif
     let i = match(line, pattern, i + 1)
diff --git a/runtime/indent/docbk.vim b/runtime/indent/docbk.vim
index b8af5f2a1..3fde2a13b 100644
--- a/runtime/indent/docbk.vim
+++ b/runtime/indent/docbk.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         DocBook Documentation Format
+" Language:	    DocBook Documentation Format
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/eterm.vim b/runtime/indent/eterm.vim
index 730924068..7424d917c 100644
--- a/runtime/indent/eterm.vim
+++ b/runtime/indent/eterm.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         Eterm configuration file
+" Language:	    Eterm configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 6c2d49942..cfea7d85e 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -1,7 +1,7 @@
 " Description:	html indenter
 " Author:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Tue, 27 Apr 2004 10:28:39 CEST
-" Globals:	g:html_indent_tags         -- indenting tags
+" Globals:	g:html_indent_tags	   -- indenting tags
 "		g:html_indent_strict       -- inhibit 'O O' elements
 "		g:html_indent_strict_table -- inhibit 'O -' elements
 
diff --git a/runtime/indent/make.vim b/runtime/indent/make.vim
index 65670566b..3fe5a493e 100644
--- a/runtime/indent/make.vim
+++ b/runtime/indent/make.vim
@@ -1,6 +1,6 @@
 " Vim indent file
-" Language:         Makefile
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
+" Language:	    Makefile
+" Maintainer:	    Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-26
 
 if exists("b:did_indent")
@@ -22,7 +22,7 @@ let s:assignment_rx = '^\s*\h\w*\s*+\==\s*\zs.*\\$'
 
 " TODO: Deal with comments, string, and all kinds of other crap, e.g., defines.
 " TODO: Unwrap the whole logic of this function into something that requires a
-" lot less “return”s.
+" lot less 'return's.
 function GetMakeIndent()
   let lnum = v:lnum - 1
   if lnum == 0
@@ -30,92 +30,92 @@ function GetMakeIndent()
   endif
 
   " Figure out if the previous line is part of a rule or not.  If it is, then
-  " we more or less just indent by a ‘tabstop’, the previous’ lines indent, or
+  " we more or less just indent by a 'tabstop', the previous' lines indent, or
   " remove all indent if the current line is itself a rule.  Also, if the line
   " in question is part of a continuation-line set constituting the rule line
-  " itself, we indent by either a ‘shiftwidth’, if the line is the first in the
+  " itself, we indent by either a 'shiftwidth', if the line is the first in the
   " continuation, or use the indent of the previous line, if not.
   while lnum > 0
     let line = getline(lnum)
     if line[0] != "\t"
-      " We found a non-shell-command line, i.e., one that doesn’t have a
+      " We found a non-shell-command line, i.e., one that doesn't have a
       " leading tab.
       if line =~ s:rule_rx
-        " The line looks like a rule line, so we must therefore either be inside a
-        " rule or we are a continuation line to that rule line.
-        if line =~ s:continuation_rx
-          " Ah, the rule line was continued, so look up the last continuation
-          " line that’s above the current line.
-          while line =~ s:continuation_rx && lnum < v:lnum
-            let lnum += 1
-            let line = getline(lnum)
-          endwhile
-          let lnum -= 1
-          let line = getline(lnum)
-        endif
+	" The line looks like a rule line, so we must therefore either be inside a
+	" rule or we are a continuation line to that rule line.
+	if line =~ s:continuation_rx
+	  " Ah, the rule line was continued, so look up the last continuation
+	  " line that's above the current line.
+	  while line =~ s:continuation_rx && lnum < v:lnum
+	    let lnum += 1
+	    let line = getline(lnum)
+	  endwhile
+	  let lnum -= 1
+	  let line = getline(lnum)
+	endif
 
-        " If the line that we’ve found is right above the current line, deal
-        " with it specifically.
-        if lnum == v:lnum - 1
-          " If it was continued, indent the current line by a shiftwidth, as it
-          " is the first to follow it.  Otherwise, depending on if the current
-          " line is a rule line, i.e, a rule line following another rule line,
-          " then indent to the left margin.  Otherwise, the current line is the
-          " first shell-command line in the rule, so indent by a ‘tabstop’
-          if line =~ s:continuation_rx
-            return &sw
-          else
-            return getline(v:lnum) =~ s:rule_rx ? 0 : &ts
-          endif
-        else
-          " If the previous line was a continuation line, then unless it was
-          " itself a part of a continuation line, add a ‘shiftwidth’’s worth of
-          " indent.  Otherwise, just use the indent of the previous line.
-          " Otherwise, if the previous line wasn’t a continuation line, check
-          " if the one above it was.  If it was then indent to whatever level
-          " the “owning” line had.  Otherwise, indent to the previous line’s
-          " level.
-          let lnum = v:lnum - 1
-          let line = getline(lnum)
-          if line =~ s:continuation_rx
-            let pnum = v:lnum - 2
-            let pine = getline(pnum)
-            if pine =~ s:continuation_rx
-              return indent(lnum)
-            else
-              return indent(lnum) + &sw
-            endif
-          else
-            let lnum = v:lnum - 2
-            let line = getline(lnum)
-            if line =~ s:continuation_rx
-              while lnum > 0
-                if line !~ s:continuation_rx
-                  let lnum += 1
-                  let line = getline(lnum)
-                  break
-                endif
-                let lnum -= 1
-                let line = getline(lnum)
-              endwhile
-              " We’ve found the owning line.  Indent to it’s level.
-              return indent(lnum)
-            else
-              return indent(v:lnum - 1)
-            endif
-          endif
-        endif
+	" If the line that we've found is right above the current line, deal
+	" with it specifically.
+	if lnum == v:lnum - 1
+	  " If it was continued, indent the current line by a shiftwidth, as it
+	  " is the first to follow it.  Otherwise, depending on if the current
+	  " line is a rule line, i.e, a rule line following another rule line,
+	  " then indent to the left margin.  Otherwise, the current line is the
+	  " first shell-command line in the rule, so indent by a 'tabstop'
+	  if line =~ s:continuation_rx
+	    return &sw
+	  else
+	    return getline(v:lnum) =~ s:rule_rx ? 0 : &ts
+	  endif
+	else
+	  " If the previous line was a continuation line, then unless it was
+	  " itself a part of a continuation line, add a 'shiftwidth''s worth of
+	  " indent.  Otherwise, just use the indent of the previous line.
+	  " Otherwise, if the previous line wasn't a continuation line, check
+	  " if the one above it was.  If it was then indent to whatever level
+	  " the 'owning' line had.  Otherwise, indent to the previous line's
+	  " level.
+	  let lnum = v:lnum - 1
+	  let line = getline(lnum)
+	  if line =~ s:continuation_rx
+	    let pnum = v:lnum - 2
+	    let pine = getline(pnum)
+	    if pine =~ s:continuation_rx
+	      return indent(lnum)
+	    else
+	      return indent(lnum) + &sw
+	    endif
+	  else
+	    let lnum = v:lnum - 2
+	    let line = getline(lnum)
+	    if line =~ s:continuation_rx
+	      while lnum > 0
+		if line !~ s:continuation_rx
+		  let lnum += 1
+		  let line = getline(lnum)
+		  break
+		endif
+		let lnum -= 1
+		let line = getline(lnum)
+	      endwhile
+	      " We've found the owning line.  Indent to it's level.
+	      return indent(lnum)
+	    else
+	      return indent(v:lnum - 1)
+	    endif
+	  endif
+	endif
       endif
 
-      " The line wasn’t a rule line, so the current line is part of a series
-      " of tab-indented lines that don’t belong to any rule.
+      " The line wasn't a rule line, so the current line is part of a series
+      " of tab-indented lines that don't belong to any rule.
       break
     endif
     let lnum -= 1
   endwhile
 
   " If the line before the one we are currently indenting ended with a
-  " continuation, then try to figure out what “owns” that line and indent
+  " continuation, then try to figure out what 'owns' that line and indent
   " appropriately.
   let lnum = v:lnum - 1
   let line = getline(lnum)
@@ -124,34 +124,34 @@ function GetMakeIndent()
     if line =~ s:assignment_rx
       " The previous line is a continuation line that begins a variable-
       " assignment expression, so set the indent to just beyond the whitespace
-      " following the assignment operator (‘=’).
+      " following the assignment operator ('=').
       call cursor(lnum, 1)
       if search(s:assignment_rx, 'W') != 0
-        let indent = virtcol('.') - 1
+	let indent = virtcol('.') - 1
       endif
     endif
-    
-    " The previous line didn’t constitute an assignment, so just indent to
+
+    " The previous line didn't constitute an assignment, so just indent to
     " whatever level it had.
     return indent
   endif
 
   " If the line above the line above the current line ended was continued,
   " then the line above the current line was part of a continued line.  Find
-  " the “owning” line and indent to its level.
+  " the 'owning' line and indent to its level.
   let lnum = v:lnum - 2
   let line = getline(lnum)
   if line =~ s:continuation_rx
     while lnum > 0
       if line !~ s:continuation_rx
-        let lnum += 1
-        let line = getline(lnum)
-        break
+	let lnum += 1
+	let line = getline(lnum)
+	break
       endif
       let lnum -= 1
       let line = getline(lnum)
     endwhile
-    " We’ve found the owning line.  Indent to it’s level.
+    " We've found the owning line.  Indent to it's level.
     return indent(lnum)
   endif
 
diff --git a/runtime/indent/mma.vim b/runtime/indent/mma.vim
index 703e7dafd..356b87618 100644
--- a/runtime/indent/mma.vim
+++ b/runtime/indent/mma.vim
@@ -12,7 +12,7 @@
 "       let filetype_m="mma"
 "
 " Credits:
-" o steve hacked this out of a random indent file in the Vim 6.1 
+" o steve hacked this out of a random indent file in the Vim 6.1
 "   distribution that he no longer remembers...sh.vim?  Thanks!
 
 " Only load this indent file when no other was loaded.
@@ -30,7 +30,7 @@ if exists("*GetMmaIndent")
 endif
 
 function GetMmaIndent()
-   
+
     " Hit the start of the file, use zero indent.
     if v:lnum == 0
         return 0
@@ -38,21 +38,21 @@ function GetMmaIndent()
 
      " Find a non-blank line above the current line.
     let lnum = prevnonblank(v:lnum - 1)
-   
-    " use indenting as a base 
+
+    " use indenting as a base
     let ind = indent(v:lnum)
     let lnum = v:lnum
-    
+
     " if previous line has an unmatched bracket, or ( indent.
     " doesn't do multiple parens/blocks/etc...
-    
+
     " also, indent only if this line if this line isn't starting a new
     " block... TODO - fix this with indentkeys?
     if getline(v:lnum-1) =~ '\\\@<!\%(\[[^\]]*\|([^)]*\|{[^}]*\)$' && getline(v:lnum) !~ '\s\+[\[({]'
         let ind = ind+&sw
     endif
 
-    " if this line had unmatched closing block, 
+    " if this line had unmatched closing block,
     " indent to the matching opening block
     if getline(v:lnum) =~ '[^[]*]\s*$'
         " move to the closing bracket
diff --git a/runtime/indent/mupad.vim b/runtime/indent/mupad.vim
index aeef520e6..307aaf047 100644
--- a/runtime/indent/mupad.vim
+++ b/runtime/indent/mupad.vim
@@ -32,4 +32,4 @@ call GenericAllStmts()
 "
 " BUGS:  You tell me!  Probably.  I just haven't found one yet or haven't been
 "        told about one.
-"        
+"
diff --git a/runtime/indent/ocaml.vim b/runtime/indent/ocaml.vim
index 818b31bbc..1893d84a8 100644
--- a/runtime/indent/ocaml.vim
+++ b/runtime/indent/ocaml.vim
@@ -1,12 +1,12 @@
 " Vim indent file
 " Language:     OCaml
-" 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)
+" 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:	2006 Apr 30
+"		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")
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index de313814c..0f79fd9d5 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -2,7 +2,7 @@
 " Language:	PHP
 " Author:	John Wellesz <John.wellesz (AT) teaser (DOT) fr>
 " URL:		http://www.2072productions.com/vim/indent/php.vim
-" Last Change:  2006 January 15th
+" Last Change:  2006 Apr 30
 " Newsletter:   http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php
 " Version:	1.23
 "
@@ -10,7 +10,7 @@
 "
 "  For a complete change log and fully commented code, download the script on
 "  2072productions.com at the URI provided above.
-" 
+"
 "  If you find a bug, please e-mail me at John.wellesz (AT) teaser (DOT) fr
 "  with an example of code that breaks the algorithm.
 "
@@ -23,9 +23,9 @@
 "
 "
 "	In the case you have syntax errors in your script such as end of HereDoc
-"	tags not at col 1 you'll have to indent your file 2 times (This script 
+"	tags not at col 1 you'll have to indent your file 2 times (This script
 "	will automatically put HereDoc end tags at col 1).
-" 
+"
 "
 " NOTE: If you are editing file in Unix file format and that (by accident)
 " there are '\r' before new lines, this script won't be able to proceed
@@ -41,7 +41,7 @@
 
 " Options: PHP_autoformatcomment = 0 to not enable autoformating of comment by
 "		    default, if set to 0, this script will let the 'formatoptions' setting intact.
-" 
+"
 " Options: PHP_default_indenting = # of sw (default is 0), # of sw will be
 "		   added to the indent of each line of PHP code.
 "
@@ -116,7 +116,7 @@ let b:UserIsTypingComment = 0
 let b:optionsset = 0
 
 setlocal nosmartindent
-setlocal noautoindent 
+setlocal noautoindent
 setlocal nocindent
 setlocal nolisp
 
@@ -141,13 +141,13 @@ let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
 
 
 function! GetLastRealCodeLNum(startline) " {{{
-    
+
     let lnum = a:startline
-    
+
     if b:GetLastRealCodeLNum_ADD && b:GetLastRealCodeLNum_ADD == lnum + 1
 	let lnum = b:GetLastRealCodeLNum_ADD
     endif
-    
+
     let old_lnum = lnum
 
     while lnum > 1
@@ -194,7 +194,7 @@ function! GetLastRealCodeLNum(startline) " {{{
 		let lnum = lnum - 1
 	    endwhile
 	else
-	    break 
+	    break
 	endif
     endwhile
 
@@ -312,7 +312,7 @@ function! ResetOptions()
 	if b:PHP_autoformatcomment
 
 	    setlocal comments=s1:/*,mb:*,ex:*/,://,:#
-	    
+
 	    setlocal formatoptions-=t
 	    setlocal formatoptions+=q
 	    setlocal formatoptions+=r
@@ -341,7 +341,7 @@ function! GetPhpIndent()
 
     let cline = getline(v:lnum)
 
-    if !b:PHP_indentinghuge && b:PHP_lastindented > b:PHP_indentbeforelast 
+    if !b:PHP_indentinghuge && b:PHP_lastindented > b:PHP_indentbeforelast
 	if b:PHP_indentbeforelast
 	    let b:PHP_indentinghuge = 1
 	    echom 'Large indenting detected, speed optimizations engaged'
@@ -456,7 +456,7 @@ function! GetPhpIndent()
 		let b:InPHPcode_and_script = 1
 	    endif
 
-	elseif last_line =~? '<<<\a\w*$' 
+	elseif last_line =~? '<<<\a\w*$'
 	    let b:InPHPcode = 0
 	    let b:InPHPcode_tofind = substitute( last_line, '^.*<<<\(\a\w*\)\c', '^\\s*\1;$', '')
 
@@ -470,7 +470,7 @@ function! GetPhpIndent()
 	endif
     endif " }}}
 
-    
+
     if !b:InPHPcode && !b:InPHPcode_and_script
 	return -1
     endif
@@ -512,7 +512,7 @@ function! GetPhpIndent()
 	return 0
     endif
 
-    if  cline =~ '^\s*?>' && cline !~# '<?'  
+    if  cline =~ '^\s*?>' && cline !~# '<?'
 	return 0
     endif
 
@@ -561,7 +561,7 @@ function! GetPhpIndent()
 
     let defaultORcase = '^\s*\%(default\|case\).*:'
 
-    if last_line =~ '[;}]'.endline && last_line !~# defaultORcase 
+    if last_line =~ '[;}]'.endline && last_line !~# defaultORcase
 	if ind==b:PHP_default_indenting
 	    return b:PHP_default_indenting
 	elseif b:PHP_indentinghuge && ind==b:PHP_CurrentIndentLevel && cline !~# '^\s*\%(else\|\%(case\|default\).*:\|[})];\=\)' && last_line !~# '^\s*\%(\%(}\s*\)\=else\)' && getline(GetLastRealCodeLNum(lnum - 1))=~';'.endline
@@ -592,7 +592,7 @@ function! GetPhpIndent()
 		    let ind = ind + &sw
 		endif
 
-		return ind 
+		return ind
 	    endif
 
 	    let last_line_num = last_line_num - 1
@@ -644,7 +644,7 @@ function! GetPhpIndent()
 		    break
 		endif
 
-		if one_ahead_indent == two_ahead_indent || last_line_num < 1 
+		if one_ahead_indent == two_ahead_indent || last_line_num < 1
 		    if previous_line =~# '[;}]'.endline || last_line_num < 1
 			break
 		    endif
diff --git a/runtime/indent/python.vim b/runtime/indent/python.vim
index cda6ec741..3e14afc99 100644
--- a/runtime/indent/python.vim
+++ b/runtime/indent/python.vim
@@ -2,7 +2,7 @@
 " Language:		Python
 " Maintainer:		Bram Moolenaar <Bram@vim.org>
 " Original Author:	David Bustos <bustos@caltech.edu>
-" Last Change:		2006 Apr 22
+" Last Change:		2006 Apr 30
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -27,7 +27,7 @@ endif
 let s:maxoff = 50	" maximum number of lines to look backwards for ()
 
 function GetPythonIndent(lnum)
- 
+
   " If this line is explicitly joined: If the previous line was also joined,
   " line it up with that one, otherwise add two 'shiftwidth'
   if getline(a:lnum - 1) =~ '\\$'
diff --git a/runtime/indent/readline.vim b/runtime/indent/readline.vim
index 94e4ea403..45c8ab945 100644
--- a/runtime/indent/readline.vim
+++ b/runtime/indent/readline.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         readline configuration file
+" Language:	    readline configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim
index ac5e9bb5c..e6fe2b554 100644
--- a/runtime/indent/rst.vim
+++ b/runtime/indent/rst.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         reStructuredText Documentation Format
+" Language:	    reStructuredText Documentation Format
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
@@ -40,7 +40,7 @@ function GetRSTIndent()
       let ind = ind - 2
     elseif line =~ '^\s*\d\+\.\s'
       let ind = ind - matchend(substitute(line, '^\s*', '', ''),
-            \ '\d\+\.\s\+')
+	    \ '\d\+\.\s\+')
     elseif line =~ '^\s*\.\.'
       let ind = ind - 3
     else
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
index 7919c0960..483e5430e 100644
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         Shell Script
+" Language:	    Shell Script
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
@@ -30,8 +30,8 @@ function GetShIndent()
   let ind = indent(lnum)
   let line = getline(lnum)
   if line =~ '^\s*\(if\|then\|do\|else\|elif\|case\|while\|until\|for\)\>'
-        \ || line =~ '^\s*\<\k\+\>\s*()\s*{'
-        \ || line =~ '^\s*{'
+	\ || line =~ '^\s*\<\k\+\>\s*()\s*{'
+	\ || line =~ '^\s*{'
     if line !~ '\(esac\|fi\|done\)\>\s*$' && line !~ '}\s*$'
       let ind = ind + &sw
     endif
@@ -41,7 +41,7 @@ function GetShIndent()
   " Retain the indentation level if line matches fin (for find)
   let line = getline(v:lnum)
   if (line =~ '^\s*\(then\|do\|else\|elif\|esac\|fi\|done\)\>' || line =~ '^\s*}')
-        \ && line !~ '^\s*fi[ln]\>'
+	\ && line !~ '^\s*fi[ln]\>'
     let ind = ind - &sw
   endif
 
diff --git a/runtime/indent/sql.vim b/runtime/indent/sql.vim
index 490d652ae..f7cf83470 100644
--- a/runtime/indent/sql.vim
+++ b/runtime/indent/sql.vim
@@ -1,13 +1,13 @@
 " Vim indent file loader
-" Language:    SQL 
+" Language:    SQL
 " Maintainer:  David Fishburn <fishburn at ianywhere dot com>
 " Last Change: Thu Sep 15 2005 10:27:51 AM
 " Version:     1.0
 " Download:    http://vim.sourceforge.net/script.php?script_id=495
 
 " Description: Checks for a:
-"                  buffer local variable, 
-"                  global variable, 
+"                  buffer local variable,
+"                  global variable,
 "              If the above exist, it will source the type specified.
 "              If none exist, it will source the default sqlanywhere.vim file.
 
diff --git a/runtime/indent/sqlanywhere.vim b/runtime/indent/sqlanywhere.vim
index 65d711383..c2f527ebc 100644
--- a/runtime/indent/sqlanywhere.vim
+++ b/runtime/indent/sqlanywhere.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:    SQL 
+" Language:    SQL
 " Maintainer:  David Fishburn <fishburn at ianywhere dot com>
 " Last Change: Wed Sep 14 2005 10:21:15 PM
 " Version:     1.4
@@ -10,7 +10,7 @@
 "    Anywhere (ASA).  Test indenting was done with ASA stored procedures and
 "    fuctions and Oracle packages which contain stored procedures and
 "    functions.
-"    This has not been tested against Microsoft SQL Server or 
+"    This has not been tested against Microsoft SQL Server or
 "    Sybase Adaptive Server Enterprise (ASE) which use the Transact-SQL
 "    syntax.  That syntax does not have end tags for IF's, which makes
 "    indenting more difficult.
@@ -32,7 +32,7 @@ setlocal indentkeys-=:
 setlocal indentkeys-=0#
 setlocal indentkeys-=e
 
-" This indicates formatting should take place when one of these 
+" This indicates formatting should take place when one of these
 " expressions is used.  These expressions would normally be something
 " you would type at the BEGINNING of a line
 " SQL is generally case insensitive, so this files assumes that
@@ -40,7 +40,7 @@ setlocal indentkeys-=e
 " an indent right, since the SQLBlockStart is used for those keywords
 setlocal indentkeys+==~end,=~else,=~elseif,=~elsif,0=~when,0=)
 
-" GetSQLIndent is executed whenever one of the expressions 
+" GetSQLIndent is executed whenever one of the expressions
 " in the indentkeys is typed
 setlocal indentexpr=GetSQLIndent()
 
@@ -51,7 +51,7 @@ endif
 
 " List of all the statements that start a new block.
 " These are typically words that start a line.
-" IS is excluded, since it is difficult to determine when the 
+" IS is excluded, since it is difficult to determine when the
 " ending block is (especially for procedures/functions).
 let s:SQLBlockStart = '^\s*\%('.
             \ 'if\|else\|elseif\|elsif\|'.
@@ -114,7 +114,7 @@ function s:CheckToIgnoreRightParan( prev_lnum, num_levels )
             break
         endif
 
-        if matching_paran == lnum 
+        if matching_paran == lnum
             " This was not an unmatched parantenses, start the search again
             " again after this column
             " echom 'CTIRP - same line match, ignoring'
@@ -173,9 +173,9 @@ function s:GetStmtStarterIndent( keyword, curr_lnum )
     elseif a:keyword =~? 'when'
         exec 'normal! ^'
         let matching_lnum = searchpair(
-                    \ '\%(\<end\s\+\)\@<!\<case\>\|\<exception\>\|\<merge\>', 
-                    \ '', 
-                    \ '\%(\%(\<when\s\+others\>\)\|\%(\<end\s\+case\>\)\)', 
+                    \ '\%(\<end\s\+\)\@<!\<case\>\|\<exception\>\|\<merge\>',
+                    \ '',
+                    \ '\%(\%(\<when\s\+others\>\)\|\%(\<end\s\+case\>\)\)',
                     \ 'bW',
                     \ 'IsColComment(line("."), col(".")) == 1')
         exec 'normal! $'
@@ -193,10 +193,10 @@ endfunction
 " Check if the line is a comment
 function IsLineComment(lnum)
     let rc = synIDattr(
-                \ synID(a:lnum, 
+                \ synID(a:lnum,
                 \     match(getline(a:lnum), '\S')+1, 0)
-                \ , "name") 
-                \ =~? "comment" 
+                \ , "name")
+                \ =~? "comment"
 
     return rc
 endfunction
@@ -204,8 +204,8 @@ endfunction
 
 " Check if the column is a comment
 function IsColComment(lnum, cnum)
-    let rc = synIDattr(synID(a:lnum, a:cnum, 0), "name") 
-                \           =~? "comment" 
+    let rc = synIDattr(synID(a:lnum, a:cnum, 0), "name")
+                \           =~? "comment"
 
     return rc
 endfunction
@@ -214,7 +214,7 @@ endfunction
 " Check if the column is a comment
 function ModuloIndent(ind)
     let ind = a:ind
-    
+
     if ind > 0
         let modulo = ind % &shiftwidth
 
@@ -229,7 +229,7 @@ endfunction
 
 " Find correct indent of a new line based upon the previous line
 function GetSQLIndent()
-    let lnum = v:lnum 
+    let lnum = v:lnum
     let ind = indent(lnum)
 
     " If the current line is a comment, leave the indent as is
@@ -246,7 +246,7 @@ function GetSQLIndent()
             return ind
         endif
 
-        if IsLineComment(prevlnum) == 1 
+        if IsLineComment(prevlnum) == 1
             if getline(v:lnum) =~ '^\s*\*'
                 let ind = ModuloIndent(indent(prevlnum))
                 return ind + 1
@@ -269,13 +269,13 @@ function GetSQLIndent()
     "     endif
     " endwhile
 
-    " echom 'PREVIOUS INDENT: ' . indent(prevlnum) . '  LINE: ' . getline(prevlnum) 
+    " echom 'PREVIOUS INDENT: ' . indent(prevlnum) . '  LINE: ' . getline(prevlnum)
 
     " This is the line you just hit return on, it is not the current line
     " which is new and empty
     " Based on this line, we can determine how much to indent the new
     " line
-    
+
     " Get default indent (from prev. line)
     let ind      = indent(prevlnum)
     let prevline = getline(prevlnum)
@@ -300,7 +300,7 @@ function GetSQLIndent()
             " let num_unmatched_right  = s:CountUnbalancedParan( prevline, ')' )
         endif
         if num_unmatched_left > 0
-            " There is a open left paranethesis 
+            " There is a open left paranethesis
             " increase indent
             let ind = ind + ( &sw * num_unmatched_left )
         elseif num_unmatched_right > 0
@@ -331,7 +331,7 @@ function GetSQLIndent()
     let line = getline(v:lnum)
 
     if line =~? '^\s*els'
-        " Any line when you type else will automatically back up one 
+        " Any line when you type else will automatically back up one
         " ident level  (ie else, elseif, elsif)
         let ind = ind - &sw
         " echom 'curr - else - indent ' . ind
@@ -356,11 +356,11 @@ function GetSQLIndent()
         " If the line ends in a ), then reduce the indent
         " This catches items like:
         " CREATE TABLE T1(
-        "    c1 int, 
+        "    c1 int,
         "    c2 int
         "    );
         " But we do not want to unindent a line like:
-        " IF ( c1 = 1 
+        " IF ( c1 = 1
         " AND  c2 = 3 ) THEN
         " let num_unmatched_right  = s:CountUnbalancedParan( line, ')' )
         " if num_unmatched_right > 0
diff --git a/runtime/indent/tcl.vim b/runtime/indent/tcl.vim
index 1b0cc16d5..5a5aa1db6 100644
--- a/runtime/indent/tcl.vim
+++ b/runtime/indent/tcl.vim
@@ -36,13 +36,13 @@ function s:count_braces(lnum, count_open)
   while i != -1
     if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'tcl\%(Comment\|String\)'
       if line[i] == '{'
-        let n_open += 1
+	let n_open += 1
       elseif line[i] == '}'
-        if n_open > 0
-          let n_open -= 1
-        else
-          let n_close += 1
-        endif
+	if n_open > 0
+	  let n_open -= 1
+	else
+	  let n_close += 1
+	endif
       endif
     endif
     let i = match(line, pattern, i + 1)
diff --git a/runtime/indent/xf86conf.vim b/runtime/indent/xf86conf.vim
index 5b2be6d3e..04f54c904 100644
--- a/runtime/indent/xf86conf.vim
+++ b/runtime/indent/xf86conf.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         XFree86 Configuration File
+" Language:	    XFree86 Configuration File
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/yacc.vim b/runtime/indent/yacc.vim
index d100ceb38..597a2cc83 100644
--- a/runtime/indent/yacc.vim
+++ b/runtime/indent/yacc.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         YACC input file
+" Language:	    YACC input file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/indent/zsh.vim b/runtime/indent/zsh.vim
index 5bf231521..c5580a10b 100644
--- a/runtime/indent/zsh.vim
+++ b/runtime/indent/zsh.vim
@@ -1,5 +1,5 @@
 " Vim indent file
-" Language:         Zsh Shell Script
+" Language:	    Zsh Shell Script
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2006-04-19
 
diff --git a/runtime/keymap/greek_cp737.vim b/runtime/keymap/greek_cp737.vim
index e41114eb3..dd0b37282 100644
--- a/runtime/keymap/greek_cp737.vim
+++ b/runtime/keymap/greek_cp737.vim
@@ -5,7 +5,7 @@
 " This keyboard layout allows all Greek symbols to be typed,
 " including accented capitals and diaeresis. It does not
 " include diaeresis and accent on the same vowel, nor
-" the greek quotes, as these were not included in the codepage. 
+" the greek quotes, as these were not included in the codepage.
 " It includes the Greek semicolon sign.
 
 "
diff --git a/runtime/keymap/greek_utf-8.vim b/runtime/keymap/greek_utf-8.vim
index dc9e10e60..17564542d 100644
--- a/runtime/keymap/greek_utf-8.vim
+++ b/runtime/keymap/greek_utf-8.vim
@@ -2,7 +2,7 @@
 " Maintainer: Panagiotis Louridas <louridas@acm.org>
 " Last Updated: Thu Mar 23 23:45:02 EET 2006
 
-" This file was corrected for Vim after the version adapted for Vim 6 from 
+" This file was corrected for Vim after the version adapted for Vim 6 from
 " the yudit distribution by Robert Goulding <goulding@princeton.edu>
 "
 " The monotonic part of this kmap was made by Constantine Stathopoulos
diff --git a/runtime/keymap/kana.vim b/runtime/keymap/kana.vim
index 644b0ab44..23b5f876a 100644
--- a/runtime/keymap/kana.vim
+++ b/runtime/keymap/kana.vim
@@ -3,10 +3,10 @@
 "
 " Maintainer: Rory McCann <ebelular at gmail dot com>
 " Modified by: Edward L. Fox <edyfox at gmail dot com>
-" Last Change: 2006-04-29 11:14:32
+" Last Change: 2006 Apr 30
+"
+"
 "
-" 
-"  
 "  Kana.kmap (Japanese Phonograms)
 "
 "  Converted from Gaspar Sinai's yudit 2.7.6
@@ -27,15 +27,15 @@
 "	Summary:
 "
 "	(1) To transliterate Japanese language, Table 1 should be used
-"          primarily.
+"	   primarily.
 "	(2) Table 2 may be used only when existing conventions such as
-"          international relationship should be respected.
+"	   international relationship should be respected.
 "	(3) Other transliteration is acceptable only when neither Table 1
 "	    nor Table 2 gives any specification of the sound in question
 "
 "	For details, refer to
 "
-"	    http://xembho.tripod.com/siryo/naikaku_kokuzi.html	    
+"	    http://xembho.tripod.com/siryo/naikaku_kokuzi.html
 "
 "  2.	The specification instructed by the Cabinet Notification is rather
 "	inadequate even for daily use.  At the present time there are thus
diff --git a/runtime/keymap/polish-slash.vim b/runtime/keymap/polish-slash.vim
index cc9377f4a..a4300781f 100644
--- a/runtime/keymap/polish-slash.vim
+++ b/runtime/keymap/polish-slash.vim
@@ -2,7 +2,7 @@
 " Maintainer:   HS6_06 <hs6_06@o2.pl>
 " Last changed: 2005 Jan 12
 " Current version: 1.0.2
-" History: 
+" History:
 "  2005.01.12 1.0.2 keymap_name shortened, added Current version, History
 "  2005.01.10 1.0.1 un*x line ends for all files
 "  2005.01.09 1.0.0 Initial release
diff --git a/runtime/keymap/polish-slash_cp1250.vim b/runtime/keymap/polish-slash_cp1250.vim
index df1f67a21..4ef2b22a0 100644
--- a/runtime/keymap/polish-slash_cp1250.vim
+++ b/runtime/keymap/polish-slash_cp1250.vim
@@ -4,7 +4,7 @@
 " Current version: 1.0.2
 " History: see polish-slash.vim
 
-" This keymap adds the special Polish letters 
+" This keymap adds the special Polish letters
 " to an existing Latin keyboard.
 " All chars as usual except:
 " Polish:
diff --git a/runtime/keymap/polish-slash_cp852.vim b/runtime/keymap/polish-slash_cp852.vim
index 85c3b4044..22c1809e1 100644
--- a/runtime/keymap/polish-slash_cp852.vim
+++ b/runtime/keymap/polish-slash_cp852.vim
@@ -4,7 +4,7 @@
 " Current version: 1.0.2
 " History: see polish-slash.vim
 
-" This keymap adds the special Polish letters 
+" This keymap adds the special Polish letters
 " to an existing Latin keyboard.
 " All chars as usual except:
 " Polish:
diff --git a/runtime/keymap/polish-slash_iso-8859-2.vim b/runtime/keymap/polish-slash_iso-8859-2.vim
index 50179ce52..3a1203af8 100644
--- a/runtime/keymap/polish-slash_iso-8859-2.vim
+++ b/runtime/keymap/polish-slash_iso-8859-2.vim
@@ -4,7 +4,7 @@
 " Current version: 1.0.2
 " History: polish-slash.vim
 
-" This keymap adds the special Polish letters 
+" This keymap adds the special Polish letters
 " to an existing Latin keyboard.
 " All chars as usual except:
 " Polish:
diff --git a/runtime/keymap/polish-slash_utf-8.vim b/runtime/keymap/polish-slash_utf-8.vim
index 4da656db0..3a4eb70e2 100644
--- a/runtime/keymap/polish-slash_utf-8.vim
+++ b/runtime/keymap/polish-slash_utf-8.vim
@@ -4,7 +4,7 @@
 " Current version: 1.0.2
 " History: see polish-slash.vim
 
-" This keymap adds the special Polish letters 
+" This keymap adds the special Polish letters
 " to an existing Latin keyboard.
 " All chars as usual except:
 " Polish:
diff --git a/runtime/keymap/tamil_tscii.vim b/runtime/keymap/tamil_tscii.vim
index f2bb6caea..92dbdc9ae 100644
--- a/runtime/keymap/tamil_tscii.vim
+++ b/runtime/keymap/tamil_tscii.vim
@@ -9,7 +9,7 @@
 "
 " Visit http://www.tscii.org for more information about the TSCII
 " encoding.
-" 
+"
 let b:keymap_name = "tamil_tscii"
 
 loadkeymap
diff --git a/runtime/lang/menu_de_de.latin1.vim b/runtime/lang/menu_de_de.latin1.vim
index 3d2858182..f37446518 100644
--- a/runtime/lang/menu_de_de.latin1.vim
+++ b/runtime/lang/menu_de_de.latin1.vim
@@ -55,7 +55,7 @@ menutrans Find\ and\ Rep&lace\.\.\.	Suchen\ und\ &Ersetzen\.\.\.
 " XXX &E would conflict with 'Suchen\ und\ &Ersetzen', see above
 menutrans Settings\ &Window				E&instellungen\.\.\.
 menutrans &Global\ Settings				&Globale\ Einstellungen
-menutrans Startup\ &Settings                            &Starteinstellungen
+menutrans Startup\ &Settings				&Starteinstellungen
 
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	&Hervorhebungen\ ein-\ und\ ausschalten<Tab>:set\ hls!
 menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		Gro�schreibung\ &ignorieren\ oder\ benutzen<Tab>:set\ ic!
@@ -247,8 +247,8 @@ menutrans &Paste			&Einf�gen
 menutrans &Delete			&L�schen
 menutrans Select\ Blockwise		Auswahl\ blockartig
 menutrans Select\ &Word			Auswahl\ des\ &Wortes
-menutrans Select\ &Sentence             Auswahl\ des\ Sa&tzes
-menutrans Select\ Pa&ragraph            Auswahl\ des\ Absatzes
+menutrans Select\ &Sentence		Auswahl\ des\ Sa&tzes
+menutrans Select\ Pa&ragraph		Auswahl\ des\ Absatzes
 menutrans Select\ &Line			Auswahl\ der\ &Zeile
 menutrans Select\ &Block		Auswahl\ des\ &Blocks
 menutrans Select\ &All			&Alles\ Ausw�hlen
diff --git a/runtime/lang/menu_fr_fr.latin1.vim b/runtime/lang/menu_fr_fr.latin1.vim
index e4b1bb8fe..e8881bd69 100644
--- a/runtime/lang/menu_fr_fr.latin1.vim
+++ b/runtime/lang/menu_fr_fr.latin1.vim
@@ -2,7 +2,7 @@
 " Maintainer:		Adrien Beau <version.francaise@free.fr>
 " First Version:	Francois Thunus <thunus@systran.fr>
 " Last Modification:    David Blanchet <david.blanchet@free.fr>
-" Last Change:		2006 Apr 11
+" Last Change:		2006 Apr 30
 
 " Quit when menu translations have already been done.
 if exists("did_menu_trans")
@@ -152,7 +152,7 @@ menutrans Set\ language\ to\ "en_gb"		Anglais\ (en_gb)
 menutrans Set\ language\ to\ "en_nz"		Anglais\ (en_nz)
 menutrans Set\ language\ to\ "en_us"		Anglais\ (en_us)
 
-menutrans &Find\ More\ Languages		&Trouver\ d'autres\ langues 
+menutrans &Find\ More\ Languages		&Trouver\ d'autres\ langues
 
 
 
diff --git a/runtime/lang/menu_pl_pl.utf-8.vim b/runtime/lang/menu_pl_pl.utf-8.vim
index 3e93d1e63..540cd842c 100644
--- a/runtime/lang/menu_pl_pl.utf-8.vim
+++ b/runtime/lang/menu_pl_pl.utf-8.vim
@@ -75,7 +75,7 @@ menutrans hebrew			hebrajski
 menutrans hebrewp			hebrajski\ p
 menutrans russian-jcuken		rosyjski-jcuken
 menutrans russian-jcukenwin		rosyjski-jcukenwin
-menutrans russian-yawerty  		rosyjski-yawerty
+menutrans russian-yawerty		rosyjski-yawerty
 
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	Podkre�lanie\ &wzorc�w<Tab>:set\ hls!
 
diff --git a/runtime/macmap.vim b/runtime/macmap.vim
index 28c729aaa..1717d99c9 100644
--- a/runtime/macmap.vim
+++ b/runtime/macmap.vim
@@ -1,5 +1,5 @@
 " System gvimrc file for Mac OS X
-" Author:  	Benji Fisher <benji@member.AMS.org>
+" Author:	Benji Fisher <benji@member.AMS.org>
 " Last Change: Thu Mar 09 09:00 AM 2006 EST
 "
 " Define Mac-standard keyboard shortcuts.
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index b062c5b22..f0feed08f 100644
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
-" Vim Plugin: 	Edit the file with an existing Vim if possible
+" Vim Plugin:	Edit the file with an existing Vim if possible
 " Maintainer:	Bram Moolenaar
-" Last Change:	2005 Dec 15
+" Last Change:	2006 Apr 30
 
 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
 " $VIM/vimfiles/plugin directory.  Or make a symbolic link, so that you
@@ -35,7 +35,7 @@ func s:EditElsewhere(filename)
     if servername ==? v:servername
       continue
     endif
-   
+
     " Check if this server is editing our file.
     if remote_expr(servername, "bufloaded('" . fname_esc . "')")
       " Yes, bring it to the foreground.
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 8c5b4cf42..95891776e 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Apr 19
+" Last Change: 2006 Apr 30
 "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
 "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
 
@@ -111,9 +111,9 @@ function! s:HtmlFormat(text, style_name)
 
   " Replace the reserved html characters
   let formatted = substitute(substitute(substitute(substitute(substitute(formatted, '&', '\&amp;', 'g'), '<', '\&lt;', 'g'), '>', '\&gt;', 'g'), '"', '\&quot;', 'g'), "\x0c", '<hr class="PAGE-BREAK">', 'g')
-  
+
   " Replace double spaces and leading spaces
-  if ' ' != s:HtmlSpace 
+  if ' ' != s:HtmlSpace
     let formatted = substitute(formatted, '  ', s:HtmlSpace . s:HtmlSpace, 'g')
     let formatted = substitute(formatted, '^ ', s:HtmlSpace, 'g')
   endif
@@ -306,10 +306,10 @@ while s:lnum <= s:end
     let s:n = s:filler
     while s:n > 0
       if s:numblines
-        " Indent if line numbering is on
-        let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
+	" Indent if line numbering is on
+	let s:new = repeat(s:LeadingSpace, strlen(s:end) + 1) . repeat(s:difffillchar, 3)
       else
-        let s:new = repeat(s:difffillchar, 3)
+	let s:new = repeat(s:difffillchar, 3)
       endif
 
       if s:n > 2 && s:n < s:filler && !exists("html_whole_filler")
@@ -318,8 +318,8 @@ while s:lnum <= s:end
       endif
 
       if !exists("html_no_pre")
-        " HTML line wrapping is off--go ahead and fill to the margin
-        let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new))
+	" HTML line wrapping is off--go ahead and fill to the margin
+	let s:new = s:new . repeat(s:difffillchar, &columns - strlen(s:new))
       endif
 
       let s:new = s:HtmlFormat(s:new, "DiffDelete")
@@ -349,10 +349,10 @@ while s:lnum <= s:end
       " HTML line wrapping is off--go ahead and fill to the margin
       let s:new = s:new . repeat(s:foldfillchar, &columns - strlen(s:new))
     endif
-    
+
     let s:new = s:HtmlFormat(s:new, "Folded")
 
-    " Skip to the end of the fold  
+    " Skip to the end of the fold
     let s:lnum = foldclosedend(s:lnum)
 
   else
@@ -380,11 +380,11 @@ while s:lnum <= s:end
 	" Speed loop (it's small - that's the trick)
 	" Go along till we find a change in hlID
 	while s:col <= s:len && s:id == diff_hlID(s:lnum, s:col) | let s:col = s:col + 1 | endwhile
-        if s:len < &columns && !exists("html_no_pre")
+	if s:len < &columns && !exists("html_no_pre")
 	  " Add spaces at the end to mark the changed line.
-          let s:line = s:line . repeat(' ', &columns - s:len)
-          let s:len = &columns
-        endif
+	  let s:line = s:line . repeat(' ', &columns - s:len)
+	  let s:len = &columns
+	endif
       else
 	let s:id = synID(s:lnum, s:col, 1)
 	let s:col = s:col + 1
@@ -397,9 +397,9 @@ while s:lnum <= s:end
       let s:expandedtab = strpart(s:line, s:startcol - 1, s:col - s:startcol)
       let idx = stridx(s:expandedtab, "\t")
       while idx >= 0
-        let i = &ts - ((idx + s:startcol - 1) % &ts)
-        let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
-        let idx = stridx(s:expandedtab, "\t")
+	let i = &ts - ((idx + s:startcol - 1) % &ts)
+	let s:expandedtab = substitute(s:expandedtab, '\t', repeat(' ', i), '')
+	let idx = stridx(s:expandedtab, "\t")
       endwhile
 
       " Output the text with the same synID, with class set to {s:id_name}
@@ -512,7 +512,7 @@ if exists("html_use_css")
   endif
 endif
 
-if exists("use_xhtml") 
+if exists("use_xhtml")
   exe "normal! gg/<html/e\na xmlns=\"http://www.w3.org/1999/xhtml\"\e"
 endif
 
diff --git a/runtime/syntax/chordpro.vim b/runtime/syntax/chordpro.vim
index a251a6945..5ccec2650 100644
--- a/runtime/syntax/chordpro.vim
+++ b/runtime/syntax/chordpro.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     ChordPro (v. 3.6.2)
 " Maintainer:   Niels Bo Andersen <niels@niboan.dk>
-" Last Change:	2006 Apr 20 
+" Last Change:	2006 Apr 30
 " Remark:       Requires VIM version 6.00 or greater
 
 " Quit when a syntax file was already loaded
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index abd72179a..244e05359 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -1,10 +1,10 @@
 " Vim syntax file for the D programming language (version 0.149).
 "
 " Language:	D
-" Maintainer:	Jason Mills<jmills@cs.mun.ca> 
+" Maintainer:	Jason Mills<jmills@cs.mun.ca>
 "   When emailing me, please put the word vim somewhere in the subject
 "   to ensure the email does not get marked as spam.
-" Last Change:	2006 Mar 12
+" Last Change:	2006 Apr 30
 " Version:	0.15
 "
 " Options:
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
index 911e1bedf..aa65fda3f 100644
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Eviews (http://www.eviews.com)
 " Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change:  2006 Jan 11
+" Last Change:  2006 Apr 30
 " Filenames:	*.prg
-" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim	
+" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
index 9999ff0f4..37299b894 100644
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:	gretl (http://gretl.sf.net) 
+" Language:	gretl (http://gretl.sf.net)
 " Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change:  2006 Jan 6
+" Last Change:  2006 Apr 30
 " Filenames:	*.inp *.gretl
-" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim	
+" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 0c250c643..85ea0810a 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -2,7 +2,7 @@
 " Language:     Java
 " Maintainer:   Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/java.vim
-" Last Change:  2006 Jan 15
+" Last Change:  2006 Apr 30
 
 " Please check :help java.vim for comments on some of the options available.
 
@@ -37,7 +37,7 @@ JavaHiLink javaError2 javaError
 
 " keyword definitions
 syn keyword javaExternal	native package
-syn match javaExternal          "\<import\>\(\s\+static\>\)\?"
+syn match javaExternal		"\<import\>\(\s\+static\>\)\?"
 syn keyword javaError		goto const
 syn keyword javaConditional	if else switch
 syn keyword javaRepeat		while for do
@@ -62,13 +62,13 @@ syn match   javaAnnotation      "@[_$a-zA-Z][_$a-zA-Z0-9_]*\>"
 syn match   javaClassDecl       "@interface\>"
 syn keyword javaBranch		break continue nextgroup=javaUserLabelRef skipwhite
 syn match   javaUserLabelRef	"\k\+" contained
-syn match   javaVarArg          "\.\.\."
+syn match   javaVarArg		"\.\.\."
 syn keyword javaScopeDecl	public protected private abstract
 
 if exists("java_highlight_java_lang_ids")
   let java_highlight_all=1
 endif
-if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("java_highlight_java_lang") 
+if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("java_highlight_java_lang")
   " java.lang.*
   syn match javaLangClass "\<System\>"
   syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index d43740b45..0645f3356 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -1,5 +1,5 @@
 " MUSHcode syntax file
-" Maintainer: Rick Bird <nveid@nveid.com>	
+" Maintainer: Rick Bird <nveid@nveid.com>
 " Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
 " Last Updated: Fri Nov 04 20:28:15 2005
 "
diff --git a/runtime/syntax/r.vim b/runtime/syntax/r.vim
index 8432c208e..f3e730ef9 100644
--- a/runtime/syntax/r.vim
+++ b/runtime/syntax/r.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	R (GNU S)
 " Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
-" Last Change:  2006 January 12 
+" Last Change:  2006 Apr 30
 " Filenames:	*.R *.Rout *.r *.Rhistory *.Rt *.Rout.save *.Rout.fail
 " URL:		http://uosis.mif.vu.lt/~zemlys/vim-syntax/r.vim
 
diff --git a/runtime/syntax/sql.vim b/runtime/syntax/sql.vim
index 935dec46d..311d9eeb8 100644
--- a/runtime/syntax/sql.vim
+++ b/runtime/syntax/sql.vim
@@ -5,8 +5,8 @@
 " Version:     1.0
 
 " Description: Checks for a:
-"                  buffer local variable, 
-"                  global variable, 
+"                  buffer local variable,
+"                  global variable,
 "              If the above exist, it will source the type specified.
 "              If none exist, it will source the default sql.vim file.
 "
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 57de8128f..54aecbb98 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 18
+" Last Change:	2006 Apr 30
 
 " This file sets up for syntax highlighting.
 " It is loaded from "syntax.vim" and "manual.vim".
@@ -59,10 +59,10 @@ endfun
 
 
 " Handle adding doxygen to other languages (C, C++, IDL)
-au Syntax cpp,c,idl 
+au Syntax cpp,c,idl
 	\ if (exists('b:load_doxygen_syntax') && b:load_doxygen_syntax)
 	\	|| (exists('g:load_doxygen_syntax') && g:load_doxygen_syntax)
-	\   | runtime! syntax/doxygen.vim 
+	\   | runtime! syntax/doxygen.vim
 	\ | endif
 
 
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index 9dc7f9595..2a92a0d54 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -2,7 +2,7 @@
 " Language:     WSML
 " Maintainer:   Thomas Haselwanter <thomas.haselwanter@deri.org>
 " URL:		none
-" Last Change:  2006 Mar 13
+" Last Change:  2006 Apr 30
 
 " Quit when a syntax file was already loaded
 if version < 600
@@ -13,9 +13,9 @@ endif
 
 " WSML
 syn keyword wsmlHeader		wsmlVariant
-syn keyword wsmlNamespace	namespace 
-syn keyword wsmlTopLevel	concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology 
-syn keyword wsmlOntology	hasValue memberOf ofType impliesType subConceptOf 
+syn keyword wsmlNamespace	namespace
+syn keyword wsmlTopLevel	concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology
+syn keyword wsmlOntology	hasValue memberOf ofType impliesType subConceptOf
 syn keyword wsmlAxiom		axiom definedBy
 syn keyword wsmlService		assumption effect postcondition precondition capability interface
 syn keyword wsmlTopLevel	ooMediator wwMediator wgMediator ggMediator
diff --git a/runtime/tutor/tutor.pl b/runtime/tutor/tutor.pl
index 4cadb8ccb..7f39f3894 100644
--- a/runtime/tutor/tutor.pl
+++ b/runtime/tutor/tutor.pl
@@ -8,8 +8,8 @@
      u�ywa� Vima jako edytora og�lnego przeznaczenia.
 
      Czas potrzebny na uko�czenie tutoriala to 25 do 30 minut i zale�y
-     od tego jak wiele czasu sp�dzisz na eksperymentowaniu.  
-	 
+     od tego jak wiele czasu sp�dzisz na eksperymentowaniu.
+
 	 UWAGA:
 	 Polecenia wykonywane w czasie lekcji zmodyfikuj� tekst. Zr�b
 	 wcze�niej kopi� tego pliku do �wicze� (je�li zacz��e� komend�
@@ -199,7 +199,7 @@ Teraz mo�emy kontynuowa� i przej�� do Lekcji 2.
 
   4. Wpisz   dw   by usun�� wyraz.
 
-  UWAGA: Litera  d  pojawi si� na dole ekranu. Vim czeka na wpisanie  w . 
+  UWAGA: Litera  d  pojawi si� na dole ekranu. Vim czeka na wpisanie  w .
 	 Je�li zobaczysz inny znak oznacza to, �e wpisa�e� co� �le, wci�nij
 	 <ESC> i zacznij od pocz�tku.
 
@@ -359,7 +359,7 @@ UWAGA:  Mno�nik pomi�dzy operatorem  d  i ruchem dzia�a podobnie do ruchu bez
   gdzie:
    operator  - to co trzeba zrobi� (np.  d  dla usuwania)
    [liczba]  - opcjonalne, ile razy powt�rzy� ruch
-   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz), 
+   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz),
 	       $  (do ko�ca linii), etc.
 
   6. By przej�� do pocz�tku linii u�yj zera:  0
@@ -492,7 +492,7 @@ UWAGA:  Mo�esz u�ywa� <BS> aby poprawia� b��dy w czasie pisania.
 
   UWAGA: Przeczytaj ca�� lekcj� zanim wykonasz jakie� polecenia!!!
 
-  1. Przytrzymaj klawisz CTRL i wci�nij  g . U�ywamy notacji CTRL-G. 
+  1. Przytrzymaj klawisz CTRL i wci�nij  g . U�ywamy notacji CTRL-G.
      Na dole strony pojawi si� pasek statusu z nazw� pliku i pozycj� w pliku.
      Zapami�taj numer linii dla potrzeb kroku 3.
 
diff --git a/runtime/tutor/tutor.pl.cp1250 b/runtime/tutor/tutor.pl.cp1250
index 4daed18fe..2c62b75d1 100644
--- a/runtime/tutor/tutor.pl.cp1250
+++ b/runtime/tutor/tutor.pl.cp1250
@@ -8,8 +8,8 @@
      u�ywa� Vima jako edytora og�lnego przeznaczenia.
 
      Czas potrzebny na uko�czenie tutoriala to 25 do 30 minut i zale�y
-     od tego jak wiele czasu sp�dzisz na eksperymentowaniu.  
-	 
+     od tego jak wiele czasu sp�dzisz na eksperymentowaniu.
+
 	 UWAGA:
 	 Polecenia wykonywane w czasie lekcji zmodyfikuj� tekst. Zr�b
 	 wcze�niej kopi� tego pliku do �wicze� (je�li zacz��e� komend�
@@ -199,7 +199,7 @@ Teraz mo�emy kontynuowa� i przej�� do Lekcji 2.
 
   4. Wpisz   dw   by usun�� wyraz.
 
-  UWAGA: Litera  d  pojawi si� na dole ekranu. Vim czeka na wpisanie  w . 
+  UWAGA: Litera  d  pojawi si� na dole ekranu. Vim czeka na wpisanie  w .
 	 Je�li zobaczysz inny znak oznacza to, �e wpisa�e� co� �le, wci�nij
 	 <ESC> i zacznij od pocz�tku.
 
@@ -359,7 +359,7 @@ UWAGA:  Mno�nik pomi�dzy operatorem  d  i ruchem dzia�a podobnie do ruchu bez
   gdzie:
    operator  - to co trzeba zrobi� (np.  d  dla usuwania)
    [liczba]  - opcjonalne, ile razy powt�rzy� ruch
-   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz), 
+   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz),
 	       $  (do ko�ca linii), etc.
 
   6. By przej�� do pocz�tku linii u�yj zera:  0
@@ -492,7 +492,7 @@ UWAGA:  Mo�esz u�ywa� <BS> aby poprawia� b��dy w czasie pisania.
 
   UWAGA: Przeczytaj ca�� lekcj� zanim wykonasz jakie� polecenia!!!
 
-  1. Przytrzymaj klawisz CTRL i wci�nij  g . U�ywamy notacji CTRL-G. 
+  1. Przytrzymaj klawisz CTRL i wci�nij  g . U�ywamy notacji CTRL-G.
      Na dole strony pojawi si� pasek statusu z nazw� pliku i pozycj� w pliku.
      Zapami�taj numer linii dla potrzeb kroku 3.
 
diff --git a/runtime/tutor/tutor.pl.utf-8 b/runtime/tutor/tutor.pl.utf-8
index 065184dec..4590c4551 100644
--- a/runtime/tutor/tutor.pl.utf-8
+++ b/runtime/tutor/tutor.pl.utf-8
@@ -8,8 +8,8 @@
      używać Vima jako edytora ogólnego przeznaczenia.
 
      Czas potrzebny na ukończenie tutoriala to 25 do 30 minut i zależy
-     od tego jak wiele czasu spędzisz na eksperymentowaniu.  
-	 
+     od tego jak wiele czasu spędzisz na eksperymentowaniu.
+
 	 UWAGA:
 	 Polecenia wykonywane w czasie lekcji zmodyfikują tekst. Zrób
 	 wcześniej kopię tego pliku do ćwiczeń (jeśli zacząłeś komendą
@@ -199,7 +199,7 @@ Teraz możemy kontynuować i przejść do Lekcji 2.
 
   4. Wpisz   dw   by usunąć wyraz.
 
-  UWAGA: Litera  d  pojawi się na dole ekranu. Vim czeka na wpisanie  w . 
+  UWAGA: Litera  d  pojawi się na dole ekranu. Vim czeka na wpisanie  w .
 	 Jeśli zobaczysz inny znak oznacza to, że wpisałeś coś źle, wciśnij
 	 <ESC> i zacznij od początku.
 
@@ -359,7 +359,7 @@ UWAGA:  Mnożnik pomiędzy operatorem  d  i ruchem działa podobnie do ruchu bez
   gdzie:
    operator  - to co trzeba zrobić (np.  d  dla usuwania)
    [liczba]  - opcjonalne, ile razy powtórzyć ruch
-   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz), 
+   ruch      - przenosi nad tekstem do operowania, takim jak  w (wyraz),
 	       $  (do końca linii), etc.
 
   6. By przejść do początku linii użyj zera:  0
@@ -492,7 +492,7 @@ UWAGA:  Możesz używać <BS> aby poprawiać błędy w czasie pisania.
 
   UWAGA: Przeczytaj całą lekcję zanim wykonasz jakieś polecenia!!!
 
-  1. Przytrzymaj klawisz CTRL i wciśnij  g . Używamy notacji CTRL-G. 
+  1. Przytrzymaj klawisz CTRL i wciśnij  g . Używamy notacji CTRL-G.
      Na dole strony pojawi się pasek statusu z nazwą pliku i pozycją w pliku.
      Zapamiętaj numer linii dla potrzeb kroku 3.
 
diff --git a/runtime/tutor/tutor.sk b/runtime/tutor/tutor.sk
index f56cdfb93..2291aad61 100644
--- a/runtime/tutor/tutor.sk
+++ b/runtime/tutor/tutor.sk
@@ -60,7 +60,7 @@ Pozn�mka: Kurzorov� kl�vesy s� tie� funk�n�. Ale pou��van�m hjkl sa bude�
      spe� do tejto v�uky. To m��e by�:	vimtutor <ENTER>
 
   4. Ak si si tieto kroky spo�ahlivo zapam�tal, vykonaj kroky 1 a� 3, pre
-     ukon�enie a znovu spustenie editora. 
+     ukon�enie a znovu spustenie editora.
 
 POZN�MKA: :q! <ENTER> neulo�� zmeny, ktor� si vykonal. O nieko�ko lekci�
           sa nau��� ako ulo�i� zmeny do s�boru
@@ -125,7 +125,7 @@ POZN�MKA: Nesk��aj si zapam�ta� obsah tejto v�uky, ale sa u� pou��van�m.
 
   3. Po pridan� textu stla� kl�vesu <ESC> pre n�vrat do Norm�lneho m�du.
 
-  4. Presu� kurozr na druh� riadok ozna�en� ---> a zopakuj 
+  4. Presu� kurozr na druh� riadok ozna�en� ---> a zopakuj
      kroky 2 a 3 k�m nieje veta spr�vna.
 
 ---> Tu je nejak� text ch�baj�ci o
@@ -147,14 +147,14 @@ POZN�MKA: Nesk��aj si zapam�ta� obsah tejto v�uky, ale sa u� pou��van�m.
 1. Opusti t�to v�uku, ako si to urobil v lekcii 1.2:  :q!
 
 2. Do pr�kazov�ho riadku nap�� pr�kaz:  vim tutor <ENTER>
-   'vim' je pr�kaz, ktor� spust� editor Vim, 'tutor' je meno s�boru, 
+   'vim' je pr�kaz, ktor� spust� editor Vim, 'tutor' je meno s�boru,
    ktor� chce� editova�. Pou�i tak� s�bor, ktor� m��e� meni�.
 
 3. Vlo� a zma� text tak, ako si sa nau�il v predo�l�ch lekciach.
 
 4. Ulo� s�bor so zmenami a opusti Vim pr�kazom:  :wq  <ENTER>
 
-5. Re�tartuj vimtutor a presu� sa dole na nasleduj�ce zhrnutie. 
+5. Re�tartuj vimtutor a presu� sa dole na nasleduj�ce zhrnutie.
 
 6. Urob tak po pre��tan� predo�l�ch krokov a porozumeniu im.
 
@@ -198,8 +198,8 @@ Teraz pokra�uj lekciou 2.
 4. Nap��  dw  aby slovo zmizlo.
 
 POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
-	        nap��e�. Vim na teba po�k�, aby si mohol nap�sa� 
-          p�smeno w. Ak vid�� nie�o in� ako  d , tak si nap�sal 
+	        nap��e�. Vim na teba po�k�, aby si mohol nap�sa�
+          p�smeno w. Ak vid�� nie�o in� ako  d , tak si nap�sal
           nespr�vny znak; stla�  <ESC>  a za�ni znova.
 
 ---> Tu je nieko�ko slov z�bava, ktor� nie patria list do tejto vety.
@@ -231,7 +231,7 @@ POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		     Lekcia 2.3: OPER�TORY A POHYBY
 
-  Ve�a pr�kazov, ktor� menia text s� odvoden� od oper�torov a pohybov. 
+  Ve�a pr�kazov, ktor� menia text s� odvoden� od oper�torov a pohybov.
   Form�t pre pr�kaz mazania kl�vesou  d  je nasledovn�:
 
     d   pohyb
@@ -242,13 +242,13 @@ POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
 
   Kr�tky list pohybov:
     w - do za�iatku �al�ieho slova, okrem jeho prv�ho p�smena.
-    e - do konca teraj�ieho slova, vr�tane posledn�ho znaku. 
+    e - do konca teraj�ieho slova, vr�tane posledn�ho znaku.
     $ - do konca riadku, vr�tane posledn�ho znaku
 
   Tak�e nap�san�m  de  sa zma�e v�etko od kurzora do konca slova.
 
-POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora 
-          sa presunie kurzor tak ako je to �pecivikovan�. 
+POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
+          sa presunie kurzor tak ako je to �pecivikovan�.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		Lekcia 2.4: Pou�itie viacn�sobn�ho pohybu
@@ -258,13 +258,13 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
 
   1. Presu� kurozr ni��ie na za�iatok riadku ozna�en�ho --->.
 
-  2. Nap��  2w  a kurozr sa presunie o dve slov� vpred. 
+  2. Nap��  2w  a kurozr sa presunie o dve slov� vpred.
 
-  3. Nap��  3e  a kurozr sa presunie vpred na koniec tretieho slova. 
+  3. Nap��  3e  a kurozr sa presunie vpred na koniec tretieho slova.
 
   4. Nap��  0  (nula) a kurozr sa presunie na za�iatok riadku.
 
-  5. Zopakuj kroky 2 a 3 s r�znymi ��slami. 
+  5. Zopakuj kroky 2 a 3 s r�znymi ��slami.
 
 ---> Toto je riadok so slovami po kotr�ch sa m��ete pohybova�.
 
@@ -277,11 +277,11 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
 
     ** Nap�sanie ��sla spolu s oper�torom ho zopakuje zadan� po�et kr�t **
 
-  V kombin�cii oper�torov mazania a pohybu spom�nan�ho vy��ie vlo� po�et 
+  V kombin�cii oper�torov mazania a pohybu spom�nan�ho vy��ie vlo� po�et
   pred pohyb pre docielenie hromadn�ho mazania:
     d   ��slo   pohyb
 
-  1. Presu� kurzor na prv� slovo p�san� VE�K�MI P�SMENAMI 
+  1. Presu� kurzor na prv� slovo p�san� VE�K�MI P�SMENAMI
      v riadku ozna�enom --->.
 
   2. Nap��  2dw  a zma�e� dve slov� p�san� VE�K�MI P�SMENAMI
@@ -289,9 +289,9 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
   3. Zopakuj kroky 1 a 2 s pou�it�m r�zneho ��sla tak aby si zmazal slov�
      p�san� ve�k�mi p�smenami jedn�m pr�kazom.
 
----> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny.
 
-POZN�MKA: ��slo medzi oper�torom  d  a pohybom funguje podobne ako pri 
+POZN�MKA: ��slo medzi oper�torom  d  a pohybom funguje podobne ako pri
           pou�it� s pohybom bez oper�tora.
 
 
@@ -359,7 +359,7 @@ Vzh�adom na frekvenciu mazania cel�ho riadku, sa autori Vimu rozhodli,
      kde:
        oper�tor - �o treba robi�, napr�klad  d  pre zmazanie
        [��slo] - je volite�n� po�et pre opakovanie pohybu
-       pohyb - pohyb po texte vzh�adom na oper�tor, napr�klad w (slovo), 
+       pohyb - pohyb po texte vzh�adom na oper�tor, napr�klad w (slovo),
 		$ (do konca riadku), at�.
 
   6. Pre pohyb na za�iatok riadku pou�i nulu:  0
@@ -472,13 +472,13 @@ POZN�MKA: M��e� pou�i� kl�vesu backspace na �pravu zmien po�as p�sania.
   2. Pre naradenie znaku na mieste kurzora, nap��  r  a potom znak, ktor�
      nahrad� p�vodn� znak.
 
-  3. Pr�kaz na upravenie umo��uje zmeni� od kurzora a� po miesto, ktor� 
+  3. Pr�kaz na upravenie umo��uje zmeni� od kurzora a� po miesto, ktor�
      ur�uje pohyb.  napr. Nap��  ce  ��m zmn�� text od poz�cie
      kurzora do konca slova, c$  zmen� text do konca riadku.
 
   4. Form�t pre nahradenie je:
 
-	    c    [��slo]    pohyb 
+	    c    [��slo]    pohyb
 
 
 Teraz prejdi na nalseduj�cu lekciu.
@@ -494,8 +494,8 @@ Teraz prejdi na nalseduj�cu lekciu.
 
   Pozn�mka: Pre��taj si cel� t�to lekciu sk�r ako za�ne� vykon�va� kroky!!
 
-  1. Dr� stla�en� kl�vesu Ctrl a stla�  g . Toto naz�vame CTRL-G. 
-     Na spodu obrazovky sa zobraz� spr�va s n�zvom s�boru a poz�ciou 
+  1. Dr� stla�en� kl�vesu Ctrl a stla�  g . Toto naz�vame CTRL-G.
+     Na spodu obrazovky sa zobraz� spr�va s n�zvom s�boru a poz�ciou
      v s�bore. Zapam�tajsi si ��slo riadku pre pou�itie v kroku 3.
 
   2. Stla�  G  ��m sa dostane� na spodok s�boru.
@@ -526,8 +526,8 @@ Teraz prejdi na nalseduj�cu lekciu.
   4. Ak chce� vyh�ada� re�azec v sp�tnom smere, pou�� pr�kaz  ?  miesto
      pr�kazu /.
 
-  5. Pre n�vrat na miesto z ktor�ho si pri�iel stla� CTRL-O (dr� stla�en� 
-     kl�vesu Ctrl po�as stla�enia kl�vesy o). Zopakuj pre �al�� n�vrat 
+  5. Pre n�vrat na miesto z ktor�ho si pri�iel stla� CTRL-O (dr� stla�en�
+     kl�vesu Ctrl po�as stla�enia kl�vesy o). Zopakuj pre �al�� n�vrat
      sp�. CTRL-I ide vpred.
 
 POZN�MKA: "errroor" nieje sp�sob hl�skovania error; errroor je error.
@@ -590,7 +590,7 @@ Pozn�mka: Toto je ve�mi v�hodn� pou��� pri laden� programu s ch�baj�cimi
 
 
   1. CTRL-g    vyp��e tvoju poz�ciu v s�bore a status s�boru.
-            G  �a premiestni na koniec riadku. 
+            G  �a premiestni na koniec riadku.
      ��slo  G  �a premiestni na riadok s ��slom.
            gg  �a presunie na prv� riadok
 
@@ -668,15 +668,15 @@ Pozn�mka: �e ak ukon��� pr�cu s editorom Vim a znovu ho spust�� pr�kazom
 
   3. Stla� kl�vesu  : . V spodnej �asti okna sa objav�  :'<,'>.
 
-  4. Nap�� w TEST  , kde TEST je meno s�boru, ktor� zatial neexistuje. 
+  4. Nap�� w TEST  , kde TEST je meno s�boru, ktor� zatial neexistuje.
      Skontroluj, e vid��  :'<,'>w TEST  predt�m ne� stla��� Enter.
 
   5. Vim zap��e ozna�en� riadky do s�boru TEST. Pou�i :!dir  alebo  !ls
      pre overenie. Zatial ho e�te nema�! Pou�ijeme ho v �al�ej lekcii.
 
-POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie. 
-          M��e� pohybova� kurzorom pre upresnenie vyzna�en�ho textu. 
-          Potom m��e� pou�i� oper�tor pre vykonanie nejakej akcie 
+POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie.
+          M��e� pohybova� kurzorom pre upresnenie vyzna�en�ho textu.
+          Potom m��e� pou�i� oper�tor pre vykonanie nejakej akcie
           s textom. Napr�klad  d  zma�e vyzna�en� text.
 
 
@@ -686,7 +686,7 @@ POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie.
 
 	** Pre vlo�enie obsahu s�boru, nap��   :r FILENAME **
 
-  1. Premiestni kurzor nad tento riadok. 
+  1. Premiestni kurzor nad tento riadok.
 
 POZN�MKA: Po vykonan� kroku 2 uvid�� text z lekcie 5.3. Potom sa presu�
           dole, aby si videl t�to lekciu.
@@ -710,8 +710,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 	 :!del FILENAME    :!rm FILENAME    -  odstr�ni s�bor FILENAME
 
   2.  :w FILENAME  ulo�� aktu�lny s�bor na disk pod menom FILENAME.
- 
-  3.  v  pohyb  :w FILENAME  ulo�� vizu�lne ozna�en� riadky do 
+
+  3.  v  pohyb  :w FILENAME  ulo�� vizu�lne ozna�en� riadky do
       s�boru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s�bor FILENAME a vlo�� ho do aktu�lneho
@@ -738,8 +738,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 ---> Po nap�san�  o  sa kurzor premiestn� na vlo�en� riadok do vkladacieho
      m�du.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap�� ve�k�  O , 
-     namiesto mal�ho  o. Vysk��aj si to na riadku dole. 
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap�� ve�k�  O ,
+     namiesto mal�ho  o. Vysk��aj si to na riadku dole.
 
 ---> Vlo� riadok nad t�mto nap�san�m O, ke� kurzor je na tomto riadku.
 
@@ -753,11 +753,11 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 
   1. Presu� kurzor ni��ie na koniec prv�ho riadku ozna�en�ho zna�kou --->
 
-  2. Stla� kl�vesu  e  dokia� kurozr nieje na konci riadku.   
+  2. Stla� kl�vesu  e  dokia� kurozr nieje na konci riadku.
 
   3. Nap��  a  (mal� p�smeno) pre pridanie textu ZA kurzorom.
 
-  4. Dokon�� slovo tak ako je to v druhom riadku. Stla� <ESC> pre 
+  4. Dokon�� slovo tak ako je to v druhom riadku. Stla� <ESC> pre
      opustenie vkladacieho m�du.
 
   5. Pou�i  e  na presun na �al�ie nedokon�en� slovo a zopakuj kroky 3 a 4.
@@ -765,8 +765,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 ---> Tento ri ti dovo�uje n�cv pri�van testu na koniec riadku.
 ---> Tento riadok ti dovo�uje n�cvik prid�vania textu na koniec riadku.
 
-POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde 
-          sa znaky vkladaj�. 
+POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde
+          sa znaky vkladaj�.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -778,19 +778,19 @@ POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde
   1. Presu� kurzor ni��ie na prv� riadok ozna�en� zna�kou --->. Premiestni
      kurzor na za�iatok prv�ho v�skytu  xxx.
 
-  2. Teraz nap��  R  a  nap��  ��slo uveden� v druhom riadku, tak�e 
+  2. Teraz nap��  R  a  nap��  ��slo uveden� v druhom riadku, tak�e
      sa n�m nahrad� p�vodn� xxx.
 
-  3. Stla� <ESC> pre opustenie nahradzovacieho m�du. Pozn�mka, �e zvy�ok 
-     riadku zostane nezmenen�. 
+  3. Stla� <ESC> pre opustenie nahradzovacieho m�du. Pozn�mka, �e zvy�ok
+     riadku zostane nezmenen�.
 
   4. Zopakuj tieto kroky pre nahradenie zvy�n�ch xxx.
 
 ---> Pridan�m 123 ku xxx dostane� xxx.
 ---> Pridan�m 123 ku 456 dostane� 579.
 
-POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak 
-           zma�e existuj�ci znak. 
+POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak
+           zma�e existuj�ci znak.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -809,14 +809,14 @@ POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak
 
   5. Nap��  p  pre vlo�nie (paste) textu. Potom nap��:  a druha <ESC>.
 
-  6. Pou�i vizu�lny m�d pre ozna�enie "polo�ka.", vystrihni to 
-     pou�it�m  y, presu� sa na koniec nasleduj�ceho riadku pou�it�m  j$ 
+  6. Pou�i vizu�lny m�d pre ozna�enie "polo�ka.", vystrihni to
+     pou�it�m  y, presu� sa na koniec nasleduj�ceho riadku pou�it�m  j$
      a vlo� sem text pou�it�m  p.
 
 ---> a) toto je prv� polo�ka
 ---> b)
 
-POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo. 
+POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -843,11 +843,11 @@ POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo.
   5. Teraz spusti vyh�ad�vac� pr�kaz znovu, a pozri �o sa stalo:
      /ignore <ENTER>
 
-  6. Pre opetovn� zapnutie rozly�ovania ve�k�ch a mal�ch p�smen 
+  6. Pre opetovn� zapnutie rozly�ovania ve�k�ch a mal�ch p�smen
      nap��:  :set noic
 
 POZN�MKA: Na odstr�nenie zv�raznenia v�razov nap��:  :nohlsearch
-POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno 
+POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
           pou�itie vyh�ad�vacieho pr�kazu, pou�i \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -867,9 +867,9 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
   5. Nap�sanie ve�k�ho  R  prepne do nahradzovacieho m�du, k�m nieje
      stla�en� <ESC>.
 
-  6. Nap�sanie ":set xxx" nastav� mo�nos� "xxx". Niektor� nastavenia s�: 
-     'ic' 'ignorecase' ignoruje ve�k� a mal� p�smen� po�as vyh�ad�vania. 
-     'is' 'incsearch' zobrazuje �iasto�n� re�azce vyh�ad�van�ho re�azca. 
+  6. Nap�sanie ":set xxx" nastav� mo�nos� "xxx". Niektor� nastavenia s�:
+     'ic' 'ignorecase' ignoruje ve�k� a mal� p�smen� po�as vyh�ad�vania.
+     'is' 'incsearch' zobrazuje �iasto�n� re�azce vyh�ad�van�ho re�azca.
      'hls' 'hlsearch' vyzna�� v�etky vyh�ad�van� re�azce.
       M��e� pou�i� hociktor� z dlh�ch a kr�tkych n�zvov mo�nost�.
 
@@ -893,8 +893,8 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
 	- stla� kl�vesu <F1> (ak nejak� m�)
 	- nap��  :help <ENTER>
 
-  ��taj text v okne n�povedy pre z�skanie predstavy ako n�poveda funguje. 
-  Nap��   CTRL-W CTRL-W  pre skok z jedn�ho okna do druh�ho. 
+  ��taj text v okne n�povedy pre z�skanie predstavy ako n�poveda funguje.
+  Nap��   CTRL-W CTRL-W  pre skok z jedn�ho okna do druh�ho.
   Nap��    :q <ENTER>    ��m zatvor�� okno n�povedy.
 
   M��e� n�js� help ku hociakej t�me pridan�m argumentu ku pr�kazu ":help".
@@ -945,12 +945,12 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
 
   5. Stla� <TAB> a Vim dokon�� meno pr�kazu na ":edit".
 
-  6. Teraz pridaj medzern�k a za�iatok mena existuj�ceho s�boru: 
+  6. Teraz pridaj medzern�k a za�iatok mena existuj�ceho s�boru:
      :edit FIL
 
   7. Stla� <TAB>. Vim dokon�� meno (ak je jedine�n�).
 
-POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie 
+POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie
           CTRL-D a <TAB>. �peci�lne je to u�ito�n� pre pr�kaz  :help.
 
 
@@ -960,16 +960,16 @@ POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie
 
   1. Nap��  :help  alebo stla� <F1> alebo <Help> pre otvorenie okna n�povedy.
 
-  2. Nap��  :help pr�kaz  pre vyh�adanie n�povedy ku pr�kazu pr�kaz. 
+  2. Nap��  :help pr�kaz  pre vyh�adanie n�povedy ku pr�kazu pr�kaz.
 
-  3. Nap��  CTRL-W CTRL-W  na presko�enie do in�ho okna. 
+  3. Nap��  CTRL-W CTRL-W  na presko�enie do in�ho okna.
 
   4. Nap��  :q  pre zatvorenie okna n�povedy
 
-  5. Vytvor �tartovac� skript vimrc pre udr�anie uprednost�ovan�ch nastaven�. 
+  5. Vytvor �tartovac� skript vimrc pre udr�anie uprednost�ovan�ch nastaven�.
 
-  6. Po�as p�sania pr�kazu  :  stla� CTRL-D pre zobrazenie dokon�en�. 
-     Stla� <TAB> pre pou�itie jedn�ho z dokon�en�. 
+  6. Po�as p�sania pr�kazu  :  stla� CTRL-D pre zobrazenie dokon�en�.
+     Stla� <TAB> pre pou�itie jedn�ho z dokon�en�.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.sk.cp1250 b/runtime/tutor/tutor.sk.cp1250
index 891b3556d..f32c9b12a 100644
--- a/runtime/tutor/tutor.sk.cp1250
+++ b/runtime/tutor/tutor.sk.cp1250
@@ -60,7 +60,7 @@ Pozn�mka: Kurzorov� kl�vesy s� tie� funk�n�. Ale pou��van�m hjkl sa bude�
      spe� do tejto v�uky. To m��e by�:	vimtutor <ENTER>
 
   4. Ak si si tieto kroky spo�ahlivo zapam�tal, vykonaj kroky 1 a� 3, pre
-     ukon�enie a znovu spustenie editora. 
+     ukon�enie a znovu spustenie editora.
 
 POZN�MKA: :q! <ENTER> neulo�� zmeny, ktor� si vykonal. O nieko�ko lekci�
           sa nau�� ako ulo�i� zmeny do s�boru
@@ -125,7 +125,7 @@ POZN�MKA: Nesk��aj si zapam�ta� obsah tejto v�uky, ale sa u� pou��van�m.
 
   3. Po pridan� textu stla� kl�vesu <ESC> pre n�vrat do Norm�lneho m�du.
 
-  4. Presu� kurozr na druh� riadok ozna�en� ---> a zopakuj 
+  4. Presu� kurozr na druh� riadok ozna�en� ---> a zopakuj
      kroky 2 a 3 k�m nieje veta spr�vna.
 
 ---> Tu je nejak� text ch�baj�ci o
@@ -147,14 +147,14 @@ POZN�MKA: Nesk��aj si zapam�ta� obsah tejto v�uky, ale sa u� pou��van�m.
 1. Opusti t�to v�uku, ako si to urobil v lekcii 1.2:  :q!
 
 2. Do pr�kazov�ho riadku nap� pr�kaz:  vim tutor <ENTER>
-   'vim' je pr�kaz, ktor� spust� editor Vim, 'tutor' je meno s�boru, 
+   'vim' je pr�kaz, ktor� spust� editor Vim, 'tutor' je meno s�boru,
    ktor� chce� editova�. Pou�i tak� s�bor, ktor� m��e� meni�.
 
 3. Vlo� a zma� text tak, ako si sa nau�il v predo�l�ch lekciach.
 
 4. Ulo� s�bor so zmenami a opusti Vim pr�kazom:  :wq  <ENTER>
 
-5. Re�tartuj vimtutor a presu� sa dole na nasleduj�ce zhrnutie. 
+5. Re�tartuj vimtutor a presu� sa dole na nasleduj�ce zhrnutie.
 
 6. Urob tak po pre��tan� predo�l�ch krokov a porozumeniu im.
 
@@ -198,8 +198,8 @@ Teraz pokra�uj lekciou 2.
 4. Nap�  dw  aby slovo zmizlo.
 
 POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
-	        nap�e�. Vim na teba po�k�, aby si mohol nap�sa� 
-          p�smeno w. Ak vid� nie�o in� ako  d , tak si nap�sal 
+	        nap�e�. Vim na teba po�k�, aby si mohol nap�sa�
+          p�smeno w. Ak vid� nie�o in� ako  d , tak si nap�sal
           nespr�vny znak; stla�  <ESC>  a za�ni znova.
 
 ---> Tu je nieko�ko slov z�bava, ktor� nie patria list do tejto vety.
@@ -231,7 +231,7 @@ POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		     Lekcia 2.3: OPER�TORY A POHYBY
 
-  Ve�a pr�kazov, ktor� menia text s� odvoden� od oper�torov a pohybov. 
+  Ve�a pr�kazov, ktor� menia text s� odvoden� od oper�torov a pohybov.
   Form�t pre pr�kaz mazania kl�vesou  d  je nasledovn�:
 
     d   pohyb
@@ -242,13 +242,13 @@ POZN�MKA: P�smeno d sa zobraz� na poslednom riadku obrazovky ke� ho
 
   Kr�tky list pohybov:
     w - do za�iatku �al�ieho slova, okrem jeho prv�ho p�smena.
-    e - do konca teraj�ieho slova, vr�tane posledn�ho znaku. 
+    e - do konca teraj�ieho slova, vr�tane posledn�ho znaku.
     $ - do konca riadku, vr�tane posledn�ho znaku
 
   Tak�e nap�san�m  de  sa zma�e v�etko od kurzora do konca slova.
 
-POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora 
-          sa presunie kurzor tak ako je to �pecivikovan�. 
+POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
+          sa presunie kurzor tak ako je to �pecivikovan�.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		Lekcia 2.4: Pou�itie viacn�sobn�ho pohybu
@@ -258,13 +258,13 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
 
   1. Presu� kurozr ni��ie na za�iatok riadku ozna�en�ho --->.
 
-  2. Nap�  2w  a kurozr sa presunie o dve slov� vpred. 
+  2. Nap�  2w  a kurozr sa presunie o dve slov� vpred.
 
-  3. Nap�  3e  a kurozr sa presunie vpred na koniec tretieho slova. 
+  3. Nap�  3e  a kurozr sa presunie vpred na koniec tretieho slova.
 
   4. Nap�  0  (nula) a kurozr sa presunie na za�iatok riadku.
 
-  5. Zopakuj kroky 2 a 3 s r�znymi ��slami. 
+  5. Zopakuj kroky 2 a 3 s r�znymi ��slami.
 
 ---> Toto je riadok so slovami po kotr�ch sa m��ete pohybova�.
 
@@ -277,11 +277,11 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
 
     ** Nap�sanie ��sla spolu s oper�torom ho zopakuje zadan� po�et kr�t **
 
-  V kombin�cii oper�torov mazania a pohybu spom�nan�ho vy��ie vlo� po�et 
+  V kombin�cii oper�torov mazania a pohybu spom�nan�ho vy��ie vlo� po�et
   pred pohyb pre docielenie hromadn�ho mazania:
     d   ��slo   pohyb
 
-  1. Presu� kurzor na prv� slovo p�san� VE�K�MI P�SMENAMI 
+  1. Presu� kurzor na prv� slovo p�san� VE�K�MI P�SMENAMI
      v riadku ozna�enom --->.
 
   2. Nap�  2dw  a zma�e� dve slov� p�san� VE�K�MI P�SMENAMI
@@ -289,9 +289,9 @@ POZN�MKA: Stla�en�m iba pohybu v norm�lnom m�de bez oper�tora
   3. Zopakuj kroky 1 a 2 s pou�it�m r�zneho ��sla tak aby si zmazal slov�
      p�san� ve�k�mi p�smenami jedn�m pr�kazom.
 
----> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny. 
+---> Tento ABC DE riadok FGHI JK LMN OP so slovamI je Q RS TUV vycisteny.
 
-POZN�MKA: ��slo medzi oper�torom  d  a pohybom funguje podobne ako pri 
+POZN�MKA: ��slo medzi oper�torom  d  a pohybom funguje podobne ako pri
           pou�it� s pohybom bez oper�tora.
 
 
@@ -359,7 +359,7 @@ Vzh�adom na frekvenciu mazania cel�ho riadku, sa autori Vimu rozhodli,
      kde:
        oper�tor - �o treba robi�, napr�klad  d  pre zmazanie
        [��slo] - je volite�n� po�et pre opakovanie pohybu
-       pohyb - pohyb po texte vzh�adom na oper�tor, napr�klad w (slovo), 
+       pohyb - pohyb po texte vzh�adom na oper�tor, napr�klad w (slovo),
 		$ (do konca riadku), at�.
 
   6. Pre pohyb na za�iatok riadku pou�i nulu:  0
@@ -472,13 +472,13 @@ POZN�MKA: M��e� pou�i� kl�vesu backspace na �pravu zmien po�as p�sania.
   2. Pre naradenie znaku na mieste kurzora, nap�  r  a potom znak, ktor�
      nahrad� p�vodn� znak.
 
-  3. Pr�kaz na upravenie umo��uje zmeni� od kurzora a� po miesto, ktor� 
+  3. Pr�kaz na upravenie umo��uje zmeni� od kurzora a� po miesto, ktor�
      ur�uje pohyb.  napr. Nap�  ce  ��m zmn� text od poz�cie
      kurzora do konca slova, c$  zmen� text do konca riadku.
 
   4. Form�t pre nahradenie je:
 
-	    c    [��slo]    pohyb 
+	    c    [��slo]    pohyb
 
 
 Teraz prejdi na nalseduj�cu lekciu.
@@ -494,8 +494,8 @@ Teraz prejdi na nalseduj�cu lekciu.
 
   Pozn�mka: Pre��taj si cel� t�to lekciu sk�r ako za�ne� vykon�va� kroky!!
 
-  1. Dr� stla�en� kl�vesu Ctrl a stla�  g . Toto naz�vame CTRL-G. 
-     Na spodu obrazovky sa zobraz� spr�va s n�zvom s�boru a poz�ciou 
+  1. Dr� stla�en� kl�vesu Ctrl a stla�  g . Toto naz�vame CTRL-G.
+     Na spodu obrazovky sa zobraz� spr�va s n�zvom s�boru a poz�ciou
      v s�bore. Zapam�tajsi si ��slo riadku pre pou�itie v kroku 3.
 
   2. Stla�  G  ��m sa dostane� na spodok s�boru.
@@ -526,8 +526,8 @@ Teraz prejdi na nalseduj�cu lekciu.
   4. Ak chce� vyh�ada� re�azec v sp�tnom smere, pou�� pr�kaz  ?  miesto
      pr�kazu /.
 
-  5. Pre n�vrat na miesto z ktor�ho si pri�iel stla� CTRL-O (dr� stla�en� 
-     kl�vesu Ctrl po�as stla�enia kl�vesy o). Zopakuj pre �al�� n�vrat 
+  5. Pre n�vrat na miesto z ktor�ho si pri�iel stla� CTRL-O (dr� stla�en�
+     kl�vesu Ctrl po�as stla�enia kl�vesy o). Zopakuj pre �al�� n�vrat
      sp�. CTRL-I ide vpred.
 
 POZN�MKA: "errroor" nieje sp�sob hl�skovania error; errroor je error.
@@ -590,7 +590,7 @@ Pozn�mka: Toto je ve�mi v�hodn� pou�� pri laden� programu s ch�baj�cimi
 
 
   1. CTRL-g    vyp�e tvoju poz�ciu v s�bore a status s�boru.
-            G  �a premiestni na koniec riadku. 
+            G  �a premiestni na koniec riadku.
      ��slo  G  �a premiestni na riadok s ��slom.
            gg  �a presunie na prv� riadok
 
@@ -668,15 +668,15 @@ Pozn�mka: �e ak ukon�� pr�cu s editorom Vim a znovu ho spust� pr�kazom
 
   3. Stla� kl�vesu  : . V spodnej �asti okna sa objav�  :'<,'>.
 
-  4. Nap� w TEST  , kde TEST je meno s�boru, ktor� zatial neexistuje. 
+  4. Nap� w TEST  , kde TEST je meno s�boru, ktor� zatial neexistuje.
      Skontroluj, e vid�  :'<,'>w TEST  predt�m ne� stla�� Enter.
 
   5. Vim zap�e ozna�en� riadky do s�boru TEST. Pou�i :!dir  alebo  !ls
      pre overenie. Zatial ho e�te nema�! Pou�ijeme ho v �al�ej lekcii.
 
-POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie. 
-          M��e� pohybova� kurzorom pre upresnenie vyzna�en�ho textu. 
-          Potom m��e� pou�i� oper�tor pre vykonanie nejakej akcie 
+POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie.
+          M��e� pohybova� kurzorom pre upresnenie vyzna�en�ho textu.
+          Potom m��e� pou�i� oper�tor pre vykonanie nejakej akcie
           s textom. Napr�klad  d  zma�e vyzna�en� text.
 
 
@@ -686,7 +686,7 @@ POZN�MKA: Stla�en�m kl�vesy  v  sa spust� vizu�lne ozna�ovanie.
 
 	** Pre vlo�enie obsahu s�boru, nap�   :r FILENAME **
 
-  1. Premiestni kurzor nad tento riadok. 
+  1. Premiestni kurzor nad tento riadok.
 
 POZN�MKA: Po vykonan� kroku 2 uvid� text z lekcie 5.3. Potom sa presu�
           dole, aby si videl t�to lekciu.
@@ -710,8 +710,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 	 :!del FILENAME    :!rm FILENAME    -  odstr�ni s�bor FILENAME
 
   2.  :w FILENAME  ulo�� aktu�lny s�bor na disk pod menom FILENAME.
- 
-  3.  v  pohyb  :w FILENAME  ulo�� vizu�lne ozna�en� riadky do 
+
+  3.  v  pohyb  :w FILENAME  ulo�� vizu�lne ozna�en� riadky do
       s�boru FILENAME.
 
   4.  :r FILENAME  vyberie z disku s�bor FILENAME a vlo�� ho do aktu�lneho
@@ -738,8 +738,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 ---> Po nap�san�  o  sa kurzor premiestn� na vlo�en� riadok do vkladacieho
      m�du.
 
-  4. Pre otvorenie riadku nad kurzorom, jednotucho nap� ve�k�  O , 
-     namiesto mal�ho  o. Vysk��aj si to na riadku dole. 
+  4. Pre otvorenie riadku nad kurzorom, jednotucho nap� ve�k�  O ,
+     namiesto mal�ho  o. Vysk��aj si to na riadku dole.
 
 ---> Vlo� riadok nad t�mto nap�san�m O, ke� kurzor je na tomto riadku.
 
@@ -753,11 +753,11 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 
   1. Presu� kurzor ni��ie na koniec prv�ho riadku ozna�en�ho zna�kou --->
 
-  2. Stla� kl�vesu  e  dokia� kurozr nieje na konci riadku.   
+  2. Stla� kl�vesu  e  dokia� kurozr nieje na konci riadku.
 
   3. Nap�  a  (mal� p�smeno) pre pridanie textu ZA kurzorom.
 
-  4. Dokon�� slovo tak ako je to v druhom riadku. Stla� <ESC> pre 
+  4. Dokon�� slovo tak ako je to v druhom riadku. Stla� <ESC> pre
      opustenie vkladacieho m�du.
 
   5. Pou�i  e  na presun na �al�ie nedokon�en� slovo a zopakuj kroky 3 a 4.
@@ -765,8 +765,8 @@ POZN�MKA: M��e� tie� na��ta� v�stup vonkaj�ieho pr�kazu. Napr�klad :r !ls
 ---> Tento ri ti dovo�uje n�cv pri�van testu na koniec riadku.
 ---> Tento riadok ti dovo�uje n�cvik prid�vania textu na koniec riadku.
 
-POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde 
-          sa znaky vkladaj�. 
+POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde
+          sa znaky vkladaj�.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -778,19 +778,19 @@ POZN�MKA: a, i, A �tartuj� rovnak� vkladac� m�d, jedin� rozidel je, kde
   1. Presu� kurzor ni��ie na prv� riadok ozna�en� zna�kou --->. Premiestni
      kurzor na za�iatok prv�ho v�skytu  xxx.
 
-  2. Teraz nap�  R  a  nap�  ��slo uveden� v druhom riadku, tak�e 
+  2. Teraz nap�  R  a  nap�  ��slo uveden� v druhom riadku, tak�e
      sa n�m nahrad� p�vodn� xxx.
 
-  3. Stla� <ESC> pre opustenie nahradzovacieho m�du. Pozn�mka, �e zvy�ok 
-     riadku zostane nezmenen�. 
+  3. Stla� <ESC> pre opustenie nahradzovacieho m�du. Pozn�mka, �e zvy�ok
+     riadku zostane nezmenen�.
 
   4. Zopakuj tieto kroky pre nahradenie zvy�n�ch xxx.
 
 ---> Pridan�m 123 ku xxx dostane� xxx.
 ---> Pridan�m 123 ku 456 dostane� 579.
 
-POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak 
-           zma�e existuj�ci znak. 
+POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak
+           zma�e existuj�ci znak.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -809,14 +809,14 @@ POZN�MKA:  Nahradzovac� m�d je ako vkladac� m�d, ale ka�d� nap�san� znak
 
   5. Nap�  p  pre vlo�nie (paste) textu. Potom nap�:  a druha <ESC>.
 
-  6. Pou�i vizu�lny m�d pre ozna�enie "polo�ka.", vystrihni to 
-     pou�it�m  y, presu� sa na koniec nasleduj�ceho riadku pou�it�m  j$ 
+  6. Pou�i vizu�lny m�d pre ozna�enie "polo�ka.", vystrihni to
+     pou�it�m  y, presu� sa na koniec nasleduj�ceho riadku pou�it�m  j$
      a vlo� sem text pou�it�m  p.
 
 ---> a) toto je prv� polo�ka
 ---> b)
 
-POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo. 
+POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -843,11 +843,11 @@ POZN�MKA: M��e� pou�i� tie�  y  ako oper�tor; yw  vystrihne jedno slovo.
   5. Teraz spusti vyh�ad�vac� pr�kaz znovu, a pozri �o sa stalo:
      /ignore <ENTER>
 
-  6. Pre opetovn� zapnutie rozly�ovania ve�k�ch a mal�ch p�smen 
+  6. Pre opetovn� zapnutie rozly�ovania ve�k�ch a mal�ch p�smen
      nap�:  :set noic
 
 POZN�MKA: Na odstr�nenie zv�raznenia v�razov nap�:  :nohlsearch
-POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno 
+POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
           pou�itie vyh�ad�vacieho pr�kazu, pou�i \c:  /ignore\c <ENTER>
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -867,9 +867,9 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
   5. Nap�sanie ve�k�ho  R  prepne do nahradzovacieho m�du, k�m nieje
      stla�en� <ESC>.
 
-  6. Nap�sanie ":set xxx" nastav� mo�nos� "xxx". Niektor� nastavenia s�: 
-     'ic' 'ignorecase' ignoruje ve�k� a mal� p�smen� po�as vyh�ad�vania. 
-     'is' 'incsearch' zobrazuje �iasto�n� re�azce vyh�ad�van�ho re�azca. 
+  6. Nap�sanie ":set xxx" nastav� mo�nos� "xxx". Niektor� nastavenia s�:
+     'ic' 'ignorecase' ignoruje ve�k� a mal� p�smen� po�as vyh�ad�vania.
+     'is' 'incsearch' zobrazuje �iasto�n� re�azce vyh�ad�van�ho re�azca.
      'hls' 'hlsearch' vyzna�� v�etky vyh�ad�van� re�azce.
       M��e� pou�i� hociktor� z dlh�ch a kr�tkych n�zvov mo�nost�.
 
@@ -893,8 +893,8 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
 	- stla� kl�vesu <F1> (ak nejak� m�)
 	- nap�  :help <ENTER>
 
-  ��taj text v okne n�povedy pre z�skanie predstavy ako n�poveda funguje. 
-  Nap�   CTRL-W CTRL-W  pre skok z jedn�ho okna do druh�ho. 
+  ��taj text v okne n�povedy pre z�skanie predstavy ako n�poveda funguje.
+  Nap�   CTRL-W CTRL-W  pre skok z jedn�ho okna do druh�ho.
   Nap�    :q <ENTER>    ��m zatvor� okno n�povedy.
 
   M��e� n�js� help ku hociakej t�me pridan�m argumentu ku pr�kazu ":help".
@@ -945,12 +945,12 @@ POZN�MKA: Ak chce� nerozly�ova� ve�kos� p�smen len pre jedno
 
   5. Stla� <TAB> a Vim dokon�� meno pr�kazu na ":edit".
 
-  6. Teraz pridaj medzern�k a za�iatok mena existuj�ceho s�boru: 
+  6. Teraz pridaj medzern�k a za�iatok mena existuj�ceho s�boru:
      :edit FIL
 
   7. Stla� <TAB>. Vim dokon�� meno (ak je jedine�n�).
 
-POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie 
+POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie
           CTRL-D a <TAB>. �peci�lne je to u�ito�n� pre pr�kaz  :help.
 
 
@@ -960,16 +960,16 @@ POZN�MKA: Dokon�ovanie funguje pre ve�a pr�kazov. Vysk��aj stla�enie
 
   1. Nap�  :help  alebo stla� <F1> alebo <Help> pre otvorenie okna n�povedy.
 
-  2. Nap�  :help pr�kaz  pre vyh�adanie n�povedy ku pr�kazu pr�kaz. 
+  2. Nap�  :help pr�kaz  pre vyh�adanie n�povedy ku pr�kazu pr�kaz.
 
-  3. Nap�  CTRL-W CTRL-W  na presko�enie do in�ho okna. 
+  3. Nap�  CTRL-W CTRL-W  na presko�enie do in�ho okna.
 
   4. Nap�  :q  pre zatvorenie okna n�povedy
 
-  5. Vytvor �tartovac� skript vimrc pre udr�anie uprednost�ovan�ch nastaven�. 
+  5. Vytvor �tartovac� skript vimrc pre udr�anie uprednost�ovan�ch nastaven�.
 
-  6. Po�as p�sania pr�kazu  :  stla� CTRL-D pre zobrazenie dokon�en�. 
-     Stla� <TAB> pre pou�itie jedn�ho z dokon�en�. 
+  6. Po�as p�sania pr�kazu  :  stla� CTRL-D pre zobrazenie dokon�en�.
+     Stla� <TAB> pre pou�itie jedn�ho z dokon�en�.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
author	Bram Moolenaar <Bram@vim.org>	2006-04-30 18:54:39 +0000
committer	Bram Moolenaar <Bram@vim.org>	2006-04-30 18:54:39 +0000
commit	c9b4b05b3544b434730eb218e848a1a441d5ffb2 (patch)
tree	c1550ddf398d2030ed25ee98e8342fcb41ac1c87 /runtime
parent	aa35dd1667c5903cdcc32ebe10f27bc6683c68a1 (diff)
download	vim-git-c9b4b05b3544b434730eb218e848a1a441d5ffb2.tar.gz