diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a06aa4d..f7a3ee1 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Jul 21
+*cmdline.txt*   For Vim version 8.1.  Last change: 2019 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -702,7 +702,7 @@
 If more line specifiers are given than required for the command, the first
 one(s) will be ignored.
 
-Line numbers may be specified with:		*:range* *E14* *{address}*
+Line numbers may be specified with:		*:range* *{address}*
 	{number}	an absolute line number
 	.		the current line			  *:.*
 	$		the last line in the file		  *:$*
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 9c7867c..59e44dc 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 8.1.  Last change: 2019 Feb 17
+*develop.txt*   For Vim version 8.1.  Last change: 2019 Aug 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -529,7 +529,7 @@
    memory use, but takes a long time.  On a fast PC it takes a couple of
    seconds for English, which can be acceptable for interactive use.  But for
    some languages it takes more than ten seconds (e.g., German, Catalan),
-   which is unacceptable slow.  For batch processing (automatic corrections)
+   which is unacceptably slow.  For batch processing (automatic corrections)
    it's too slow for all languages.
 2. Use a trie for the soundfolded words, so that searching can be done just
    like how it works without soundfolding.  This requires remembering a list
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ca07795..2f35c7c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.1.  Last change: 2019 Aug 04
+*eval.txt*	For Vim version 8.1.  Last change: 2019 Aug 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4396,15 +4396,24 @@
 		the Funcref and will be used when the Funcref is called.
 
 		The arguments are passed to the function in front of other
-		arguments.  Example: >
+		arguments, but after any argument from |method|.  Example: >
 			func Callback(arg1, arg2, name)
 			...
-			let Func = function('Callback', ['one', 'two'])
+			let Partial = function('Callback', ['one', 'two'])
 			...
-			call Func('name')
+			call Partial('name')
 <		Invokes the function as with: >
 			call Callback('one', 'two', 'name')
 
+<		With a |method|: >
+			func Callback(one, two, three)
+			...
+			let Partial = function('Callback', ['two'])
+			...
+			eval 'one'->Partial('three')
+<		Invokes the function as with: >
+			call Callback('one', 'two', 'three')
+
 <		The function() call can be nested to add more arguments to the
 		Funcref.  The extra arguments are appended to the list of
 		arguments.  Example: >
@@ -6196,6 +6205,8 @@
 			call map(myDict, {key, val -> key . '-' . val})
 <		If you do not use "val" you can leave it out: >
 			call map(myDict, {key -> 'item: ' . key})
+<		If you do not use "key" you can use a short name: >
+			call map(myDict, {_, val -> 'item: ' . val})
 <
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
@@ -10120,6 +10131,11 @@
 allow for method chaining, e.g.: >
 	eval GetList()->Filter()->append('$')
 
+A function can also be called as part of evaluating an expression or when it
+is used as a method: >
+	let x = GetList()
+	let y = GetList()->Filter()
+
 
 AUTOMATICALLY LOADING FUNCTIONS ~
 							*autoload-functions*
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 6fcf987..36c49b8 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 8.1.  Last change: 2019 Jul 21
+*indent.txt*    For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -831,7 +831,7 @@
 global variables:
 
 					*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
 own 'formatoptions'): >
     :let g:PHP_autoformatcomment = 0
 
diff --git a/runtime/doc/popup.txt b/runtime/doc/popup.txt
index bac3433..67ad70b 100644
--- a/runtime/doc/popup.txt
+++ b/runtime/doc/popup.txt
@@ -1,4 +1,4 @@
-*popup.txt*  For Vim version 8.1.  Last change: 2019 Aug 01
+*popup.txt*  For Vim version 8.1.  Last change: 2019 Aug 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index f380dc6..f2bc327 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 8.1.  Last change: 2019 Jul 15
+*quickfix.txt*  For Vim version 8.1.  Last change: 2019 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1352,6 +1352,9 @@
 Note: By default the difference between upper and lowercase is ignored.  If
 you want to match case, add "\C" to the pattern |/\C|.
 
