Update runtime files.

26 files changed, 417 insertions, 245 deletions

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 6e42025d2..1368dbfcb 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.3.  Last change: 2010 Sep 18
+*cmdline.txt*   For Vim version 7.3.  Last change: 2010 Nov 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -372,10 +372,10 @@ word before the cursor.  This is available for:
 - Mappings: Only after a ":map" or similar command.
 - Variable and function names: Only after a ":if", ":call" or similar command.
 
-When Vim was compiled with the |+cmdline_compl| feature disabled, only file
-names, directories and help items can be completed.  The number of help item
-matches is limited (currently to 300) to avoid a long delay when there are
-very many matches.
+When Vim was compiled without the |+cmdline_compl| feature only file names,
+directories and help items can be completed.  The number of help item matches
+is limited (currently to 300) to avoid a long delay when there are very many
+matches.
 
 These are the commands that can be used:
 
@@ -782,30 +782,34 @@ it, no matter how many backslashes.
 			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
 			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
 			       *:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
-			       *E495* *E496* *E497* *E498* *E499* *E500*
+			       *E495* *E496* *E497* *E499* *E500*
 Note: these are typed literally, they are not special keys!
 	<cword>    is replaced with the word under the cursor (like |star|)
 	<cWORD>    is replaced with the WORD under the cursor (see |WORD|)
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
-	<afile>    when executing autocommands, is replaced with the file name
-		   for a file read or write
-	<abuf>     when executing autocommands, is replaced with the currently
+	<afile>    When executing autocommands, is replaced with the file name
+		   for a file read or write.
+	<abuf>     When executing autocommands, is replaced with the currently
 		   effective buffer number (for ":r file" and ":so file" it is
 		   the current buffer, the file being read/sourced is not in a
 		   buffer).
-	<amatch>   when executing autocommands, is replaced with the match for
+	<amatch>   When executing autocommands, is replaced with the match for
 		   which this autocommand was executed.  It differs from
 		   <afile> only when the file name isn't used to match with
 		   (for FileType, Syntax and SpellFileMissing events).
-	<sfile>    when executing a ":source" command, is replaced with the
-		   file name of the sourced file;
-		   when executing a function, is replaced with
+	<sfile>    When executing a ":source" command, is replaced with the
+		   file name of the sourced file.  *E498* 
+		   When executing a function, is replaced with
 		   "function {function-name}"; function call nesting is
 		   indicated like this:
 		   "function {function-name1}..{function-name2}".  Note that
 		   filename-modifiers are useless when <sfile> is used inside
 		   a function.
+	<slnum>	   When executing a ":source" command, is replaced with the
+	           line number.  *E842*
+		   When executing a function it's the line number relative to
+		   the start of the function.
 
 							 *filename-modifiers*
 	 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs*
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index d9dc24d52..01767f905 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.3.  Last change: 2010 Nov 03
+*diff.txt*      For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -375,7 +375,7 @@ to see more messages.
 
 The self-installing Vim for MS-Windows includes a diff program.  If you don't
 have it you might want to download a diff.exe.  For example from
-http://jlb.twu.net/code/unixkit.php.
+http://gnuwin32.sourceforge.net/packages/diffutils.htm.
 
 
 USING PATCHES					*diff-patchexpr*
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 4a651d3dd..b03487d62 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.3.  Last change: 2010 Sep 18
+*editing.txt*   For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1340,7 +1340,7 @@ Vim is able to write files encrypted, and read them back.  The encrypted text
 cannot be read without the right key.
 {only available when compiled with the |+cryptv| feature}  *E833*
 
-The text in the swap file and the undo file is also encrypted.
+The text in the swap file and the undo file is also encrypted.  *E843*
 
 Note: The text in memory is not encrypted.  A system administrator may be able
 to see your text while you are editing it.  When filtering text with
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4f4092b8d..43ff985aa 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2010 Nov 13
+*eval.txt*	For Vim version 7.3.  Last change: 2010 Dec 01
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2720,7 +2720,7 @@ exp({expr})						*exp()*
 
 expand({expr} [, {flag}])				*expand()*
 		Expand wildcards and the following special keywords in {expr}.
