Update runtime files.

18 files changed, 953 insertions, 882 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 650688bc4b..5085f21ae8 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4.  Last change: 2013 Aug 24
+*eval.txt*	For Vim version 7.4.  Last change: 2013 Nov 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index ae74a41d9f..d1d39742da 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2013 Oct 05
+*todo.txt*      For Vim version 7.4.  Last change: 2013 Nov 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,16 +34,16 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Problem positioning the cursor after auto-formatting without a comment. (Tor
-Perkins, 2013 Sep 1)
+Revert patch 7.4.056?  Do it differently?
 
 Using \1 in pattern goes one line too far. (Bohr Shaw, 2013 Sep 5)
 Column is OK.  "/\v(^.+\n)\1/e" (John Little, Sep 5)
 Also, matches start of 2nd line, not the whole line.
 
-Error for incomplete help argument. (John Beckett, 2013 Sep 12)
+NFA regexp doesn't handle backreference correctly. (Ryuichi Hayashida, 2013
+Oct 10)
 
-Popup menu: first item is not selected when typing more than one character?
+Error for incomplete help argument. (John Beckett, 2013 Sep 12)
 
 Should win_redr_custom() not be allowed to use recursively?
 (Yasuhiro Matsumoto, 2013 Aug 15)
@@ -58,6 +58,16 @@ Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
 Issue 164: freeze on regexp search.
 
+Patch to Fix Python: DictionaryContains return -1 on error. (ZyX, 2013 Nov 1)
+
+Patch to fix that inserting CR when replacing a Visual block doesn't cause a
+line break. (Christian Brabandt, 2013 Oct 19)
+Check: does CTRL-V CR insert a literal CR?  New patch Oct 21
+With test Oct 22.
+
+When recording the character typed at the hit-enter prompt is recorded twice.
+(Urtica Dioica)  Patch by Christian Brabandt, 2013 Oct 8.
+
 Update for Clojure ftplugin. (Sung Pae).  Await discussion about formatting in
 ftplugins.
 
@@ -66,9 +76,29 @@ Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 Patch to avoid problem with colon in file name. (Yasuhiro Matsumoto, 2013 Sep
 5) Only copy file name when needed: Sep 9.
 
+After inserting comment leader, CTRL-\ CTRL-O does move the cursor.
+(Wiktor Ruben, 2013 Oct 7)
+Patch by Christian Brabandt.
+
+Patch to support slices in Python vim.List. (ZyX, 2013 Oct 20)
+
+Patch to support iterator on Python vim.options. (ZyX, 2013 Nov 2)
+
+Patch to avoid "-no-cpp-precomp" on Mac. (Misty De Meo, demeo, 2013 Oct 19)
+
+Patch to make Dictionary.update() work without arguments.
+(ZyX, 2013 Oct 19)
+
 Patch to make #N in 'cino' stop not indenting #lines. (Christian Brabandt,
 2013 Sep 25)
 
+Patch for Cobol ftplugin. (ZyX, 2013 Oct 20)
+Await response from maintainer.
+
+Can 'undolevels' be a buffer-local option?  Helps for making big changes in
+one file only, set 'ul' to -1 only for that buffer.
+Patch by Christian Brabandt, 2010 Dec 17.  Needs test.
+
 Include systemverilog file?  Two votes yes.
 
 Wrapping around end of file does not work for "." after "cgn".  (Dimitar
@@ -79,6 +109,11 @@ Clang error for integer overflow. (Dominique Pelle, 2013 Sep 21)
 
 Patch to add v:hlsearch. (ZyX, 2013 Sep 22)
 
+Patch to fix E315 error. (Lech Lorens, 2013 Oct 26)
+
+Patch to add :keeppatterns, don't put used search patterns in history.
+(Christian Brabandt, 2013 Oct 18)
+
 Problem with 'spellsuggest' file, only works for some words.
 (Cesar Romani, 2013 Aug 20)  Depends on file name? (Aug 24)
 Additional remark by glts: the suggested words are marked bad?
@@ -87,6 +122,11 @@ Syntax highlighting slow (hangs) in SASS file. (Niek Bosch, 2013 Aug 21)
 
 Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
+Issue 174: Detect Mason files.
+
+Patch for Python: Fix interrupt not being properly discarded in VimTryEnd.
+With tests.  (ZyX, 2013 Oct 19)  Reported by Yggdroot Chen.
+
 Patch to make has() check for Vim version and patch at the same time.
 (Marc Weber, 2013 Jun 7)
 
@@ -96,9 +136,28 @@ Sep 28)  With test Sept 29.
 VMS: Select() doesn't work properly, typing ESC may hang Vim.  Use sys$qiow
 instead. (Samuel Ferencik, 2013 Sep 28)
 
+Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3)
+
+Perl: support for Activestate perl 5.18: Issue 170.
+
+Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep
+29)
+Patch to fix expr7() when skipping. (2013 Oct 15) Oct 23 with test.
+
 Several syntax file match "^\s*" which may get underlined if that's in the
 highlight group.  Add a "\zs" after it?
 
+-   Have an option for spell checking to not mark any Chinese, Japanese or
+    other double-width characters (or CJK characters) as error.
+    Helps a lot for mixed Asian and latin text.
+    More general: Have some way not to give spelling errors for a range of
+    characters.
+Patch to add "cjk" to 'spelllang'. (Ken Takata, 2013 Oct 8, second one)
+
+Patch to add mch_copy_sec() to vim_rename().
+bug report on redhat.  (Peter Backes, 2013 oct 8)
+Patch to vim-dev, 2013 Oct 9.
+
 Win32: When a directory name contains an exclamation mark, completion doesn't
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5; 2013 Aug 20)
@@ -106,8 +165,9 @@ Patch 2013 Sept 10, test: Sept 11.
 
 Go through more coverity reports.
 
-Bug: Does not skip over expression with dict member properly. (ZyX, 2013 Sep
-29)
+Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
+
+Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
 
 Patch to make ColorScheme autocommand match with the colorscheme name instead
 of the buffer name. (Christian Brabandt, 2013 Sep 25)
@@ -123,6 +183,12 @@ Patch by Christian Brabandt (2013 Aug 12)
 Several Win32 functions are not using Unicode.
 Patches to fix this. (Ken Takata, 2013 Aug 9)
 
+Patch to add item in 'listchars' to repeat first character. (Nathaniel Braun,
+pragm, 2013 Oct 13)
+
+Undo message is not always properly displayed.  Patch by Ken Takata, 2013 oct
+3.  Doesn't work properly according to Yukihiro Nakadaira.
+
 /[b-a] gives error E16, should probably be E769.
 
 :help gives example for z?, but it does not work.  m? and t? do work.
@@ -210,10 +276,6 @@ Second one. Update May 22.
 
 Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
 
-TCL: With MSVC 2010 doesn't find Tcl_FindExecutable. (tux)
-Patch to define it. (Ken Takata, 2013 Aug 12)  Is this right?
-Probably not: http://code.google.com/p/vim/issues/detail?id=167
-
 MS-Windows: Patch to make tests copy files to avoid changing the fileformat of
 the files under version control. (Taro Muraoka, 2013 Jul 5)
 
@@ -345,10 +407,6 @@ But use "gi" instead of "a".  Or use CTRL-\ CTRL-O.
 Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
 Aug 16)
 
-Have an option for spell checking to not mark any Chinese, Japanese or other
-double-width characters as error.  Or perhaps all characters above 256.
-(Bill Sun)  Helps a lot for mixed Asian and latin text.
-
 When there are no command line arguments ":next" and ":argu" give E163, which
 is confusing.  Should say "the argument list is empty".
 
@@ -729,10 +787,6 @@ Requires a map mode for Insert mode started from blockwise Visual mode.
 Writing nested List and Dict in viminfo gives error message and can't be read
 back. (Yukihiro Nakadaira, 2010 Nov 13)
 
-Can 'undolevels' be a buffer-local option?  Helps for making big changes in
-one file only, set 'ul' to -1 only for that buffer.
-Patch by Christian Brabandt, 2010 Dec 17.  Needs test.
-
 Problem with cursor in the wrong column. (SungHyun Nam, 2010 Mar 11)
 Additional info by Dominique Pelle. (also on 2010 Apr 10)
 
@@ -1027,7 +1081,7 @@ probably causes this.
 2009 Jan 16)
 
 Patch to support strikethrough next to bold and italic. (Christian Brabandt,
-2013 Jul 30)
+2013 Jul 30)  Update from Ken Takata, 2013 Oct 12.
 
 Document that default font in Athena can be set with resources:
    XtDefaultFont: "9x15"
@@ -2830,10 +2884,6 @@ Tab pages:
 
 
 Spell checking:
--   have some way not to give spelling errors for a range of characters.
-    E.g. for Chinese and other languages with specific characters for which we
-    don't have a spell file.  Useful when there is also text in other
-    languages in the file.
 -   Support more regions? Caolan McNamara argues it's needed for es_XX.
     https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219777    
 -   Unicode defines another quote character: 0x2019.  Use it as an equivalent