+Vim will read lines of any length, but only the first 4095 bytes are used, the
+rest is ignored.  Items can only be 1023 bytes long.
+
 
 Basic items
 
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index f6505e6..bf3e346 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.1.  Last change: 2019 Jul 18
+*quickref.txt*  For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -651,6 +651,7 @@
 'complete'	  'cpt'     specify how Insert mode completion works
 'completefunc'	  'cfu'     function to be used for Insert mode completion
 'completeopt'	  'cot'     options for Insert mode completion
+'completeslash'	  'csl'	    like 'shellslash' for completion
 'concealcursor'	  'cocu'    whether concealable text is hidden in cursor line
 'conceallevel'	  'cole'    whether concealable text is shown or hidden
 'confirm'	  'cf'	    ask what to do about unsaved/read-only files
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 01948f6..735a4d2 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2382,6 +2382,7 @@
 :ene!	editing.txt	/*:ene!*
 :enew	editing.txt	/*:enew*
 :enew!	editing.txt	/*:enew!*
+:eval	eval.txt	/*:eval*
 :ex	editing.txt	/*:ex*
 :exe	eval.txt	/*:exe*
 :exe-comment	eval.txt	/*:exe-comment*
@@ -3880,7 +3881,6 @@
 E137	starting.txt	/*E137*
 E138	starting.txt	/*E138*
 E139	message.txt	/*E139*
-E14	cmdline.txt	/*E14*
 E140	message.txt	/*E140*
 E141	message.txt	/*E141*
 E142	message.txt	/*E142*
@@ -4027,6 +4027,7 @@
 E271	if_ruby.txt	/*E271*
 E272	if_ruby.txt	/*E272*
 E273	if_ruby.txt	/*E273*
+E274	eval.txt	/*E274*
 E277	remote.txt	/*E277*
 E28	syntax.txt	/*E28*
 E280	if_tcl.txt	/*E280*
@@ -7653,6 +7654,7 @@
 message.txt	message.txt	/*message.txt*
 messages	message.txt	/*messages*
 meta	intro.txt	/*meta*
+method	eval.txt	/*method*
 min()	eval.txt	/*min()*
 missing-options	vi_diff.txt	/*missing-options*
 mkdir()	eval.txt	/*mkdir()*
@@ -8246,6 +8248,7 @@
 popup-function-details	popup.txt	/*popup-function-details*
 popup-functions	popup.txt	/*popup-functions*
 popup-intro	popup.txt	/*popup-intro*
+popup-mapping	popup.txt	/*popup-mapping*
 popup-mask	popup.txt	/*popup-mask*
 popup-menu	gui.txt	/*popup-menu*
 popup-menu-added	version5.txt	/*popup-menu-added*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 3c3bd02..9515f4b 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.1.  Last change: 2019 Jul 30
+*todo.txt*      For Vim version 8.1.  Last change: 2019 Aug 08
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -38,12 +38,25 @@
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+
+Methods:
+- Support lambda?  #4768
+    echo (10.0 / 100.0)->{x -> x * 100}
+- Define a user defined function for a specific type only?
+	func Len(expr) method=list,dict
+	  return a:expr->len()
+	endfunc
+	echo [1, 2, 3]->Len()
+	3
+	call Len([1, 2, 3])
+	error!
+
 Popup windows:
-- Always show the right border, not only when there is a close button?
-- bug: double click in scrollbar starts selection
+- :pedit from help doesn't reset help flag, see pedit example
+- check popupmenu using preview window
 - modeless selection fails over ssh and with putty.  Mouse dragging not
   supported?  Can we force it on?
-- Allow resizing from the bottom-right corner
+- modeless selection extends into the scrollbar. (#4773)
 - Implement flip option
 - Have a way to scroll to the bottom, e.g. set 'firstline' to -1? (#4577)
 - Why does 'nrformats' leak from the popup window buffer???
@@ -57,7 +70,7 @@
   do. (#4560)
 - Make redrawing more efficient and avoid flicker:
     - put popup menu also put in popup_mask?
-- Invoke filter with character before mapping?
+- Invoke filter with character before mapping?  #4759
 - Figure out the size and position better.
     if wrapping splits a double-wide character
     if wrapping inserts indent
@@ -135,16 +148,11 @@
 - When 'encoding' is not utf-8, or the job is using another encoding, setup
   conversions.
 
-Error numbers available: E260, E274, E275, E276,
+Error numbers available: E274, E275, E276,
 E278, E279, E290, E292, E362, E366, E450, E451, E452,
 E453, E454, E460, E489, E491, E565, E578, E610, E611, E653,
 E654, E856, E857, E860, E861, E863, E889, E900
 
-Patch on issue #4661 to fix resolve(). (Ken Takata)
-https://gist.github.com/k-takata/52d0a677ca9a27bdbaed21d77533244e
-
-Patch to split of map.c from getchar.c (Yegappan, #4740)
-
 Sound: support on Mac?  Or does libcanberra work there?
 
 Patch to add win_splitmove() function. (Andy Massimino, #4561)
@@ -188,6 +196,9 @@
 
 Make 'showbreak' global-local.
 
+The :syntax cchar value can only be a single character.  It would be useful to
+support combining characters. (Charles Campbell)  Also #4687
+
 Problem showing a line if the number column width changes when using "o".
 (Mateusz Morusiewicz, #4245)
 
@@ -197,6 +208,8 @@
 When using :packadd files under "later" are not used, which is inconsistent
 with packages under "start". (xtal8, #1994)
 
+Modeless selection doesn't work in gvim. (#4783)
+
 Visual highlight not removed when 'dipslay' is "lastline" and line doesn't
 fit. (Kevin Lawler, #4457)
 
@@ -221,9 +234,14 @@
 
 Patch for Inno Setup: #2739
 
+Would be nice to set tab-local values for 'diffexpr' and 'diffopt'.  Use
+t:diffexpr_option t:diffopt_option? (#4782)
+
 Internal diff doesn't handle binary file like external diff does. (Mike
 Williams, 2018 Oct 30)
 
+'[ mark in wrong column after put. (#4776)
+
 "exepath('bin/cmd')" does not work while ":!bin/cmd" does work.
 (Daniel Hahler, #4710)  and executable('bin/cmd') returns 1
 
@@ -244,6 +262,8 @@
 Patch for ambiguous width characters in libvterm on MS-Windows 10.
 (Nobuhiro Takasaki, #4411)
 
+Window size changes after closing a tab. (#4741)
+
 Problem with colors in terminal window. (Jason Franklin, 2019 May 12)
 
 Lifepillar: Updated/cleaned up color schemes:
@@ -279,6 +299,8 @@
 Some composing characters actually add a cell width to the character they are
 on top off, making the whole thing two characters wide. (#4526)
 
+Add CmdwinLeavePost (#4762).  Also add WinLeavePost then?
+
 Should we include some part of pull request #4505, not increment changedtick
 in some cases?  E.g. for ":write" when the changed flag was already off, the
 buffer didn't change at all.
@@ -313,24 +335,6 @@
 Add test for urxvt mouse codes.  Also test that mouse coordinates can be
 negative. (see #4326)
 
-All functions are global, which makes functions like get() and len() awkward.
-For the future use the ~get() and ~len() syntax.  It also allows for
-chaining: >
-    mylist~get(idx)
-    mylist~uniq()~len()
-    mydict~get(idx)
-    mystring~len()
-Or use -> (like C pointer dereference) >
-    mylist->get(idx)
-    mylist->uniq()->len()
-    mydict->get(idx)
-    mystring->len()
-Alternatives for ~:
-    ^  list^get()    could also be used
-    .  list.get()    already means "member" in Dict
-    $  list$get()    harder to read
-    @  list@get()    harder to read
-
 'cmdheight' has a tab-local value, but it cannot be obtained with
 `:echo gettabwinvar(2, 1, '&cmdheight')` returns the value for the _current_
 tab page. (Ingo Karkat, #4324)
@@ -1904,9 +1908,6 @@
 only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug
 21, Ben Fritz, 2010 Sep 14)
 
-The :syntax cchar value can only be a single character.  It would be useful to
-support combining characters. (Charles Campbell)
-
 'cursorline' works on a text line only.  Add 'cursorscreenline' for
 highlighting the screen line. (Christian Brabandt, 2012 Mar 31)
 
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 6a67867..8c5885a 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 8.1.  Last change: 2019 Jul 21
+*various.txt*   For Vim version 8.1.  Last change: 2019 Aug 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -382,7 +382,7 @@
 N  *+lispindent*	|'lisp'|
 T  *+listcmds*		Vim commands for the list of buffers |buffer-hidden|
 			and argument list |:argdelete|
-N  *+localmap*		Support for mappings local to a buffer |:map-local|
+T  *+localmap*		Support for mappings local to a buffer |:map-local|
 m  *+lua*		|Lua| interface
 m  *+lua/dyn*		|Lua| interface |/dyn|
 N  *+menu*		|:menu|
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 47a1438..eec2d1e 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:	2019 Jul 18
+" Last Change:	2019 Aug 01
 
 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
@@ -1176,6 +1176,8 @@
   if has("win32")
     call append("$", "shellslash\tuse forward slashes in file names; for Unix-like shells")
     call <SID>BinOptionG("ssl", &ssl)
+    call append("$", "completeslash\tspecifies slash/backslash used for completion")
+    call <SID>OptionG("csl", &csl)
   endif
 endif
 
diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim
index 1652cb6..eeb9902 100644
--- a/runtime/syntax/cs.vim
+++ b/runtime/syntax/cs.vim
@@ -3,7 +3,7 @@
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2018-11-26
+" Last Change:         2019-08-01
 " Filenames:           *.cs
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
@@ -51,9 +51,11 @@
 " Punctuation
 syn match	csBraces	"[{}\[\]]" display
 syn match	csParens	"[()]" display
-syn match	csOpSymbols	"[+\-=]\{1,2}" display
-syn match	csOpSymbols	"[><]\{2}" display
-syn match	csOpSymbols	"\s\zs[><]\ze\_s" display
+syn match	csOpSymbols	"+\{1,2}" display
+syn match	csOpSymbols	"-\{1,2}" display
+syn match	csOpSymbols	"=\{1,2}" display
+syn match	csOpSymbols	">\{1,2}" display
+syn match	csOpSymbols	"<\{1,2}" display
 syn match	csOpSymbols	"[!><+\-*/]=" display
 syn match	csOpSymbols	"[!*/^]" display
 syn match	csOpSymbols	"=>" display