-		The result is a String.
+		The result is a String.  'wildignorecase' applies.
 
 		When there are several matches, they are separated by <NL>
 		characters.  [Note: in version 5.0 a space was used, which
@@ -2741,6 +2741,7 @@ expand({expr} [, {flag}])				*expand()*
 			<abuf>		autocmd buffer number (as a String!)
 			<amatch>	autocmd matched name
 			<sfile>		sourced script file name
+			<slnum>		sourced script file line number
 			<cword>		word under the cursor
 			<cWORD>		WORD under the cursor
 			<client>	the {clientid} of the last received
@@ -3434,6 +3435,7 @@ glob({expr} [, {flag}])					*glob()*
 		the 'suffixes' and 'wildignore' options apply: Names matching
 		one of the patterns in 'wildignore' will be skipped and
 		'suffixes' affect the ordering of matches.
+		'wildignorecase' always applies.
 		If the expansion fails, the result is an empty string.
 		A name for a non-existing file is not included.
 
@@ -5454,8 +5456,8 @@ stridx({haystack}, {needle} [, {start}])		*stridx()*
 		{haystack} of the first occurrence of the String {needle}.
 		If {start} is specified, the search starts at index {start}.
 		This can be used to find a second match: >
-			:let comma1 = stridx(line, ",")
-			:let comma2 = stridx(line, ",", comma1 + 1)
+			:let colon1 = stridx(line, ":")
+			:let colon2 = stridx(line, ":", colon1 + 1)
 <		The search is done case-sensitive.
 		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 85370f9e2..85704869a 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.3.  Last change: 2010 Jul 30
+*indent.txt*    For Vim version 7.3.  Last change: 2010 Nov 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -258,6 +258,7 @@ assume a 'shiftwidth' of 4.
 <
 	bN    If N != 0 Vim will align a final "break" with the case label,
 	      so that case..break looks like a sort of block.  (default: 0).
+	      When using 1, consider adding "0=break" to 'cinkeys'.
 
 		cino=		    cino=b1 >
 		  switch (x)	      switch(x)
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index c8a32c3ac..33eab763d 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.3.  Last change: 2010 Nov 03
+*intro.txt*     For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -616,7 +616,6 @@ Replace		 <Esc>	  --	  --	<Insert>	      --      --
 Command-line	 *3	  --	  --	 :start	    --		      --
 Ex		 :vi	  --	  --	 --	    --	      --
 
--  NA
 -- not possible
 
 *1 Go from Normal mode to Insert mode by giving the command "i", "I", "a",
@@ -730,7 +729,7 @@ window.
 When the "lastline" flag is present in the 'display' option, you will not see
 '@' characters at the left side of window.  If the last line doesn't fit
 completely, only the part that fits is shown, and the last three characters of
-the last line are replaced with "@@@", like this: >
+the last line are replaced with "@@@", like this:
 
 	+-----------------------+
 	|first line		|
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 49149ccf2..25f6c97a7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2010 Nov 16
+*options.txt*	For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1439,7 +1439,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			all operations except yank.  Yank shall copy the text
 			into register '+' and also into '*' when "unnamed" is
 			included.
-			Only available with the |+x11| feature.
+			Only available with the |+X11| feature.
 			Availability can be checked with: >
 				if has('unnamedplus')
 <
@@ -2861,6 +2861,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  file only, the option is not changed.
 	When 'binary' is set, the value of 'fileformats' is not used.
 
+	Note that when Vim starts up with an empty buffer this option is not
+	use.  Set 'fileformat' in your .vimrc instead.
+
 	For systems with a Dos-like <EOL> (<CR><NL>), when reading files that
 	are ":source"ed and for vimrc files, automatic <EOL> detection may be
 	done:
@@ -3218,7 +3221,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	the internal format mechanism.
 
 	The expression may be evaluated in the |sandbox|, see
-	|sandbox-option|.
+	|sandbox-option|.  That stops the option from working, since changing
+	the buffer text is not allowed.
 
 						*'fsync'* *'fs'*
 'fsync' 'fs'		boolean	(default on)
@@ -6241,7 +6245,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Do smart autoindenting when starting a new line.  Works for C-like
 	programs, but can also be used for other languages.  'cindent' does
 	something like this, works better in most cases, but is more strict,
-	see |C-indenting|.  When 'cindent' is on or 'smartindent' is set,
+	see |C-indenting|.  When 'cindent' is on or 'indentexpr' is set,
 	setting 'si' has no effect.  'indentexpr' is a more advanced
 	alternative.
 	Normally 'autoindent' should also be on when using 'smartindent'.
@@ -7762,7 +7766,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	uses another default.
 
 
-			*'wildignorecase* *'wic'* *'nowildignorecase* *'nowic'*
+			*'wildignorecase'* *'wic'* *'nowildignorecase'* *'nowic'*
 'wildignorecase' 'wic'	boolean	(default off)
 			global
 			{not in Vi}
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index a3e114973..5bf410ec1 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.3.  Last change: 2010 Sep 14
+*quickref.txt*  For Vim version 7.3.  Last change: 2010 Dec 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -934,6 +934,7 @@ Short explanation of each option:		*option-list*
 '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
+'wildignorecase'  'wic'     ignore case when completing file names
 '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
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 3533005a0..74aee81f4 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.3.  Last change: 2010 Apr 11
+*spell.txt*	For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -335,6 +335,9 @@ A spell file might not be available in the current 'encoding'.  See
 |spell-mkspell| about how to create a spell file.  Converting a spell file
 with "iconv" will NOT work!
 
+Note: on VMS ".{enc}.spl" is changed to "_{enc}.spl" to avoid trouble with
+filenames.
+
 						    *spell-sug-file* *E781*
 If there is a file with exactly the same name as the ".spl" file but ending in
 ".sug", that file will be used for giving better suggestions.  It isn't loaded
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index ae1e08def..40a0f0236 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2010 Oct 7
+*syntax.txt*	For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -901,8 +901,8 @@ line to your startup file: >
 
 
 DOCBOOK					*docbk.vim* *ft-docbk-syntax* *docbook*
-DOCBOOK	XML				*docbkxml.vim* *ft-docbkxml-syntax*
-DOCBOOK	SGML				*docbksgml.vim* *ft-docbksgml-syntax*
+DOCBOOK XML				*docbkxml.vim* *ft-docbkxml-syntax*
+DOCBOOK SGML				*docbksgml.vim* *ft-docbksgml-syntax*
 
 There are two types of DocBook files: SGML and XML.  To specify what type you
 are using the "b:docbk_type" variable should be set.  Vim does this for you
diff --git a/runtime/doc/tags b/runtime/doc/tags
index c64874c70..e5a50334a 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -659,6 +659,8 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'noweirdinvert'	options.txt	/*'noweirdinvert'*
 'nowfh'	options.txt	/*'nowfh'*
 'nowfw'	options.txt	/*'nowfw'*
+'nowic'	options.txt	/*'nowic'*
+'nowildignorecase'	options.txt	/*'nowildignorecase'*
 'nowildmenu'	options.txt	/*'nowildmenu'*
 'nowinfixheight'	options.txt	/*'nowinfixheight'*
 'nowinfixwidth'	options.txt	/*'nowinfixwidth'*
@@ -1064,10 +1066,12 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'wh'	options.txt	/*'wh'*
 'whichwrap'	options.txt	/*'whichwrap'*
 'wi'	options.txt	/*'wi'*
+'wic'	options.txt	/*'wic'*
 'wig'	options.txt	/*'wig'*
 'wildchar'	options.txt	/*'wildchar'*
 'wildcharm'	options.txt	/*'wildcharm'*
 'wildignore'	options.txt	/*'wildignore'*
+'wildignorecase'	options.txt	/*'wildignorecase'*
 'wildmenu'	options.txt	/*'wildmenu'*
 'wildmode'	options.txt	/*'wildmode'*
 'wildoptions'	options.txt	/*'wildoptions'*
@@ -4219,6 +4223,9 @@ E838	netbeans.txt	/*E838*
 E839	insert.txt	/*E839*
 E84	windows.txt	/*E84*
 E840	insert.txt	/*E840*
+E841	map.txt	/*E841*
+E842	cmdline.txt	/*E842*
+E843	editing.txt	/*E843*
 E85	options.txt	/*E85*
 E86	windows.txt	/*E86*
 E87	windows.txt	/*E87*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index caa2fddbf..10d144016 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2010 Nov 16
+*todo.txt*      For Vim version 7.3.  Last change: 2010 Dec 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,12 +30,6 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Crash when using vimgrep with an ftp file. (Christian Brabandt, 2010 Nov 5)
-Crash with dragn-n-drop of file combined with netrw (Marius Gedminas, 2008 Jun
-11)  I can't reproduce it.  It's probably caused by a handle_drop() call
-in combination with autocommands that invoke a ":redraw" command.
-Another valgrind output Jun 30.
-
 'cursorline' is displayed too short when there are concealed characters and
 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15)
 
@@ -58,19 +52,27 @@ call append(line, "INFO  ....12....18....24....30....36....42....48....54....60.
 Building the MingW version without clipboard but with multi-byte doesn't
 work. (Bill Lam, 2010 Sep 18)
 
+When reading from stdin, don't enable signals before finishing reading?
+Otherwise the program producing the text may get killed by SIGWINCH.
+(Benjamin R. Haskell) Xavier: It's because reading from stdin returns -1.
+Patch from Xavier de Gaye, 2010 Dec 7.  More generic solution?
+
 Bug: E685 error for func_unref(). (ZyX, 2010 Aug 5)
 
 Using ":break" or something else that stops executing commands inside a
 ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct
 15)
 
+Vim using lots of memory when joining lines. (John Little, 2010 Dec 3)
+
 string() can't parse back "inf" and "nan".  Fix documentation or fix code?
 (ZyX, 2010 Aug 23)
 
-maparg() does not show the <script> flag.  How to restore the script ID?
+maparg() does not show the <script> flag.  When temporarily changing a
+mapping, how to restore the script ID?
 
 Patch to fix \%V item in regexp. (Christian Brabandt, 2010 Nov 8)
-Not quite right.
+Update Nov 19.  James Vega: still not right.  Christian: it's difficult.
 
 Highlighting stops working after changing it many times.  Script to reproduce
 it: Pablo Contreras, 2010 Oct 12  Windows XP and 7.  Font is never freed?
@@ -78,21 +80,29 @@ it: Pablo Contreras, 2010 Oct 12  Windows XP and 7.  Font is never freed?
 When 'cursorcolumn' is set locally to a window, ":new" opens a window with the
 same highlighting but 'cursorcolumn' is empty. (Tyru, 2010 Nov 15)
 
+In the sandbox it's not allowed to do many things, but it's possible to change
+or set variables.  Add a way to prevent variables from being changed in the
+sandbox?  E.g.: ":protect g:restore_settings".
+
 GTK: drawing a double-width combining character over single-width characters
 doesn't look right. (Dominique Pelle, 2010 Aug 8)
 
-GTK: patch to fix hitting Enter in a dialog. (Britton Kerin, 2010 Nov 11)
-
 GTK: tear-off menu does not work. (Kurt Sonnenmoser, 2010 Oct 25)
 
+Version of netbeans.c for use with MacVim. (Kazuki Sakamoto, 2010 Nov 18)
+
+7.3.014 changed how backslash at end of line works, but still get a NUL when
+there is one backslash. (Ray Frush, 2010 Nov 18)  What does the original ex
+do?
+
 ":find" completion does not escape space in directory name. (Isz, 2010 Nov 2)
 
+Searching mixed with Visual mode doesn't redraw properly. (James Vega, 2010 Nov
+22)
+
 Win32: When using Chinese tear-off menu doesn't work. (Weasley, 2010 Oct 31)
 Patch by Alex Jakushev, 2010 Nov 2.
 
-Using control characters in 'statusline' doesn't work well. (ZyX, 2010 Nov 1)
-Patch by Caio Ariede, 2010 Nov 3
-
 Using ":call" inside "if 0" does not see that a function returns a Dict and
 gives error for "." as string concatenation.  (Yasuhiro Matsumoto, 2010 Oct 20)
 Patch: Oct 20.
@@ -110,6 +120,14 @@ clear why it doesn't work.
 Editing a file with a ^M with 'ff' set to "mac", opening a help file, then the
 ^M is displayed as ^J sometimes.  Getting 'ff' value from wrong window/buffer?
 
+Since patch 7.2.46 Yankring plugin has become very slow, eventually make Vim
+crash? (Raiwil, 2010 Nov 17)
+
+Patch to disallow fork() when __APPLE__ is defined. (Hisashi T Fujinaka, 2010
+Nov 25)
+
+GTK: Patch to fix menu popping down. (Hong Xu, 2010 Dec 4, Dec 5)
+
 Patch to add 'systemencoding', convert between 'encoding' and this for file
 names, shell commands and the like.  (Kikuchan, 2010 Oct 14)
 Assume the system converts between the actual encoding of the filesystem to
@@ -118,7 +136,8 @@ the system encoding (usually utf-8).
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
 
-Patch to support sorting on floating point number.
+Patch to support sorting on floating point number.  (Alex Jakushev, 2010 Oct
+30)
 
 Ruby: ":ruby print $buffer.number" returns zero.
 
@@ -179,6 +198,8 @@ Patch for VisVim, pass file name to VimOpenFile. (Jiri Sedlak, 2010 Nov 12)
 When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines
 instead of one. (Constantin Pan, 2010 Sep 10)
 
+Crash in setqflist(). (Benoit Mortgat, 2010 Nov 18)
+
 Writing nested List and Dict in viminfo gives error message and can't be read
 back. (Yukihiro Nakadaira, 2010 Nov 13)
 
@@ -255,6 +276,8 @@ Undo problem: line not removed as expected when using setline() from Insert
 mode. (Israel Chauca, 2010 May 13, more in second msg)
 Break undo when CTRL-R = changes the text?  Or save more lines?
 
+Patch for static code analysis errors in riscOS. (Dominique Pelle, 2010 Dec 3)
+
 Change to C syntax folding to make it work much faster, but a bit less
 reliable. (Lech Lorens, 2009 Nov 9)  Enable with an option?
 Most time is spent in in_id_list().
@@ -262,6 +285,8 @@ Most time is spent in in_id_list().
 Slow combination of folding and PHP syntax highlighting.  Script to reproduce
 it.  Caused by "syntax sync fromstart" in combination with patch 7.2.274.
 (Christian Brabandt, 2010 May 27)
+Generally, folding with 'foldmethod' set to "syntax" is slow.  Do profiling to
+find out why.
 
 When completion inserts the first match, it may trigger the line to be folded.
 Disable updating folds while completion is active? (Peter Odding, 2010 Jun 9)
@@ -427,6 +452,9 @@ very high. (Yegappan Lakshmanan, 2010 Jul 22, Michael Peeters, 2010 Jul 22)
 Directory wrong in session file, caused by ":lcd" in BufEnter autocommand.
 (Felix Kater, 2009 Mar 3)
 
+Session file generates error upon loading, cause bu --remote-silent-tab.
+(7tommm (ytommm) 2010 Nov 24)
+
 Using ~ works OK on 'a' with composing char, but not on 0x0418  with composing
 char 0x0301. (Tony Mechelynck, 2009 Mar 4)
 
@@ -543,9 +571,6 @@ Patch for c.vim and cpp.vim syntax files. (Chung-chieh Shan, 2008 Nov 26)
 c.vim: XXX in a comment is colored yellow, but not when it's after "#if 0".
 (Ilya Dogolazky, 2009 Aug 7)
 
-Win32:  ":dis +" shows nothing, but "+p does insert text.  Problem with "* and
-"+ being the same thing?
-
 You can type ":w ++bad=x fname", but the ++bad argument is ignored.  Give an
 error message?  Or is this easy to implement?  (Nathan Stratton Treadway, 2008
 Aug 20)  This is in ucs2bytes(), search for 0xBF.  Using the ++bad argument is
@@ -582,9 +607,6 @@ When mapping : to ; and ; to :, @; doesn't work like @: and @: doesn't work
 either.  Matt Wozniski:  nv_at() calls do_execreg() which uses
 put_in_typebuf().  Char mapped twice?
 
-8   Some file systems are case-sensitive, some are not.  Turn
-    CASE_INSENSITIVE_FILENAME into an option, at least for completion.
-
 Despite adding save_subexpr() this still doesn't work properly:
 Regexp: matchlist('12a4aaa', '^\(.\{-}\)\(\%5c\@<=a\+\)\(.\+\)\?')
 Returns ['12a4', 'aaa', '4aaa'], should be ['12a4', 'aaa', '']
@@ -640,6 +662,9 @@ try the Cocoa version.
 Mac: After a ":vsplit" the left scrollbar doesn't appear until 'columns' is
 changed or the window is resized.
 
+GTK: when setting 'columns' in a startup script and doing ":vertical diffsplit"
+the window isn't redrawn properly, see two vertical bars.
+
 Mac: Patch for configure: remove arch from ruby link args. (Knezevic, 2008
 Mar 5)  Alternative: Kazuki Sakamoto, Mar 7.
 
@@ -1149,8 +1174,8 @@ doesn't work from Geoffrey Antos, 2008 May 5.
 Also: the window may no longer fit on the screen, thus the command line is not
 visible.
 
-GTK: when setting 'columns' in a startup script and doing ":vertical diffsplit"
-the window isn't redrawn properly, see two vertical bars.
+When right after "vim file", "M" then CTRL-W v the windows are scrolled
+differently and unexpectedly.  Caused by patch 7.2.398?
 
 The magic clipboard format "VimClipboard2" appears in several places.  Should
 be only one.
@@ -4105,6 +4130,9 @@ Buffer list:
     should then mean the number of the last buffer.  E.g.: "4,$bdel".
 7   Add an option to mostly use slashes in file names.  Separately for
     internal use and for when executing an external program?
+8   Some file systems are case-sensitive, some are not.  Besides
+    'wildignorecase' there might be more parts inside
+    CASE_INSENSITIVE_FILENAME that are useful on Unix.
 
 
 Swap (.swp) files:
@@ -4503,6 +4531,8 @@ Various improvements:
 3   Make "2d%" work like "d%d%" instead of "d2%"?
 7   "g CTRL-O" jumps back to last used buffer.	Skip CTRL-O jumps in the same
     buffer.  Make jumplist remember the last ten accessed buffers?
+7   Make it possible to set the size of the jumplist (also to a smaller number
+    than the default). (Nikolai Weibull)
 -   Add code to disable the CAPS key when going from Insert to Normal mode.
 -   Set date/protection/etc. of the patchfile the same as the original file.
 -   Use growarray for termcodes[] in term.c
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 34740a49e..fc0782f63 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.3.  Last change: 2010 Oct 31
+*usr_41.txt*	For Vim version 7.3.  Last change: 2010 Nov 17
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -794,6 +794,7 @@ Syntax and highlighting:	  *syntax-functions* *highlighting-functions*
 	synIDattr()		get a specific attribute of a syntax ID
 	synIDtrans()		get translated syntax ID
 	synstack()		get list of syntax IDs at a specific position
+	synconcealed()		get info about concealing
 	diff_hlID()		get highlight ID for diff mode at a position
 	matchadd()		define a pattern to highlight (a "match")
 	matcharg()		get info about |:match| arguments
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index eef0628a0..3fb22a10d 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	man
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change:	2008 Sep 17
+" Last Change:	2010 Nov 29
 
 " To make the ":Man" command available before editing a manual page, source
 " this script from your startup vimrc file.
@@ -15,6 +15,10 @@ if &filetype == "man"
   endif
   let b:did_ftplugin = 1
 
+  " Ensure Vim is not recursively invoked (man-db does this)
+  " when doing ctrl-[ on a man page reference.
+  let $MANPAGER = ""
+
   " allow dot and dash in manual page name.
   setlocal iskeyword+=\.,-
 
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 20f4f923a..82276a65b 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2010 Jul 24
+" Last Change:	2010 Dec 02
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -1042,6 +1042,8 @@ if has("wildignore")
   call append("$", "wildignore\tlist of patterns to ignore files for file name completion")
   call <SID>OptionG("wig", &wig)
 endif
+call append("$", "wildignorecase\tignore case when completing file names")
+call <SID>BinOptionG("wic", &wic)
 if has("wildmenu")
   call append("$", "wildmenu\tcommand-line completion shows a list of matches")
   call <SID>BinOptionG("wmnu", &wmnu)
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index d5a0ac5a9..3cc732bc4 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2008 Sep 03
+" Last Change: 2010 Nov 16
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
@@ -82,8 +82,9 @@ function! s:Highlight_Matching_Pair()
   endif
 
   " When not in a string or comment ignore matches inside them.
+  " We match "escape" for special items, such as listpEscapeSpecial.
   let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
-	\ '=~?  "string\\|character\\|singlequote\\|comment"'
+	\ '=~?  "string\\|character\\|singlequote\\|escape\\|comment"'
   execute 'if' s_skip '| let s_skip = 0 | endif'
 
   " Limit the search to lines visible in the window.
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index d2f34968b..721692267 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -1,10 +1,13 @@
 " Vim syntax file
 " Language:	Groovy
-" Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
-" Version: 	0.1.9b
+" Original Author:	Alessio Pace <billy.corgan@tiscali.it>
+" Maintainer:	Tobias Rapp <yahuxo@gmx.de>
+" Version: 	0.1.10
 " URL:	  http://www.vim.org/scripts/script.php?script_id=945	
-" Last Change:	6/4/2004
+" Last Change:	2010 Nov 29
 
+" THE ORIGINAL AUTHOR'S NOTES:
+"
 " This is my very first vim script, I hope to have
 " done it the right way.
 " 
@@ -16,8 +19,7 @@
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 "
-" HOWTO USE IT (INSTALL):
-" [groovy is still not recognized by vim! :-( ]
+" HOWTO USE IT (INSTALL) when not part of the distribution:
 "
 " 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
 " 
@@ -247,7 +249,9 @@ syn match   groovySpecialError     contained "\\."
 syn match   groovySpecialCharError contained "[^']"
 syn match   groovySpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
 syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
-syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell
+syn region  groovyString          start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
  syn match groovyELExpr /\${.\{-}}/ contained
 GroovyHiLink groovyELExpr Identifier
diff --git a/runtime/syntax/lex.vim b/runtime/syntax/lex.vim
index 68ae63273..e500f5c07 100644
--- a/runtime/syntax/lex.vim
+++ b/runtime/syntax/lex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Lex
 " Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Sep 11, 2009
-" Version:	10
+" Last Change:	Nov 01, 2010
+" Version:	12
 " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 " Option:
@@ -36,6 +36,9 @@ endif
 " --- Lex stuff ---
 " --- ========= ---
 
+" Options Section
+syn match lexOptions '^%\s*option\>.*$' contains=lexPatString
+
 "I'd prefer to use lex.* , but vim doesn't handle forward definitions yet
 syn cluster lexListGroup		contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatString,lexPatTag,lexPatTag,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,lexPatCode,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
 syn cluster lexListPatCodeGroup	contains=lexAbbrvBlock,lexAbbrv,lexAbbrv,lexAbbrvRegExp,lexInclude,lexPatBlock,lexPat,lexBrace,lexPatTag,lexPatTag,lexPatTagZoneStart,lexPatComment,lexPatCodeLine,lexMorePat,lexPatSep,lexSlashQuote,cInParen,cUserLabel,cOctalZero,cCppSkip,cErrInBracket,cErrInParen,cOctalError,cCppOut2,cCommentStartError,cParenError
@@ -61,13 +64,15 @@ endif
 
 "%% : Patterns {Actions}
 if has("folding")
- syn region lexPatBlock	fold matchgroup=Todo	start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
+ syn region lexPatBlock	fold matchgroup=Todo	start="^%%$" matchgroup=Todo	end="^%%$"	skipnl	skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude
  syn region lexPat		fold			start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
+ syn region lexPatInclude	fold matchgroup=lexSep	start="^%{"	end="%}"	contained	contains=lexPatCode
  syn region lexBrace	fold			start="\[" skip=+\\\\\|\\+	end="]"			contained
  syn region lexPatString	fold matchgroup=String	start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
 else
- syn region lexPatBlock	matchgroup=Todo		start="^%%$" matchgroup=Todo	end="^%%$"	skipnl skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat
+ syn region lexPatBlock	matchgroup=Todo		start="^%%$" matchgroup=Todo	end="^%%$"	skipnl	skipwhite	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatInclude
  syn region lexPat					start=+\S+ skip="\\\\\|\\."	end="\s"me=e-1		contained nextgroup=lexMorePat,lexPatSep contains=lexPatTag,lexPatString,lexSlashQuote,lexBrace
+ syn region lexPatInclude	matchgroup=lexSep		start="^%{"	end="%}"	contained	contains=lexPatCode
  syn region lexBrace				start="\[" skip=+\\\\\|\\+	end="]"			contained
  syn region lexPatString	matchgroup=String		start=+"+	skip=+\\\\\|\\"+	matchgroup=String end=+"+	contained
 endif
@@ -117,6 +122,7 @@ hi def link lexAbbrvRegExp	Macro
 hi def link lexAbbrv	SpecialChar
 hi def link lexCFunctions	Function
 hi def link lexMorePat	SpecialChar
+hi def link lexOptions	PreProc
 hi def link lexPatComment	Comment
 hi def link lexPat		Function
 hi def link lexPatString	Function
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index fd44f6073..74ec20bb4 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    Lisp
 " Maintainer:  Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Mar 05, 2009
-" Version:     21
+" Last Change: Nov 16, 2010
+" Version:     22
 " URL:	       http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols
@@ -32,7 +32,7 @@ endif
 " ---------------------------------------------------------------------
 " Clusters: {{{1
 syn cluster			lispAtomCluster		contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispDecl,lispFunc,lispLeadWhite
-syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispSpecial,lispSymbol,lispVar,lispLeadWhite
+syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispEscapeSpecial,lispSymbol,lispVar,lispLeadWhite
 if exists("g:lisp_instring")
  syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString,lispInString,lispInStringString
 else
@@ -68,7 +68,7 @@ syn match lispAtom			"'("me=e-1			contains=lispAtomMark	nextgroup=lispAtomList
 syn match lispAtom			"'[^ \t()]\+"			contains=lispAtomMark
 syn match lispAtomBarSymbol		!'|..\{-}|!			contains=lispAtomMark
 syn region lispAtom			start=+'"+			skip=+\\"+ end=+"+
-syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispSpecial
+syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
 syn match lispAtomNmbr			contained			"\<\d\+"
 syn match lispLeadWhite			contained			"^\s\+"
 
@@ -537,16 +537,16 @@ endif
 syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\="
 syn match lispNumber		"-\=\(\d\+/\d\+\)"
 
-syn match lispSpecial		"\*\w[a-z_0-9-]*\*"
-syn match lispSpecial		!#|[^()'`,"; \t]\+|#!
-syn match lispSpecial		!#x\x\+!
-syn match lispSpecial		!#o\o\+!
-syn match lispSpecial		!#b[01]\+!
-syn match lispSpecial		!#\\[ -}\~]!
-syn match lispSpecial		!#[':][^()'`,"; \t]\+!
-syn match lispSpecial		!#([^()'`,"; \t]\+)!
-syn match lispSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
-syn match lispSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
+syn match lispEscapeSpecial		"\*\w[a-z_0-9-]*\*"
+syn match lispEscapeSpecial		!#|[^()'`,"; \t]\+|#!
+syn match lispEscapeSpecial		!#x\x\+!
+syn match lispEscapeSpecial		!#o\o\+!
+syn match lispEscapeSpecial		!#b[01]\+!
+syn match lispEscapeSpecial		!#\\[ -}\~]!
+syn match lispEscapeSpecial		!#[':][^()'`,"; \t]\+!
+syn match lispEscapeSpecial		!#([^()'`,"; \t]\+)!
+syn match lispEscapeSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
+syn match lispEscapeSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
 
 syn match lispConcat		"\s\.\s"
 syn match lispParenError	")"
@@ -585,7 +585,7 @@ if version >= 508
   HiLink lispMark		Delimiter
   HiLink lispNumber		Number
   HiLink lispParenError		Error
-  HiLink lispSpecial		Type
+  HiLink lispEscapeSpecial	Type
   HiLink lispString		String
   HiLink lispTodo		Todo
   HiLink lispVar		Statement
diff --git a/runtime/syntax/logindefs.vim b/runtime/syntax/logindefs.vim
index 7c2b122ae..59d18e7ef 100644
--- a/runtime/syntax/logindefs.vim
+++ b/runtime/syntax/logindefs.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         login.defs(5) configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-04-19
+" Latest Revision:  2010-11-29
 
 if exists("b:current_syntax")
   finish
@@ -10,83 +10,163 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn keyword logindefsTodo       contained TODO FIXME XXX NOTE
-
-syn region  logindefsComment    display oneline start='^\s*#' end='$'
-                                \ contains=logindefsTodo,@Spell
-
-syn match   logindefsString     contained '[[:graph:]]\+'
-
-syn match   logindefsPath       contained '[[:graph:]]\+'
-
-syn match   logindefsPaths      contained '[[:graph:]]\+'
-                                \ nextgroup=logindefsPathDelim
-
-syn match   logindefsPathDelim  contained ':' nextgroup=logindefsPaths
-
-syn keyword logindefsBoolean    contained yes no
-
-syn match   logindefsDecimal    contained '\<\d\+\>'
-
-syn match   logindefsOctal      contained display '\<0\o\+\>'
-                                \ contains=logindefsOctalZero
-syn match   logindefsOctalZero  contained display '\<0'
-syn match   logindefsOctalError contained display '\<0\o*[89]\d*\>'
-
-syn match   logindefsHex        contained display '\<0x\x\+\>'
-
-syn cluster logindefsNumber     contains=logindefsDecimal,logindefsOctal,
-                                \ logindefsOctalError,logindefsHex
-
-syn match   logindefsBegin      display '^'
-                                \ nextgroup=logindefsKeyword,logindefsComment
-                                \ skipwhite
-
-syn keyword logindefsKeyword    contained CHFN_AUTH CLOSE_SESSIONS CREATE_HOME
-                                \ DEFAULT_HOME FAILLOG_ENAB LASTLOG_ENAB
-                                \ LOG_OK_LOGINS LOG_UNKFAIL_ENAB MAIL_CHECK_ENAB
-                                \ MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB
-                                \ PASS_ALWAYS_WARN PORTTIME_CHECKS_ENAB
-                                \ QUOTAS_ENAB SU_WHEEL_ONLY SYSLOG_SG_ENAB
-                                \ SYSLOG_SU_ENAB USERGROUPS_ENAB
-                                \ nextgroup=logindefsBoolean skipwhite
-
-syn keyword logindefsKeyword    contained CHFN_RESTRICT CONSOLE CONSOLE_GROUPS
-                                \ ENV_TZ ENV_HZ FAKE_SHELL SU_NAME LOGIN_STRING
-                                \ NOLOGIN_STR TTYGROUP USERDEL_CMD
-                                \ nextgroup=logindefsString skipwhite
-
-syn keyword logindefsKeyword    contained ENVIRON_FILE FTMP_FILE HUSHLOGIN_FILE
-                                \ ISSUE_FILE MAIL_DIR MAIL_FILE NOLOGINS_FILE
-                                \ NOLOGINS_FILE TTYTYPE_FILE QMAIL_DIR
-                                \ SULOG_FILE
-                                \ nextgroup=logindefsPath skipwhite
-
-syn keyword logindefsKeyword    contained CRACKLIB_DICTPATH ENV_PATH
-                                \ ENV_ROOTPATH ENV_SUPATH MOTD_FILE
-                                \ nextgroup=logindefsPaths skipwhite
-
-syn keyword logindefsKeyword    contained ERASECHAR FAIL_DELAY GETPASS_ASTERISKS
-                                \ GID_MAX GID_MIN KILLCHAR LOGIN_RETRIES
-                                \ LOGIN_TIMEOUT PASS_CHANGE_TRIES PASS_MAX_DAYS
-                                \ PASS_MAX_LEN PASS_MIN_DAYS PASS_MIN_LEN
-                                \ PASS_WARN_AGE TTYPERM UID_MAX UID_MIN ULIMIT
-                                \ UMASK
-                                \ nextgroup=@logindefsNumber skipwhite
-
-hi def link logindefsTodo       Todo
-hi def link logindefsComment    Comment
-hi def link logindefsString     String
-hi def link logindefsPath       String
-hi def link logindefsPaths      logindefsPath
-hi def link logindefsPathDelim  Delimiter
-hi def link logindefsBoolean    Boolean
-hi def link logindefsDecimal    Number
-hi def link logindefsOctal      Number
-hi def link logindefsOctalZero  PreProc
-hi def link logindefsOctalError Error
-hi def link logindefsHex        Number
-hi def link logindefsKeyword    Keyword
+syn match   logindefsBegin          display '^'
+                                    \ nextgroup=
+                                    \   logindefsComment,
+                                    \   @logindefsKeyword
+                                    \ skipwhite
+
+syn region  logindefsComment        display oneline start='^\s*#' end='$'
+                                    \ contains=logindefsTodo,@Spell
+
+syn keyword logindefsTodo           contained TODO FIXME XXX NOTE
+
+syn cluster logindefsKeyword        contains=
+                                    \ logindefsBooleanKeyword,
+                                    \ logindefsEncryptKeyword,
+                                    \ logindefsNumberKeyword,
+                                    \ logindefsPathKeyword,
+                                    \ logindefsPathsKeyword,
+                                    \ logindefsStringKeyword
+
+syn keyword logindefsBooleanKeyword contained
+                                    \ CHFN_AUTH
+                                    \ CHSH_AUTH
+                                    \ CREATE_HOME
+                                    \ DEFAULT_HOME
+                                    \ FAILLOG_ENAB
+                                    \ LASTLOG_ENAB
+                                    \ LOG_OK_LOGINS
+                                    \ LOG_UNKFAIL_ENAB
+                                    \ MAIL_CHECK_ENAB
+                                    \ MD5_CRYPT_ENAB
+                                    \ OBSCURE_CHECKS_ENAB
+                                    \ PASS_ALWAYS_WARN
+                                    \ PORTTIME_CHECKS_ENAB
+                                    \ QUOTAS_ENAB
+                                    \ SU_WHEEL_ONLY
+                                    \ SYSLOG_SG_ENAB
+                                    \ SYSLOG_SU_ENAB
+                                    \ USERGROUPS_ENAB
+                                    \ nextgroup=logindefsBoolean skipwhite
+
+syn keyword logindefsBoolean        contained yes no
+
+syn keyword logindefsEncryptKeyword contained
+                                    \ ENCRYPT_METHOD
+                                    \ nextgroup=logindefsEncryptMethod skipwhite
+
+syn keyword logindefsEncryptMethod  contained
+                                    \ DES
+                                    \ MD5
+                                    \ SHA256
+                                    \ SHA512
+
+syn keyword logindefsNumberKeyword  contained
+                                    \ ERASECHAR
+                                    \ FAIL_DELAY
+                                    \ GID_MAX
+                                    \ GID_MIN
+                                    \ KILLCHAR
+                                    \ LOGIN_RETRIES
+                                    \ LOGIN_TIMEOUT
+                                    \ MAX_MEMBERS_PER_GROUP
+                                    \ PASS_CHANGE_TRIES
+                                    \ PASS_MAX_DAYS
+                                    \ PASS_MIN_DAYS
+                                    \ PASS_WARN_AGE
+                                    \ PASS_MAX_LEN
+                                    \ PASS_MIN_LEN
+                                    \ SHA_CRYPT_MAX_ROUNDS
+                                    \ SHA_CRYPT_MIN_ROUNDS
+                                    \ SYS_GID_MAX
+                                    \ SYS_GID_MIN
+                                    \ SYS_UID_MAX
+                                    \ SYS_UID_MIN
+                                    \ UID_MAX
+                                    \ UID_MIN
+                                    \ ULIMIT
+                                    \ UMASK
+                                    \ nextgroup=@logindefsNumber skipwhite
+
+syn cluster logindefsNumber         contains=
+                                    \ logindefsDecimal,
+                                    \ logindefsHex,
+                                    \ logindefsOctal,
+                                    \ logindefsOctalError
+
+syn match   logindefsDecimal        contained '\<\d\+\>'
+
+syn match   logindefsHex            contained display '\<0x\x\+\>'
+
+syn match   logindefsOctal          contained display '\<0\o\+\>'
+                                    \ contains=logindefsOctalZero
+syn match   logindefsOctalZero      contained display '\<0'
+
+syn match   logindefsOctalError     contained display '\<0\o*[89]\d*\>'
+
+syn keyword logindefsPathKeyword    contained
+                                    \ ENVIRON_FILE
+                                    \ FAKE_SHELL
+                                    \ FTMP_FILE
+                                    \ HUSHLOGIN_FILE
+                                    \ ISSUE_FILE
+                                    \ MAIL_DIR
+                                    \ MAIL_FILE
+                                    \ NOLOGINS_FILE
+                                    \ SULOG_FILE
+                                    \ TTYTYPE_FILE
+                                    \ nextgroup=logindefsPath skipwhite
+
+syn match   logindefsPath           contained '[[:graph:]]\+'
+
+syn keyword logindefsPathsKeyword   contained
+                                    \ CONSOLE
+                                    \ ENV_PATH
+                                    \ ENV_SUPATH
+                                    \ MOTD_FILE
+                                    \ nextgroup=logindefsPaths skipwhite
+
+syn match   logindefsPaths          contained '[^:]\+'
+                                    \ nextgroup=logindefsPathDelim
+
+syn match   logindefsPathDelim      contained ':' nextgroup=logindefsPaths
+
+syn keyword logindefsStringKeyword  contained
+                                    \ CHFN_RESTRICT
+                                    \ CONSOLE_GROUPS
+                                    \ ENV_HZ
+                                    \ ENV_TZ
+                                    \ LOGIN_STRING
+                                    \ SU_NAME
+                                    \ TTYGROUP
+                                    \ TTYPERM
+                                    \ USERDEL_CMD
+                                    \ nextgroup=logindefsString skipwhite
+
+syn match   logindefsString         contained '[[:graph:]]\+'
+
+hi def link logindefsComment        Comment
+hi def link logindefsTodo           Todo
+hi def link logindefsKeyword        Keyword
+hi def link logindefsBooleanKeyword logindefsKeyword
+hi def link logindefsEncryptKeyword logindefsKeyword
+hi def link logindefsNumberKeyword  logindefsKeyword
+hi def link logindefsPathKeyword    logindefsKeyword
+hi def link logindefsPathsKeyword   logindefsKeyword
+hi def link logindefsStringKeyword  logindefsKeyword
+hi def link logindefsBoolean        Boolean
+hi def link logindefsEncryptMethod  Type
+hi def link logindefsNumber         Number
+hi def link logindefsDecimal        logindefsNumber
+hi def link logindefsHex            logindefsNumber
+hi def link logindefsOctal          logindefsNumber
+hi def link logindefsOctalZero      PreProc
+hi def link logindefsOctalError     Error
+hi def link logindefsPath           String
+hi def link logindefsPaths          logindefsPath
+hi def link logindefsPathDelim      Delimiter
+hi def link logindefsString         String
 
 let b:current_syntax = "logindefs"
 
diff --git a/runtime/syntax/rhelp.vim b/runtime/syntax/rhelp.vim
index 98e5bc0c6..7550b1293 100644
--- a/runtime/syntax/rhelp.vim
+++ b/runtime/syntax/rhelp.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
 " Language:    R Help File
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2010 Apr 22
-" Version:     0.7.3
-" SVN:		   $Id: rhelp.vim 88 2010-04-22 19:37:09Z ranke $
-" Remarks:     - Now includes R syntax highlighting in the appropriate
+" Last Change: 2010 Nov 22
+" Version:     0.7.4
+" SVN:		   $Id: rhelp.vim 90 2010-11-22 10:58:11Z ranke $
+" Remarks:     - Includes R syntax highlighting in the appropriate
 "                sections if an r.vim file is in the same directory or in the
 "                default debian location.
 "              - There is no Latex markup in equations
@@ -28,19 +28,19 @@ syn case match
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\name{" end="}" 
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\alias{" end="}" 
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\pkg{" end="}" 
-syn region rhelpIdentifier matchgroup=rhelpSection	start="\\item{" end="}" contained contains=rhelpDots
-syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end=/}/ contained
+syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end="}" contained
+syn region rhelpIdentifier matchgroup=rhelpSection start="\\Rdversion{" end="}"
 
 " Highlighting of R code using an existing r.vim syntax file if available {{{1
 syn include @R syntax/r.vim
 syn match rhelpDots		"\\dots" containedin=@R
-syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpSection
-syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpIdentifier,rhelpS4method
-syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end=/}/ contains=@R
-syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end=/}/ contains=@R contained
-syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end=/}/ contains=@R,rhelpLink contained
-syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=/)/ contains=@R,rhelpDots contained
-syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end=/}/ contains=@R
+syn region rhelpRcode matchgroup=Delimiter start="\\examples{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpSection
+syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpIdentifier,rhelpS4method
+syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end="}" contains=@R
+syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end="}" contains=@R contained
+syn region rhelpRcode matchgroup=Delimiter start="\\code{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpLink contained
+syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=")" contains=@R,rhelpDots contained
+syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end="}" contains=@R
 
 " Strings {{{1
 syn region rhelpString start=/"/ end=/"/ 
@@ -53,7 +53,7 @@ syn match rhelpDelimiter		"\\cr"
 syn match rhelpDelimiter		"\\tab "
 
 " Keywords {{{1
-syn match rhelpKeyword	"\\R"
+syn match rhelpKeyword	"\\R" contained
 syn match rhelpKeyword	"\\ldots"
 syn match rhelpKeyword  "--"
 syn match rhelpKeyword  "---"
@@ -129,10 +129,13 @@ syn match rhelpType		"\\deqn\>"
 syn match rhelpType		"\\file\>"
 syn match rhelpType		"\\email\>"
 syn match rhelpType		"\\url\>"
+syn match rhelpType		"\\href\>"
 syn match rhelpType		"\\var\>"
 syn match rhelpType		"\\env\>"
 syn match rhelpType		"\\option\>"
 syn match rhelpType		"\\command\>"
+syn match rhelpType		"\\newcommand\>"
+syn match rhelpType		"\\renewcommand\>"
 syn match rhelpType		"\\dfn\>"
 syn match rhelpType		"\\cite\>"
 syn match rhelpType		"\\acronym\>"
@@ -140,6 +143,7 @@ syn match rhelpType		"\\acronym\>"
 " rhelp sections {{{1
 syn match rhelpSection		"\\encoding\>"
 syn match rhelpSection		"\\title\>"
+syn match rhelpSection		"\\item\>"
 syn match rhelpSection		"\\description\>"
 syn match rhelpSection		"\\concept\>"
 syn match rhelpSection		"\\arguments\>"
@@ -153,11 +157,11 @@ syn match rhelpSection		"\\keyword\>"
 syn match rhelpSection		"\\docType\>"
 syn match rhelpSection		"\\format\>"
 syn match rhelpSection		"\\source\>"
-syn match rhelpSection     "\\itemize\>"
-syn match rhelpSection     "\\describe\>"
-syn match rhelpSection     "\\enumerate\>"
-syn match rhelpSection     "\\item "
-syn match rhelpSection     "\\item$"
+syn match rhelpSection    "\\itemize\>"
+syn match rhelpSection    "\\describe\>"
+syn match rhelpSection    "\\enumerate\>"
+syn match rhelpSection    "\\item "
+syn match rhelpSection    "\\item$"
 syn match rhelpSection		"\\tabular{[lcr]*}"
 syn match rhelpSection		"\\dontrun\>"
 syn match rhelpSection		"\\dontshow\>"
@@ -165,11 +169,11 @@ syn match rhelpSection		"\\testonly\>"
 syn match rhelpSection		"\\donttest\>"
 
 " Freely named Sections {{{1
-syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end=/}/ 
-syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end=/}/ 
+syn region rhelpFreesec matchgroup=Delimiter start="\\section{" matchgroup=Delimiter transparent end="}"
+syn region rhelpFreesubsec matchgroup=Delimiter start="\\subsection{" matchgroup=Delimiter transparent end="}" 
 
 " R help file comments {{{1
-syn match rhelpComment /%.*$/ contained 
+syn match rhelpComment /%.*$/
 
 " Error {{{1
 syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rhelpError,rhelpBraceError,rhelpCurlyError
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 5e6fc7f14..95bfc057d 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Aug 12, 2010 
-" Version:	57
+" Last Change:	Sep 17, 2010 
+" Version:	60
 " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 " Notes: {{{1
@@ -67,11 +67,11 @@ endif
 "   g:tex_stylish to 1      (for    "*.sty" mode)
 "    or to           0 else (normal "*.tex" mode)
 " or on a buffer-by-buffer basis with b:tex_stylish
-let b:extfname=expand("%:e")
+let s:extfname=expand("%:e")
 if exists("g:tex_stylish")
  let b:tex_stylish= g:tex_stylish
 elseif !exists("b:tex_stylish")
- if b:extfname == "sty" || b:extfname == "cls" || b:extfname == "clo" || b:extfname == "dtx" || b:extfname == "ltx"
+ if s:extfname == "sty" || s:extfname == "cls" || s:extfname == "clo" || s:extfname == "dtx" || s:extfname == "ltx"
   let b:tex_stylish= 1
  else
   let b:tex_stylish= 0
@@ -92,12 +92,12 @@ endif
 " (La)TeX keywords: only use the letters a-zA-Z {{{1
 " but _ is the only one that causes problems.
 if version < 600
-  set isk-=_
+  set isk=a-z,A-Z
   if b:tex_stylish
     set isk+=@
   endif
 else
-  setlocal isk-=_
+  setlocal isk=a-z,A-Z
   if b:tex_stylish
     setlocal isk+=@
   endif
@@ -300,7 +300,7 @@ endif
 
 " Bad Math (mismatched): {{{1
 if !exists("tex_no_math")
- syn match texBadMath		"\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|subequations\|smallmatrix\|xxalignat\)\s*}"
+ syn match texBadMath		"\\end\s*{\s*\(array\|gathered\|bBpvV]matrix\|split\|smallmatrix\|xxalignat\)\s*}"
  syn match texBadMath		"\\end\s*{\s*\(align\|alignat\|displaymath\|displaymath\|eqnarray\|equation\|flalign\|gather\|math\|multline\|xalignat\)\*\=\s*}"
  syn match texBadMath		"\\[\])]"
 endif
@@ -345,7 +345,6 @@ if !exists("tex_no_math")
  call TexNewMathZone("G","gather",1)
  call TexNewMathZone("H","math",1)
  call TexNewMathZone("I","multline",1)
- call TexNewMathZone("J","subequations",0)
  call TexNewMathZone("K","xalignat",1)
  call TexNewMathZone("L","xxalignat",0)
 
@@ -412,7 +411,7 @@ endif
 syn case ignore
 syn keyword texTodo		contained		combak	fixme	todo	xxx
 syn case match
-if b:extfname == "dtx"
+if s:extfname == "dtx"
   syn match texComment		"\^\^A.*$"	contains=@texCommentGroup
   syn match texComment		"^%\+"		contains=@texCommentGroup
 else
@@ -468,15 +467,16 @@ else
 endif
 
 " Tex Reference Zones: {{{1
-syn region texZone		matchgroup=texStatement start="@samp{"			end="}\|%stopzone\>"	contains=@texRefGroup
-syn region texRefZone		matchgroup=texStatement start="\\nocite{"		end="}\|%stopzone\>"	contains=@texRefGroup
-syn region texRefZone		matchgroup=texStatement start="\\bibliography{"		end="}\|%stopzone\>"	contains=@texRefGroup
-syn region texRefZone		matchgroup=texStatement start="\\label{"		end="}\|%stopzone\>"	contains=@texRefGroup
-syn region texRefZone		matchgroup=texStatement start="\\\(page\|eq\)ref{"	end="}\|%stopzone\>"	contains=@texRefGroup
-syn region texRefZone		matchgroup=texStatement start="\\v\=ref{"		end="}\|%stopzone\>"	contains=@texRefGroup
-syn match  texRefZone		'\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite
-syn region texRefOption	contained	matchgroup=Delimiter start='\[' end=']'		contains=@texRefGroup,texRefZone	nextgroup=texRefOption,texCite
-syn region texCite	contained	matchgroup=Delimiter start='{' end='}'		contains=@texRefGroup,texRefZone,texCite
+syn match texRefZone		'\\@samp\>'		skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\nocite\>'		skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\bibliography\>'	skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\label\>'		skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\\(page\|eq\)ref\>'	skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\v\=ref'		skipwhite	nextgroup=texRefLabel
+syn match texRefZone		'\\cite\%([tp]\*\=\)\='	skipwhite	nextgroup=texCiteOption,texCite
+syn region texRefLabel		contained matchgroup=Delimiter start='{'	end='}'	contains=@texRefGroup
+syn region texCiteOption	contained matchgroup=Delimiter start='\['	end=']'	contains=@Spell,@texRefGroup,@texMathZones,texRefZone	nextgroup=texCiteOption,texCite
+syn region texCite		contained matchgroup=Delimiter start='{'	end='}'	contains=@texRefGroup,texCite
 
 " Handle newcommand, newenvironment : {{{1
 syn match  texNewCmd				"\\newcommand\>"			nextgroup=texCmdName skipwhite skipnl
@@ -753,7 +753,11 @@ if has("conceal") && &enc == 'utf-8'
     \ ['wedge'		, '∧'],
     \ ['wr'		, '≀']]
   for texmath in s:texMathList
-   exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
+   if texmath[0] =~ '\w$'
+    exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
+   else
+    exe "syn match texMathSymbol '\\\\".texmath[0]."' contained conceal cchar=".texmath[1]
+   endif
   endfor
 
   if &ambw == "double"
@@ -1027,7 +1031,6 @@ if did_tex_syntax_inits == 1
    HiLink texError		Error
   endif
 
-  HiLink texCite		texRefZone
   HiLink texDefCmd		texDef
   HiLink texDefName		texDef
   HiLink texDocType		texCmdName
@@ -1052,6 +1055,7 @@ if did_tex_syntax_inits == 1
    HiLink texMathZoneV		texMath
    HiLink texMathZoneZ		texMath
   endif
+  HiLink texRefZone		Identifier
   HiLink texSectionMarker	texCmdName
   HiLink texSectionName		texSection
   HiLink texSpaceCode		texStatement
@@ -1060,6 +1064,7 @@ if did_tex_syntax_inits == 1
   HiLink texTypeStyle		texType
 
    " Basic TeX highlighting groups
+  HiLink texCite		Special
   HiLink texCmdArgs		Number
   HiLink texCmdName		Statement
   HiLink texComment		Comment
@@ -1075,7 +1080,7 @@ if did_tex_syntax_inits == 1
   HiLink texNewCmd		Statement
   HiLink texNewEnv		Statement
   HiLink texOption		Number
-  HiLink texRefZone		Special
+  HiLink texRefLabel		Special
   HiLink texSection		PreCondit
   HiLink texSpaceCodeChar	Special
   HiLink texSpecialChar		SpecialChar
@@ -1089,6 +1094,6 @@ if did_tex_syntax_inits == 1
 endif
 
 " Current Syntax: {{{1
-unlet b:extfname
+unlet s:extfname
 let   b:current_syntax = "tex"
 " vim: ts=8 fdm=marker
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index d94d1801d..a6f6e3664 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Vim 7.3 script
 " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	August 04, 2010
-" Version:	7.3-04
+" Last Change:	August 20, 2010
+" Version:	7.3-05
 " Automatically generated keyword lists: {{{1
 
 " Quit when a syntax file was already loaded {{{2
@@ -16,12 +16,14 @@ syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
 syn cluster vimCommentGroup	contains=vimTodo,@Spell
 
 " regular vim commands {{{2
-syn keyword vimCommand contained	abc[lear] argdo argu[ment] bel[owright] bN[ext] breakd[el] b[uffer] caddb[uffer] cb[uffer] cex[pr] cg[etfile] checkt[ime] cnew[er] col[der] con[tinue] cq[uit] delc[ommand] diffoff diffu[pdate] dr[op] echom[sg] em[enu] endt[ry] exi[t] fina[lly] fix[del] foldd[oopen] go[to] hid[e] ij[ump] isp[lit] k laddb[uffer] la[st] lch[dir] lex[pr] lgete[xpr] l[ist] lmak[e] lN[ext] loc[kmarks] lpf[ile] lt[ag] lv[imgrep] ma[rk] mk[exrc] mkv[imrc] mz[scheme] new noh[lsearch] on[ly] ped[it] popu prev[ious] prof[ile] pta[g] ptn[ext] pts[elect] py[thon] r[ead] redr[aw] ret[ab] rightb[elow] rundo san[dbox] sbf[irst] sbN[ext] scripte[ncoding] setg[lobal] sh[ell] sla[st] sme sni[ff] sor[t] spelli[nfo] sp[lit] startg[replace] st[op] sunme syncbind tabd[o] tabl[ast] tabN[ext] tabs tcld[o] th[row] tm[enu] tp[revious] tu undoj[oin] uns[ilent] vert[ical] vi[sual] wa[ll] winp[os] wp[revious] ws[verb] xa[ll] xmenu xnoremenu
-syn keyword vimCommand contained	abo[veleft] arge[dit] as[cii] bf[irst] bo[tright] breakl[ist] buffers cad[dexpr] cc cf[ile] c[hange] cla[st] cn[ext] colo[rscheme] cope[n] cr[ewind] d[elete] diffpatch dig[raphs] ds[earch] echon emenu* endw[hile] f[ile] fin[d] fo[ld] foldo[pen] gr[ep] his[tory] il[ist] iuna[bbrev] keepalt lad[dexpr] later lcl[ose] lf[ile] lg[etfile] ll lmapc[lear] lnf[ile] lockv[ar] lp[revious] lua lvimgrepa[dd] marks mks[ession] mod[e] nbc[lose] n[ext] nu[mber] o[pen] pe[rl] popu[p] p[rint] promptf[ind] ptf[irst] ptN[ext] pu[t] qa[ll] rec[over] redraws[tatus] retu[rn] rub[y] ru[ntime] sa[rgument] sbl[ast] sbp[revious] scrip[tnames] setl[ocal] sign sl[eep] smenu sno[magic] so[urce] spellr[epall] spr[evious] star[tinsert] stopi[nsert] sunmenu t tabe[dit] tabm[ove] tabo[nly] ta[g] tclf[ile] tj[ump] tn[ext] tr[ewind] tu[nmenu] undol[ist] up[date] vie[w] vmapc[lear] wh[ile] win[size] wq wundo x[it] XMLent xunme
-syn keyword vimCommand contained	al[l] argg[lobal] bad[d] bl[ast] bp[revious] br[ewind] bun[load] caddf[ile] ccl[ose] cfir[st] changes cl[ist] cN[ext] comc[lear] co[py] cuna[bbrev] delf[unction] diffpu[t] di[splay] dsp[lit] e[dit] endfo[r] ene[w] files fini[sh] foldc[lose] for grepa[dd] iabc[lear] imapc[lear] j[oin] keepj[umps] laddf[ile] lb[uffer] le[ft] lfir[st] lgr[ep] lla[st] lnew[er] lNf[ile] lol[der] lr[ewind] luado lw[indow] mat[ch] mksp[ell] m[ove] nb[key] N[ext] ol[dfiles] opt[ions] perld[o] pp[op] P[rint] promptr[epl] ptj[ump] ptp[revious] pw[d] q[uit] redi[r] reg[isters] rew[ind] rubyd[o] rv[iminfo] sav[eas] sbm[odified] sbr[ewind] se[t] sf[ind] sil[ent] sm[agic] sn[ext] snoreme spelld[ump] spellu[ndo] sre[wind] startr[eplace] sts[elect] sus[pend] tab tabf[ind] tabnew tabp[revious] tags te[aroff] tl[ast] tN[ext] try una[bbreviate] unh[ide] verb[ose] vim[grep] vne[w] winc[md] wn[ext] wqa[ll] wv[iminfo] xmapc[lear] XMLns xunmenu
-syn keyword vimCommand contained	arga[dd] argl[ocal] ba[ll] bm[odified] brea[k] bro[wse] bw[ipeout] cal[l] cd cgetb[uffer] chd[ir] clo[se] cnf[ile] comp[iler] cpf[ile] cw[indow] delm[arks] diffsplit dj[ump] earlier el[se] endf[unction] ex filetype fir[st] folddoc[losed] fu[nction] ha[rdcopy] if is[earch] ju[mps] kee[pmarks] lan[guage] lc[d] lefta[bove] lgetb[uffer] lgrepa[dd] lli[st] lne[xt] lo[adview] lop[en] ls luafile mak[e] menut[ranslate] mkvie[w] mzf[ile] nbs[tart] nmapc[lear] omapc[lear] pc[lose] po[p] pre[serve] profd[el] ps[earch] ptl[ast] ptr[ewind] pyf[ile] quita[ll] red[o] res[ize] ri[ght] rubyf[ile] sal[l] sba[ll] sbn[ext] sb[uffer] setf[iletype] sfir[st] sim[alt] sm[ap] sN[ext] snoremenu spe[llgood] spellw[rong] sta[g] stj[ump] sun[hide] sv[iew] tabc[lose] tabfir[st] tabn[ext] tabr[ewind] tc[l] tf[irst] tm to[pleft] ts[elect] u[ndo] unlo[ckvar] ve[rsion] vimgrepa[dd] vs[plit] windo wN[ext] w[rite] X xme xnoreme y[ank]
-syn keyword vimCommand contained	argd[elete] ar[gs] bd[elete] bn[ext] breaka[dd] bufdo cabc[lear] cat[ch] ce[nter] cgete[xpr] che[ckpath] cmapc[lear] cNf[ile] conf[irm] cp[revious] debugg[reedy] diffg[et] diffthis dl[ist] echoe[rr] elsei[f] en[dif] 
-syn match   vimCommand contained	"\<z[-+^.=]"
+syn keyword vimCommand contained	a arga[dd] argu[ment] bd[elete] bN[ext] breakd[el] buf c cal[l] ce[nter] cg[etfile] cl cn cNf comc[lear] cope[n] cr[ewind] d d[elete] diffo diffsplit di[splay] ds[earch] ec e:e:e en endt[ry] exu[sage] filetype fix[del] for go[to] h hi if intro k la lan[guage] lch[dir] let@ lg[etfile] lla[st] lnew[er] lNf[ile] loc[kmarks] lr[ewind] lv[imgrep] ma[rk] messages mkv mv n new noautocmd on[ly] p:~ perld[o] popu[p] p[rint] promptr[epl] ptl[ast] ptr[ewind] py3file q[uit] r[ead] redraws[tatus] ret[ab] r:r:r ru[ntime] sba[ll] sbp[revious] scs sf[ind] sil[ent] sm[ap] sno[magic] so[urce] spellr[epall] st startr[eplace] sunme sw[apname] t tabf[ind] tabn[ext] ta[g] tf[irst] tn tp[revious] tu undoj[oin] up[date] vi vmapc[lear] win wN[ext] wundo xmapc[lear] xnoremenu
+syn keyword vimCommand contained	ab argd[elete] as[cii] bel[owright] bo[tright] breakl[ist] bufdo cabc[lear] cat[ch] cex[pr] c[hange] cla[st] cN cnf[ile] comment co[py] cs de delf diffoff difft dj[ump] dsp[lit] echoe[rr] e:e:r endf endw[hile] f fin fo[ld] fu gr[ep] ha[rdcopy] hid[e] ij[ump] is[earch] keepa lad la[st] lcl[ose] lex[pr] lgr[ep] lli[st] lne[xt] lo lockv[ar] ls lvimgrepa[dd] marks mk mkvie[w] Mycmd N n[ext] noh[lsearch] o[pen] P p:gs? pp[op] P[rint] ps[earch] ptn pts[elect] pyf[ile] quita[ll] rec[over] reg[isters] retu[rn] ru rv[iminfo] sbf[irst] sbr[ewind] scscope sfir[st] sim[alt] sme snoreme s?pat?sub? spellu[ndo] sta[g] stj[ump] sunmenu sy ta tabfir[st] tabN[ext] tags th[row] tN tr tu[nmenu] undol[ist] v vie[w] vne[w] winc[md] wp[revious] wv[iminfo] xme xterm
+syn keyword vimCommand contained	abc[lear] argdo au bf[irst] bp[revious] br[ewind] b[uffer] cad cb[uffer] cf[ile] changes cl[ist] cnew[er] cNf[ile] comp[iler] count cscope debug delf[unction] DiffOrig diffthis dl[ist] dwim echom[sg] el[se] endfo[r] ene[w] f[ile] fina[lly] foldc[lose] fun grepa[dd] h[elp] his[tory] il[ist] isp[lit] keepalt laddb[uffer] lat lcs lf[ile] lgrepa[dd] lmak[e] lN[ext] loadk lol[der] lt[ag] lw[indow] mat[ch] mkdir mkv[imrc] MyCommand nbc[lose] N[ext] nu[mber] opt[ions] pc[lose] p:h pr pro p:t ptN pu[t] py[thon] quote red Ren rew[ind] rub[y] sal[l] sbl[ast] sb[uffer] se[t] sh[ell] sl smenu snoremenu spe spellw[rong] star st[op] sus[pend] syn tab tabl[ast] tabo[nly] tc[l] tj[ump] tn[ext] t:r u unh[ide] ve vim[grep] vs[plit] windo wq x xmenu xunme
+syn keyword vimCommand contained	abo[veleft] arge[dit] bad[d] bl[ast] br bro[wse] buffers caddb[uffer] cc cfir[st] chd[ir] clo[se] cn[ext] col[der] con cpf[ile] cstag debugg[reedy] delm[arks] diffp diffu[pdate] do e echon elsei[f] endfun Error filename fin[d] folddoc[losed] fu[nction] gs?pat?sub? helpf[ind] i imapc[lear] iuna[bbrev] keepj[umps] lad[dexpr] later lcscope lfir[st] lh[elpgrep] lmapc[lear] lnf loadkeymap lop[en] lua ma menut mk[exrc] mo mz nb[key] nkf o ownsyntax pe p:h:h p:r profd[el] pta[g] ptn[ext] pw[d] python3 r redi[r] Rena ri[ght] rubyd[o] san[dbox] sbm[odified] scrip setf[iletype] si sla[st] sn[ext] s@\n@\=\r" spelld[ump] sp[lit] start stopi[nsert] s?version?main? sync tabc[lose] tabm[ove] tabp[revious] tcld[o] tl[ast] tN[ext] tr[ewind] un unl verb[ose] vimgrepa[dd] w winp[os] wqa[ll] X XMLent xunmenu
+syn keyword vimCommand contained	al[l] argg[lobal] ba[ll] bm[odified] brea[k] browseset bun[load] cad[dexpr] ccl[ose] cgetb[uffer] che[ckpath] cmapc[lear] cN[ext] colo[rscheme] conf[irm] cp[revious] cuna[bbrev] del di diffpatch dig doau ea e[dit] em[enu] endf[unction] ex files fini[sh] foldd[oopen] g gui helpg[rep] ia in j[oin] kee[pmarks] laddf[ile] lb[uffer] le[ft] lgetb[uffer] l[ist] lN lNf lo[adview] lpf[ile] luado mak[e] menut[ranslate] mks[ession] mod[e] mzf[ile] nbs[tart] nmapc[lear] ol[dfiles] p ped[it] po[p] pre[serve] prof[ile] ptf[irst] ptN[ext] py q re red[o] Renu rightb[elow] rubyf[ile] sa[rgument] sbn[ext] scripte[ncoding] setg[lobal] sig sl[eep] sN[ext] so spe[llgood] spr[evious] startg[replace] sts[elect] s?version?main?:p syncbind tabd[o] tabN tabr[ewind] tclf[ile] tm TOhtml try una[bbreviate] unlo[ckvar] ve[rsion] vi[sual] wa[ll] win[size] w[rite] xa[ll] XMLns xwininfo
+syn keyword vimCommand contained	Allargs argl[ocal] bar bn[ext] breaka[dd] bu bw[ipeout] caddf[ile] cd cgete[xpr] checkt[ime] cmdname cnf com con[tinue] cq[uit] cw[indow] delc[ommand] diffg[et] diffpu[t] dig[raphs] dr[op] earlier e:e emenu* en[dif] exi[t] filet fir[st] foldo[pen] get gvim helpt[ags] iabc[lear] index ju[mps] l lan lc[d] lefta[bove] lgete[xpr] ll lne lnf[ile] locale lp[revious] luafile Man mes mksp[ell] m[ove] mz[scheme] ne noa omapc[lear] p: pe[rl] popu prev[ious] promptf[ind] ptj[ump] ptp[revious] py3 qa[ll] r:e redr[aw] res[ize] r:r rundo sav[eas] sbN[ext] scrip[tnames] setl[ocal] sign sm[agic] sni[ff] sor[t] spelli[nfo] sre[wind] star[tinsert] sun[hide] sv[iew] synlist tabe[dit] tabnew tabs te[aroff] tm[enu] to[pleft] ts[elect] u[ndo] uns[ilent] vert[ical] viu[sage] wh[ile] wn[ext] ws[verb] x[it] xnoreme y[ank]
+syn keyword vimCommand contained	ar ar[gs] 
+syn match   vimCommand contained	"\<z[-+^.=]\="
 
 " vimOptions are caught only when contained in a vimSet {{{2
 syn keyword vimOption contained	acd ambiwidth arabicshape autowriteall backupdir bdlay binary breakat bufhidden cd ci cinw co commentstring confirm cpoptions cscopetag csto cwh dg dip eadirection ek equalprg ex fdi fen fileencodings flp foldexpr foldnestmax fp gfm grepformat guifontwide helpheight highlight hlg im imi incsearch infercase isk keymap langmenu linespace loadplugins macatsui maxcombine mef mls modelines mousehide mp nu omnifunc paragraphs penc pm printdevice printoptions quoteescape restorescreen rnu rulerformat scr sect sft shellredir shm showmode sj smd spell splitbelow ssl stl sw sxq tabpagemax tags tbis terse thesaurus titleold toolbariconsize tsr ttyfast tx undofile ut verbosefile virtualedit wb wfw wildcharm winaltkeys winminwidth wmnu write
@@ -318,7 +320,7 @@ syn case match
 " ====
 syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
 syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	vimMap		mapc[lear]
+syn keyword	vimMap		mapc[lear] smapc[lear]
 syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
 syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
 syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
@@ -552,7 +554,7 @@ let s:luapath= expand("<sfile>:p:h")."/lua.vim"
 if !filereadable(s:luapath)
  let s:luapath= globpath(&rtp,"syntax/lua.vim")
 endif
-if (g:vimsyn_embed =~ 'p' && has("lua")) && filereadable(s:luapath)
+if (g:vimsyn_embed =~ 'l' && has("lua")) && filereadable(s:luapath)
  unlet! b:current_syntax
  exe "syn include @vimLuaScript ".s:luapath
  if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'l'
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
index c3916d0e5..4e74eabd8 100644
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -1,12 +1,22 @@
 " Vim syntax file
 " Language:	Yacc
 " Maintainer:	Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Aug 2, 2010
-" Version:	8
+" Last Change:	Aug 12, 2010
+" Version:	9
 " URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
 "
 " Options: {{{1
 "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
+"
+" Overall layout of a bison/yacc grammer:
+"   %{
+"    Prolog
+"   %}
+"   Bison/Yacc Declarations
+"   %%
+"   Grammar Rules
+"   %%
+"   Epilogue
 
 " ---------------------------------------------------------------------
 " this version of syntax/yacc.vim requires 6.0 or later
@@ -35,7 +45,7 @@ endif
 
 " ---------------------------------------------------------------------
 "  Yacc Clusters: {{{1
-syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam
+syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam,yaccParseOption
 syn cluster yaccRulesCluster	contains=yaccNonterminal,yaccString
 
 " ---------------------------------------------------------------------
@@ -50,7 +60,8 @@ HiFold syn	region	yaccEndCode	matchgroup=yaccSectionSep	start='^%%$'		end='\%$'
 " ---------------------------------------------------------------------
 " Yacc Commands: {{{1
 syn	match	yaccDefines	'^%define\s\+.*$'
-syn	match	yaccParseParam	'%parse-param\>'	skipwhite	nextgroup=yaccParseParamStr
+syn	match	yaccParseParam	'%\(parse\|lex\)-param\>'		skipwhite	nextgroup=yaccParseParamStr
+syn	match	yaccParseOption '%\%(api\.pure\|pure-parser\|locations\|error-verbose\)\>'
 syn	region	yaccParseParamStr	contained matchgroup=Delimiter	start='{'	end='}'	contains=cStructure
 
 syn	match	yaccDelim	"[:|]"	contained
@@ -96,7 +107,8 @@ if !exists("did_yacc_syn_inits")
   HiLink yaccCurly	Delimiter
   HiLink yaccCurlyError	Error
   HiLink yaccDefines	cDefine
-  HiLink yaccParseParam	cDefine
+  HiLink yaccParseParam	yaccParseOption
+  HiLink yaccParseOption	cDefine
   HiLink yaccNonterminal	Function
   HiLink yaccDelim	Delimiter
   HiLink yaccKeyActn	Special
diff --git a/src/po/ko.UTF-8.po b/src/po/ko.UTF-8.po
index 36a9ee197..3a3e1005c 100644
--- a/src/po/ko.UTF-8.po
+++ b/src/po/ko.UTF-8.po
@@ -232,7 +232,7 @@ msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: 불러들인 파일에서 :loadkeymap을 사용하지 않았습니다"
 
 msgid "E791: Empty keymap entry"
-msgstr "E791: 키맵 엔트리가 비어있슴"
+msgstr "E791: 키맵 엔트리가 비어있음"
 
 msgid " Keyword completion (^N^P)"
 msgstr " 낱말 완성 (^N^P)"
@@ -367,7 +367,7 @@ msgstr "E118: 함수에 너무 많은 인자 넘김: %s"
 
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary에 키가 없슴: %s"
+msgstr "E716: Dictionary에 키가 없음: %s"
 
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
@@ -585,7 +585,7 @@ msgid "E727: Start past end"
 msgstr "E727: 시작위치가 끝을 지나침"
 
 msgid "<empty>"
-msgstr "<비어있슴>"
+msgstr "<비어있음>"
 
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim 서버에 연결되어 있지 않습니다"
@@ -855,7 +855,7 @@ msgstr "스왑 파일 \"%s\"가 있습니다, 덮어쓸까요?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: 스왑 파일 있슴: %s (덮어쓰려면 :silent! 사용)"
+msgstr "E768: 스왑 파일 있음: %s (덮어쓰려면 :silent! 사용)"
 
 #, c-format
 msgid "E141: No file name for buffer %ld"
@@ -1096,7 +1096,7 @@ msgstr "빔 스크립트 로드"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "디렉토리는 source할 수 없슴: \"%s\""
+msgstr "디렉토리는 source할 수 없음: \"%s\""
 
 #, c-format
 msgid "could not source \"%s\""
@@ -2833,7 +2833,7 @@ msgid "This Vim was not compiled with the diff feature."
 msgstr "이 빔은 diff 기능 없이 컴파일 되었습니다."
 
 msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "'-nb'는 사용할 수 없슴: 컴파일할 때 포함되지 않음\n"
+msgstr "'-nb'는 사용할 수 없음: 컴파일할 때 포함되지 않음\n"
 
 msgid "Attempt to open script file again: \""
 msgstr "스크립트 파일을 다시 열려고 시도: \""
@@ -5149,7 +5149,7 @@ msgstr "E752: 철자가 바뀐적이 없습니다"
 
 #, c-format
 msgid "E753: Not found: %s"
-msgstr "E753: 찾을 수 없슴: %s"
+msgstr "E753: 찾을 수 없음: %s"
 
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
@@ -5902,7 +5902,7 @@ msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmd 창을 닫을 수 없습니다"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: 창을 닫을 수 없슴, autocmd 창만 남음"
+msgstr "E814: 창을 닫을 수 없음, autocmd 창만 남음"
 
 msgid "E445: Other window contains changes"
 msgstr "E445: 다른 창이 바뀌었습니다"
@@ -6177,7 +6177,7 @@ msgid "E42: No Errors"
 msgstr "E42: 에러 없음"
 
 msgid "E776: No location list"
-msgstr "E776: 위치 목록 없슴"
+msgstr "E776: 위치 목록 없음"
 
 msgid "E43: Damaged match string"
 msgstr "E43: 깨진 맞는 문자열"
@@ -6194,7 +6194,7 @@ msgstr "E46: 읽기 전용 변수 \"%s\"을(를) 바꿀 수 없습니다"
 
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: sandbox 안에서는 변수를 설정할 수 없슴: \"%s\""
+msgstr "E794: sandbox 안에서는 변수를 설정할 수 없음: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: 에러파일 읽는 도중에 에러"
diff --git a/src/po/ko.po b/src/po/ko.po
index 6a99bb164..ed6d42bba 100644
--- a/src/po/ko.po
+++ b/src/po/ko.po
@@ -232,7 +232,7 @@ msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: �ҷ����� ���Ͽ��� :loadkeymap�� ������� �ʾҽ��ϴ�"
 
 msgid "E791: Empty keymap entry"
-msgstr "E791: Ű�� ��Ʈ���� ����ֽ�"
+msgstr "E791: Ű�� ��Ʈ���� �������"
 
 msgid " Keyword completion (^N^P)"
 msgstr " ���� �ϼ� (^N^P)"
@@ -367,7 +367,7 @@ msgstr "E118: �Լ��� �ʹ� ���� ���� �ѱ�: %s"
 
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary�� �� ����: %s"
+msgstr "E716: Dictionary�� �� ����: %s"
 
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
@@ -585,7 +585,7 @@ msgid "E727: Start past end"
 msgstr "E727: ������ġ�� ���� ����ħ"
 
 msgid "<empty>"
-msgstr "<����ֽ�>"
+msgstr "<�������>"
 
 msgid "E240: No connection to Vim server"
 msgstr "E240: Vim ������ ����Ǿ� ���� �ʽ��ϴ�"
@@ -855,7 +855,7 @@ msgstr "���� ���� \"%s\"�� �ֽ��ϴ�, ������?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ���� ���� �ֽ�: %s (������� :silent! ���)"
+msgstr "E768: ���� ���� ����: %s (������� :silent! ���)"
 
 #, c-format
 msgid "E141: No file name for buffer %ld"
@@ -1096,7 +1096,7 @@ msgstr "�� ��ũ��Ʈ �ε�"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "���丮�� source�� �� ����: \"%s\""
+msgstr "���丮�� source�� �� ����: \"%s\""
 
 #, c-format
 msgid "could not source \"%s\""
@@ -2833,7 +2833,7 @@ msgid "This Vim was not compiled with the diff feature."
 msgstr "�� ���� diff ��� ���� ������ �Ǿ����ϴ�."
 
 msgid "'-nb' cannot be used: not enabled at compile time\n"
-msgstr "'-nb'�� ����� �� ����: �������� �� ���Ե��� ����\n"
+msgstr "'-nb'�� ����� �� ����: �������� �� ���Ե��� ����\n"
 
 msgid "Attempt to open script file again: \""
 msgstr "��ũ��Ʈ ������ �ٽ� ������ �õ�: \""
@@ -5149,7 +5149,7 @@ msgstr "E752: ö�ڰ� �ٲ����� �����ϴ�"
 
 #, c-format
 msgid "E753: Not found: %s"
-msgstr "E753: � �� ����: %s"
+msgstr "E753: � �� ����: %s"
 
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
@@ -5902,7 +5902,7 @@ msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmd â�� ���� �� �����ϴ�"
 
 msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: � ���� �� ����, autocmd � ����"
+msgstr "E814: � ���� �� ����, autocmd � ����"
 
 msgid "E445: Other window contains changes"
 msgstr "E445: �ٸ� â�� �ٲ�����ϴ�"
@@ -6177,7 +6177,7 @@ msgid "E42: No Errors"
 msgstr "E42: ���� ����"
 
 msgid "E776: No location list"
-msgstr "E776: ��ġ ��� ����"
+msgstr "E776: ��ġ ��� ����"
 
 msgid "E43: Damaged match string"
 msgstr "E43: ���� �´� ���ڿ�"
@@ -6194,7 +6194,7 @@ msgstr "E46: �б� ���� ���� \"%s\"��(��) �ٲ� �� �����ϴ�"
 
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: sandbox �ȿ����� ������ ������ �� ����: \"%s\""
+msgstr "E794: sandbox �ȿ����� ������ ������ �� ����: \"%s\""
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: �������� �д� ���߿� ����"