@@ -4947,6 +4997,7 @@ Various improvements:
 6   Add ":timer" command, to set a command to be executed at a certain
     interval, or once after some time has elapsed. (Aaron)
     Perhaps an autocommand event like CursorHold is better?
+    Patch to add async functionality. (Geoff Greer, 2013 Sep 1 and later)
 8   Add ":confirm" handling in open_exfile(), for when file already exists.
 8   When quitting with changed files, make the dialog list the changed file
     and allow "write all", "discard all", "write some".  The last one would
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index cabf5f7e95..969317c2b3 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.4.  Last change: 2012 Aug 15
+*visual.txt*    For Vim version 7.4.  Last change: 2013 Nov 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -75,7 +75,11 @@ position.
 
 						*V* *linewise-visual*
 [count]V		Start Visual mode linewise.
-			With [count] select that many lines.
+			With [count] select the same number of lines as used
+			for the last Visual operation, but at the current
+			cursor position, multiplied by [count].  When there
+			was no previous Visual operation [count] lines are
+			selected.
 
 						*CTRL-V* *blockwise-visual*
 [count]CTRL-V		Start Visual mode blockwise.  Note: Under Windows
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 26629bdb73..f5ece17287 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:	2013 Sep 22
+" Last Change:	2013 Oct 06
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -2061,14 +2061,15 @@ au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
 " SVG (Scalable Vector Graphics)
 au BufNewFile,BufRead *.svg			setf svg
 
-" If the file has an extension of 't' and is in a directory 't' then it is
-" almost certainly a Perl test file.
+" If the file has an extension of 't' and is in a directory 't' or 'xt' then
+" it is almost certainly a Perl test file.
 " If the first line starts with '#' and contains 'perl' it's probably a Perl
 " file.
 " (Slow test) If a file contains a 'use' statement then it is almost certainly
 " a Perl file.
 func! s:FTperl()
-  if expand("%:e") == 't' && expand("%:p:h:t") == 't'
+  let dirname = expand("%:p:h:t")
+  if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
     setf perl
     return 1
   endif
diff --git a/runtime/ftplugin/j.vim b/runtime/ftplugin/j.vim
index 8e3bc67edc..4680e7e35c 100644
--- a/runtime/ftplugin/j.vim
+++ b/runtime/ftplugin/j.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	J
 " Maintainer:	David Bürgin <676c7473@gmail.com>
-" Last Change:	2013-09-21
+" Last Change:	2013-10-06
 
 if exists("b:did_ftplugin")
   finish
@@ -11,7 +11,8 @@ let b:did_ftplugin = 1
 setlocal iskeyword=48-57,65-90,_,97-122
 setlocal comments=:NB.
 setlocal commentstring=NB.\ %s
-setlocal formatoptions-=t formatoptions+=croql
+setlocal formatoptions-=t
 setlocal shiftwidth=2 softtabstop=2 expandtab
+setlocal matchpairs=(:)
 
-let b:undo_ftplugin = "setl et< sts< sw< fo< cms< com< isk<"
+let b:undo_ftplugin = "setl mps< et< sts< sw< fo< cms< com< isk<"
diff --git a/runtime/ftplugin/lisp.vim b/runtime/ftplugin/lisp.vim
index 8bf6ae411c..130f30b146 100644
--- a/runtime/ftplugin/lisp.vim
+++ b/runtime/ftplugin/lisp.vim
@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Feb 12, 2013
+" Last Change:   Oct 23, 2013
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -21,9 +21,6 @@ setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
 setl lisp
 setl commentstring=;%s
 
-" make comments behaviour like in c.vim
-" e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
 setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
-setl formatoptions+=croql
 
 let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
diff --git a/runtime/ftplugin/scheme.vim b/runtime/ftplugin/scheme.vim
index 7f3f63720d..ab1543a5ee 100644
--- a/runtime/ftplugin/scheme.vim
+++ b/runtime/ftplugin/scheme.vim
@@ -4,7 +4,7 @@
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Feb 12, 2013
+" Last Change:   Oct 23, 2013
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -22,10 +22,7 @@ setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
 setl lisp
 setl commentstring=;%s
 
-" make comments behaviour like in c.vim
-" e.g. insertion of ;;; and ;; on normal "O" or "o" when staying in comment
 setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