@@ -63,6 +65,9 @@
 syn match	csLogicSymbols	"?" display
 syn match	csLogicSymbols	":" display
 
+" Generics
+syn region	csGeneric	matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
 " Comments
 "
 " PROVIDES: @csCommentHook
@@ -87,8 +92,8 @@
 
 syn cluster xmlTagHook add=csXmlTag
 
-syn match	csXmlCommentLeader	+\/\/\/+    contained
-syn match	csXmlComment	+\/\/\/.*$+ contains=csXmlCommentLeader,@csXml,@Spell
+syn match	csXmlCommentLeader	"///" contained
+syn match	csXmlComment	"///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend
 syn include	@csXml syntax/xml.vim
 hi def link	xmlRegion Comment
 
@@ -100,7 +105,8 @@
 
 
 syn region	csClassType	start="@\@1<!\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
-syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew contains=csNewType
+" csUserType may be defined by user scripts/plugins - it should be contained in csNewType
+syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,csUserType
 syn region	csIsType	start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn region	csIsType	start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
 syn keyword	csNew	new contained
@@ -146,7 +152,7 @@
 
 syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
 
-syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString
+syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
 
 " The default highlighting.
 hi def link	csType	Type
@@ -160,7 +166,7 @@
 hi def link	csModifier	StorageClass
 hi def link	csConstant	Constant
 hi def link	csException	Exception
-hi def link	csTypeOf	Operator
+hi def link	csTypeOf	Keyword
 hi def link	csTypeOfStatement	Typedef
 hi def link	csUnspecifiedStatement	Statement
 hi def link	csUnsupportedStatement	Statement
@@ -198,6 +204,8 @@
 hi def link	csInterpolationFormat	csInterpolationDelimiter
 hi def link	csInterpolationFormatDel	csInterpolationDelimiter
 
+hi def link	csGenericBraces	csBraces
+
 " xml markup
 hi def link	csXmlCommentLeader	Comment
 hi def link	csXmlComment	Comment
diff --git a/runtime/syntax/vuejs.vim b/runtime/syntax/vue.vim
similarity index 100%
rename from runtime/syntax/vuejs.vim
rename to runtime/syntax/vue.vim