-setl formatoptions+=croql
 
 " Scheme-specific settings
 if exists("b:is_mzscheme") || exists("is_mzscheme")
diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim
index 11aa028b71..ea95aa209e 100644
--- a/runtime/syntax/clean.vim
+++ b/runtime/syntax/clean.vim
@@ -2,7 +2,7 @@
 " Language:		Clean
 " Author:		Pieter van Engelen <pietere@sci.kun.nl>
 " Co-Author:	Arthur van Leeuwen <arthurvl@sci.kun.nl>
-" Last Change:	2013 Jun 19 by Jurriën Stutterheim
+" Last Change:	2013 Oct 15 by Jurriën Stutterheim
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -31,11 +31,10 @@ syn keyword cleanIncludeKeyword contained from import as qualified
 
 " To do some Denotation Highlighting
 syn keyword cleanBoolDenot True False
-syn region  cleanStringDenot start=+"+ end=+"+
-syn match cleanCharDenot "'.'"
-syn match cleanCharsDenot "'[^'\\]*\(\\.[^'\\]\)*'" contained
-syn match cleanIntegerDenot "[+-~]\=\<\(\d\+\|0[0-7]\+\|0x[0-9A-Fa-f]\+\)\>"
-syn match cleanRealDenot "[+-~]\=\<\d\+\.\d+\(E[+-~]\=\d+\)\="
+syn region cleanStringDenot start=+"+ skip=+\(\(\\\\\)\+\|\\"\)+ end=+"+ display
+syn match cleanCharDenot "'\(\\\\\|\\'\|[^'\\]\)\+'" display
+syn match cleanIntegerDenot "[\~+-]\?\<\(\d\+\|0[0-7]\+\|0x[0-9A-Fa-f]\+\)\>" display
+syn match cleanRealDenot "[\~+-]\?\d\+\.\d\+\(E[\~+-]\?\d\+\)\?" display
 
 " To highlight the use of lists, tuples and arrays
 syn region cleanList start="\[" end="\]" contains=ALL
@@ -44,11 +43,13 @@ syn region cleanArray start="{:" end=":}" contains=ALL
 syn match cleanTuple "([^=]*,[^=]*)" contains=ALL
 
 " To do some Comment Highlighting
-syn region cleanComment start="/\*"  end="\*/" contains=cleanComment
-syn match cleanComment "//.*"
+syn region cleanComment start="/\*"  end="\*/" contains=cleanComment,cleanTodo fold
+syn region cleanComment start="//.*" end="$" display contains=cleanTodo
+syn keyword cleanTodo TODO FIXME XXX contained
+
+" Now for some useful type definition recognition
+syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(infix[lr]\=\)\=\s*\d\=\s*::.*->.*" contains=cleanSpecial,cleanBasicType,cleanSpecialType,cleanKeyword
 
-" Now for some useful typedefinitionrecognition
-syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)[ \t]*\(infix[lr]\=\)\=[ \t]*\d\=[ \t]*::.*->.*" contains=cleanSpecial
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -64,7 +65,6 @@ if version >= 508 || !exists("did_clean_syntax_init")
    " Comments
    HiLink cleanComment      Comment
    " Constants and denotations
-   HiLink cleanCharsDenot   String
    HiLink cleanStringDenot  String
    HiLink cleanCharDenot    Character
    HiLink cleanIntegerDenot Number
@@ -91,6 +91,7 @@ if version >= 508 || !exists("did_clean_syntax_init")
    HiLink cleanTuple		Special
    " Error
    " Todo
+   HiLink cleanTodo         Todo
 
   delcommand HiLink
 endif
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 484e2cca65..aa5be3f6fe 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -2,7 +2,7 @@
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2013 Jul 24
+" Last Change:	2013 Oct 06
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -336,7 +336,7 @@ syn match diffLine	"^---$"
 "Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
 syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
 
-syn match diffFile	"^diff.*"
+syn match diffFile	"^diff\>.*"
 syn match diffFile	"^+++ .*"
 syn match diffFile	"^Index: .*"
 syn match diffFile	"^==== .*"
diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim
index ebee808a57..7ef767d398 100644
--- a/runtime/syntax/dnsmasq.vim
+++ b/runtime/syntax/dnsmasq.vim
@@ -1,26 +1,19 @@
 " Vim syntax file
 " Maintainer:	Thilo Six
-" Contact:	<vim-dev at vim dot org>
-"		http://www.vim.org/maillist.php#vim-dev
-"
+" Contact:	vim-foo@xk2c-foo.de
+"		:3s+-foo++g
 " Description:	highlight dnsmasq configuration files
 " File:		runtime/syntax/dnsmasq.vim
-" Version:	2.61-1
-" Last Change:	2012 May 19
+" Version:	2.67
+" Last Change:	2013 Nov 03
 " Modeline:	vim: ts=8:sw=2:sts=2:
 "
-" Credits:	Igor N. Prischepoff
-"		Doug Kearns
-"		David Ne\v{c}as
-"		Christian Brabandt
-"
 " License:	VIM License
 "		Vim is Charityware, see ":help Uganda"
 "
 " Options:	You might want to add this to your vimrc:
 "
 "		if &background == "dark"
-"		  " dnsmasq.vim
 "		    let dnsmasq_backrgound_light = 0
 "		else
 "		    let dnsmasq_backrgound_light = 1
@@ -28,8 +21,7 @@
 "
 
 " For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
+if v:version < 600
     syntax clear
 elseif exists("b:current_syntax") || &compatible
     finish
@@ -39,11 +31,11 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 if !exists("b:dnsmasq_backrgound_light")
-	if exists("dnsmasq_backrgound_light")
-		let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
-	else
-		let b:dnsmasq_backrgound_light = 0
-	endif
+    if exists("dnsmasq_backrgound_light")
+	let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
+    else
+	let b:dnsmasq_backrgound_light = 0
+    endif
 endif
 
 
@@ -89,10 +81,13 @@ syn match DnsmasqKeywordSpecial    ",\<ignore\>"hs=s+1	  contains=DnsmasqSpecial
 syn match DnsmasqKeywordSpecial    "\<id\>:"me=e-1
 
 syn match DnsmasqKeyword    "^\s*add-mac\>"
+syn match DnsmasqKeyword    "^\s*add-subnet\>"
 syn match DnsmasqKeyword    "^\s*addn-hosts\>"
 syn match DnsmasqKeyword    "^\s*address\>"
 syn match DnsmasqKeyword    "^\s*alias\>"
 syn match DnsmasqKeyword    "^\s*all-servers\>"
+syn match DnsmasqKeyword    "^\s*auth-zone\>"
+syn match DnsmasqKeyword    "^\s*bind-dynamic\>"
 syn match DnsmasqKeyword    "^\s*bind-interfaces\>"
 syn match DnsmasqKeyword    "^\s*bogus-nxdomain\>"
 syn match DnsmasqKeyword    "^\s*bogus-priv\>"
@@ -128,6 +123,7 @@ syn match DnsmasqKeyword    "^\s*dhcp-option-force\>"
 syn match DnsmasqKeyword    "^\s*dhcp-optsfile\>"
 syn match DnsmasqKeyword    "^\s*dhcp-proxy\>"
 syn match DnsmasqKeyword    "^\s*dhcp-range\>"
+syn match DnsmasqKeyword    "^\s*dhcp-relay\>"
 syn match DnsmasqKeyword    "^\s*dhcp-remoteid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-script\>"
 syn match DnsmasqKeyword    "^\s*dhcp-scriptuser\>"
@@ -135,6 +131,7 @@ syn match DnsmasqKeyword    "^\s*dhcp-sequential-ip\>"
 syn match DnsmasqKeyword    "^\s*dhcp-subscrid\>"
 syn match DnsmasqKeyword    "^\s*dhcp-userclass\>"
 syn match DnsmasqKeyword    "^\s*dhcp-vendorclass\>"
+syn match DnsmasqKeyword    "^\s*dns-rr\>"
 syn match DnsmasqKeyword    "^\s*dns-forward-max\>"
 syn match DnsmasqKeyword    "^\s*domain\>"
 syn match DnsmasqKeyword    "^\s*domain-needed\>"
@@ -149,6 +146,7 @@ syn match DnsmasqKeyword    "^\s*group\>"
 syn match DnsmasqKeyword    "^\s*host-record\>"
 syn match DnsmasqKeyword    "^\s*interface\>"
 syn match DnsmasqKeyword    "^\s*interface-name\>"
+syn match DnsmasqKeyword    "^\s*ipset\>"
 syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
 syn match DnsmasqKeyword    "^\s*leasefile-ro\>"
 syn match DnsmasqKeyword    "^\s*listen-address\>"
@@ -161,6 +159,7 @@ syn match DnsmasqKeyword    "^\s*log-dhcp\>"
 syn match DnsmasqKeyword    "^\s*log-facility\>"
 syn match DnsmasqKeyword    "^\s*log-queries\>"
 syn match DnsmasqKeyword    "^\s*max-ttl\>"
+syn match DnsmasqKeyword    "^\s*max-cache-ttl\>"
 syn match DnsmasqKeyword    "^\s*min-port\>"
 syn match DnsmasqKeyword    "^\s*mx-host\>"
 syn match DnsmasqKeyword    "^\s*mx-target\>"
@@ -180,6 +179,10 @@ syn match DnsmasqKeyword    "^\s*ptr-record\>"
 syn match DnsmasqKeyword    "^\s*pxe-prompt\>"
 syn match DnsmasqKeyword    "^\s*pxe-service\>"
 syn match DnsmasqKeyword    "^\s*query-port\>"
+syn match DnsmasqKeyword    "^\s*quiet-ra\>"
+syn match DnsmasqKeyword    "^\s*quiet-dhcp\>"
+syn match DnsmasqKeyword    "^\s*quiet-dhcp6\>"
+syn match DnsmasqKeyword    "^\s*ra-param\>"
 syn match DnsmasqKeyword    "^\s*read-ethers\>"
 syn match DnsmasqKeyword    "^\s*rebind-domain-ok\>"
 syn match DnsmasqKeyword    "^\s*rebind-localhost-ok\>"
@@ -189,6 +192,7 @@ syn match DnsmasqKeyword    "^\s*server\>"
 syn match DnsmasqKeyword    "^\s*srv-host\>"
 syn match DnsmasqKeyword    "^\s*stop-dns-rebind\>"
 syn match DnsmasqKeyword    "^\s*strict-order\>"
+syn match DnsmasqKeyword    "^\s*synth-domain\>"
 syn match DnsmasqKeyword    "^\s*tag-if\>"
 syn match DnsmasqKeyword    "^\s*test\>"
 syn match DnsmasqKeyword    "^\s*tftp-max\>"
diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim
index d7663cf72a..cd4bd776b7 100644
--- a/runtime/syntax/dts.vim
+++ b/runtime/syntax/dts.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
 " Maintainer:	Daniel Mack <vim@zonque.org>
-" Last Change:	2013 Apr 05
+" Last Change:	2013 Oct 20
 
 if exists("b:current_syntax")
   finish
@@ -11,11 +11,12 @@ syntax region dtsComment        start="/\*"  end="\*/"
 syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
 syntax region dtsBinaryProperty start="\[" end="\]" 
 syntax match  dtsStringProperty "\".*\""
-syntax match  dtsKeyword        "/.*/"
+syntax match  dtsKeyword        "/.\{-1,\}/"
 syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
 syntax match  dtsNode           /[[:alpha:][:digit:]-_]\+\(@[0-9a-fA-F]\+\|\)[[:space:]]*{/he=e-1
 syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
 syntax region dtsCommentInner   start="/\*"  end="\*/"
+syntax match  dtsCommentLine    "//.*$"
 
 hi def link dtsCellProperty     Number
 hi def link dtsBinaryProperty   Number
@@ -26,3 +27,4 @@ hi def link dtsNode             Structure
 hi def link dtsReference        Macro
 hi def link dtsComment          Comment
 hi def link dtsCommentInner     Comment 
+hi def link dtsCommentLine      Comment
diff --git a/runtime/syntax/j.vim b/runtime/syntax/j.vim
index 6ba9366a41..368cfc6cd5 100644
--- a/runtime/syntax/j.vim
+++ b/runtime/syntax/j.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	J
 " Maintainer:	David Bürgin <676c7473@gmail.com>
-" Last Change:	2013-09-21
+" Last Change:	2013-10-06
 
 if exists("b:current_syntax")
   finish
@@ -33,11 +33,13 @@ syn match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+/
 syn match jNumber /\<__\=\>/
 syn match jNumber /\<_\=\d\+x\>/
 
-syn match jComment /NB\..*$/
+syn match jComment /NB\..*$/ contains=jTodo,@Spell
+syn keyword jTodo TODO FIXME XXX contained
 
 hi def link jControl Statement
 hi def link jString String
 hi def link jNumber Number
 hi def link jComment Comment
+hi def link jTodo Todo
 
 let b:current_syntax = "j"
diff --git a/runtime/syntax/upstreamlog.vim b/runtime/syntax/upstreamlog.vim
index 1161ecfcbe..1439bdffe6 100644
--- a/runtime/syntax/upstreamlog.vim
+++ b/runtime/syntax/upstreamlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing upstream.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-07-26
+" Latest Revision:      2013-09-19
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -31,13 +31,14 @@ syn match upstreamlog_Profile / Profile: \zs\S\{1,8}/
 syn match upstreamlog_Profile /  Profile: \zs\S\{1,8}\ze, /
 syn match upstreamlog_Profile /, profile: \zs\S\{1,8}\ze,/
 syn match upstreamlog_Profile /found Profile: \zs\S\{1,8}\ze,/
-syn match upstreamlog_Profile /Backup Profile: \zs\ze Version date/
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
 syn match upstreamlog_Profile /Full of \zs\S\{1,8}\ze$/
 syn match upstreamlog_Profile /Incr. of \zs\S\{1,8}\ze$/
 syn match upstreamlog_Profile /Profile=\zs\S\{1,8}\ze,/
 " Target:
 syn region upstreamlog_Target start="Computer: \zs" end="\ze[\]\)]" 
-syn region upstreamlog_Target start="Computer name \zs" end="\ze," 
+syn region upstreamlog_Target start="Computer name \zs\"" end="\"\ze" 
 syn region upstreamlog_Target start="request to registered name \zs" end=" "
 
 
diff --git a/runtime/syntax/usserverlog.vim b/runtime/syntax/usserverlog.vim
index 7cd50b3287..34a7e3dca0 100644
--- a/runtime/syntax/usserverlog.vim
+++ b/runtime/syntax/usserverlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing usserver.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-07-26
+" Latest Revision:      2013-09-19
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -36,13 +36,14 @@ syn match usserverlog_Profile /, profile: \zs\S\{1,8}\ze,/
 syn match usserverlog_Profile /Expecting Profile: \zs\S\{1,8}\ze,/
 syn match usserverlog_Profile /found Profile: \zs\S\{1,8}\ze,/
 syn match usserverlog_Profile /Profile \zs\S\{1,8} \zeis a member of group: /
-syn match usserverlog_Profile /Backup Profile: \zs\ze Version date/
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
 syn match usserverlog_Profile /Full of \zs\S\{1,8}\ze$/
 syn match usserverlog_Profile /Incr. of \zs\S\{1,8}\ze$/
 syn match usserverlog_Profile /Profile=\zs\S\{1,8}\ze,/
 " Target:
 syn region usserverlog_Target start="Computer: \zs" end="\ze[\]\)]" 
-syn region usserverlog_Target start="Computer name \zs" end="\ze," 
+syn region usserverlog_Target start="Computer name \zs\"" end="\"\ze" 
 syn region usserverlog_Target start="Registration add request successful \zs" end="$"
 syn region usserverlog_Target start="request to registered name \zs" end=" "
 syn region usserverlog_Target start=", sending to \zs" end="$"
diff --git a/runtime/syntax/usw2kagtlog.vim b/runtime/syntax/usw2kagtlog.vim
index 9315731343..0a34128f9b 100644
--- a/runtime/syntax/usw2kagtlog.vim
+++ b/runtime/syntax/usw2kagtlog.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:             Innovation Data Processing USW2KAgt.log file
 " Maintainer:           Rob Owens <rowens@fdrinnovation.com>
-" Latest Revision:      2013-07-26
+" Latest Revision:      2013-09-19
 
 " Quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -26,13 +26,14 @@ syn match usw2kagtlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
 syn match usw2kagtlog_Profile /Profile name \zs\"\S\{1,8}\"/
 syn match usw2kagtlog_Profile / Profile: \zs\S\{1,8}/
 syn match usw2kagtlog_Profile /  Profile: \zs\S\{1,8}\ze, /
-syn match usw2kagtlog_Profile /Backup Profile: \zs\ze Version date/
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
 syn match usw2kagtlog_Profile /Full of \zs\S\{1,8}\ze$/
 syn match usw2kagtlog_Profile /Incr. of \zs\S\{1,8}\ze$/
 syn match usw2kagtlog_Profile /profile name "\zs\S\{1,8}\ze"/
 " Target:
 syn region usw2kagtlog_Target start="Computer: \zs" end="\ze[\]\)]" 
-syn region usw2kagtlog_Target start="Computer name \zs" end="\ze," 
+syn region usw2kagtlog_Target start="Computer name \zs\"" end="\"\ze" 
 " Agent Keywords:
 syn keyword usw2kagtlog_Agentword opened closed
 
diff --git a/runtime/vimlogo.eps b/runtime/vimlogo.eps
index 5bf45ff4f7..3b567b0a7d 100644
--- a/runtime/vimlogo.eps
+++ b/runtime/vimlogo.eps
@@ -1,791 +1,803 @@
-%!PS-Adobe-3.0 EPSF-3.0

-%%BoundingBox: 147 74 429 356 

-%%LanguageLevel: 1

-%%Creator: CorelDRAW 11

-%%Title: vimlogo.eps

-%%CreationDate: Mon Feb 02 14:35:16 2004

-%%DocumentProcessColors: Cyan Yellow Black 

-%%DocumentSuppliedResources: (atend)

-%%EndComments

-%%BeginProlog

-/AutoFlatness false def

-/AutoSteps 0 def

-/CMYKMarks true def

-/UseLevel 1 def

-%Build: CorelDRAW 11 Version 11.633

-%Color profile:  Generic offset separations profile

-/CorelIsEPS true def

-%%BeginResource: procset wCorel11Dict 11.0 0

-/wCorel11Dict 300 dict def wCorel11Dict begin
-% Copyright (c)1992-2002 Corel Corporation

-% All rights reserved.     v11.0 r0.0

-/bd{bind def}bind def/ld{load def}bd/xd{exch def}bd/_ null def/rp{{pop}repeat}

-bd/@cp/closepath ld/@gs/gsave ld/@gr/grestore ld/@np/newpath ld/Tl/translate ld

-/$sv 0 def/@sv{/$sv save def}bd/@rs{$sv restore}bd/spg/showpage ld/showpage{}

-bd currentscreen/@dsp xd/$dsp/@dsp def/$dsa xd/$dsf xd/$sdf false def/$SDF

-false def/$Scra 0 def/SetScr/setscreen ld/@ss{2 index 0 eq{$dsf 3 1 roll 4 -1

-roll pop}if exch $Scra add exch load SetScr}bd/SepMode_5 where{pop}{/SepMode_5

-0 def}ifelse/CorelIsSeps where{pop}{/CorelIsSeps false def}ifelse

-/CorelIsInRIPSeps where{pop}{/CorelIsInRIPSeps false def}ifelse/CorelIsEPS

-where{pop}{/CorelIsEPS false def}ifelse/CurrentInkName_5 where{pop}

-{/CurrentInkName_5(Composite)def}ifelse/$ink_5 where{pop}{/$ink_5 -1 def}

-ifelse/$c 0 def/$m 0 def/$y 0 def/$k 0 def/$t 1 def/$n _ def/$o 0 def/$fil 0

-def/$C 0 def/$M 0 def/$Y 0 def/$K 0 def/$T 1 def/$N _ def/$O 0 def/$PF false

-def/s1c 0 def/s1m 0 def/s1y 0 def/s1k 0 def/s1t 0 def/s1n _ def/$bkg false def

-/SK 0 def/SM 0 def/SY 0 def/SC 0 def/$op false def matrix currentmatrix/$ctm xd

-/$ptm matrix def/$ttm matrix def/$stm matrix def/$ffpnt true def

-/CorelDrawReencodeVect[16#0/grave 16#5/breve 16#6/dotaccent 16#8/ring

-16#A/hungarumlaut 16#B/ogonek 16#C/caron 16#D/dotlessi 16#27/quotesingle

-16#60/grave 16#7C/bar

-16#82/quotesinglbase/florin/quotedblbase/ellipsis/dagger/daggerdbl

-16#88/circumflex/perthousand/Scaron/guilsinglleft/OE

-16#91/quoteleft/quoteright/quotedblleft/quotedblright/bullet/endash/emdash

-16#98/tilde/trademark/scaron/guilsinglright/oe 16#9F/Ydieresis

-16#A1/exclamdown/cent/sterling/currency/yen/brokenbar/section

-16#a8/dieresis/copyright/ordfeminine/guillemotleft/logicalnot/minus/registered/macron

-16#b0/degree/plusminus/twosuperior/threesuperior/acute/mu/paragraph/periodcentered

-16#b8/cedilla/onesuperior/ordmasculine/guillemotright/onequarter/onehalf/threequarters/questiondown

-16#c0/Agrave/Aacute/Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla

-16#c8/Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute/Icircumflex/Idieresis

-16#d0/Eth/Ntilde/Ograve/Oacute/Ocircumflex/Otilde/Odieresis/multiply

-16#d8/Oslash/Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn/germandbls

-16#e0/agrave/aacute/acircumflex/atilde/adieresis/aring/ae/ccedilla

-16#e8/egrave/eacute/ecircumflex/edieresis/igrave/iacute/icircumfl