Merge remote-tracking branch 'upstream/master' into userreguserreg

1 files changed, 2701 insertions, 3083 deletions

diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt
index 4d2c85b134..6ffb514487 100644
--- a/runtime/doc/builtin.txt
+++ b/runtime/doc/builtin.txt
@@ -1,7 +1,7 @@
 *builtin.txt*	Nvim
 
 
-		  VIM REFERENCE MANUAL	  by Bram Moolenaar
+		  NVIM REFERENCE MANUAL
 
 
 Builtin functions		*vimscript-functions* *builtin-functions*
@@ -9,633 +9,62 @@ Builtin functions		*vimscript-functions* *builtin-functions*
 For functions grouped by what they are used for see |function-list|.
 
 				      Type |gO| to see the table of contents.
-
-==============================================================================
-1. Overview					*builtin-function-list*
-
-Use CTRL-] on the function name to jump to the full explanation.
-
-USAGE				RESULT	DESCRIPTION	~
-
-abs({expr})			Float or Number  absolute value of {expr}
-acos({expr})			Float	arc cosine of {expr}
-add({object}, {item})		List/Blob   append {item} to {object}
-and({expr}, {expr})		Number	bitwise AND
-api_info()			Dict	api metadata
-append({lnum}, {text})		Number	append {text} below line {lnum}
-appendbufline({expr}, {lnum}, {text})
-				Number	append {text} below line {lnum}
-					in buffer {expr}
-argc([{winid}])			Number	number of files in the argument list
-argidx()			Number	current index in the argument list
-arglistid([{winnr} [, {tabnr}]]) Number	argument list id
-argv({nr} [, {winid}])		String	{nr} entry of the argument list
-argv([-1, {winid}])		List	the argument list
-asin({expr})			Float	arc sine of {expr}
-assert_beeps({cmd})		Number	assert {cmd} causes a beep
-assert_equal({exp}, {act} [, {msg}])
-				Number	assert {exp} is equal to {act}
-assert_equalfile({fname-one}, {fname-two} [, {msg}])
-				Number	assert file contents are equal
-assert_exception({error} [, {msg}])
-				Number	assert {error} is in v:exception
-assert_fails({cmd} [, {error}])	Number	assert {cmd} fails
-assert_false({actual} [, {msg}])
-				Number	assert {actual} is false
-assert_inrange({lower}, {upper}, {actual} [, {msg}])
-				Number	assert {actual} is inside the range
-assert_match({pat}, {text} [, {msg}])
-				Number	assert {pat} matches {text}
-assert_nobeep({cmd})		Number	assert {cmd} does not cause a beep
-assert_notequal({exp}, {act} [, {msg}])
-				Number	assert {exp} is not equal {act}
-assert_notmatch({pat}, {text} [, {msg}])
-				Number	assert {pat} not matches {text}
-assert_report({msg})		Number	report a test failure
-assert_true({actual} [, {msg}])	Number	assert {actual} is true
-atan({expr})			Float	arc tangent of {expr}
-atan2({expr1}, {expr2})		Float	arc tangent of {expr1} / {expr2}
-browse({save}, {title}, {initdir}, {default})
-				String	put up a file requester
-browsedir({title}, {initdir})	String	put up a directory requester
-bufadd({name})			Number	add a buffer to the buffer list
-bufexists({expr})		Number	|TRUE| if buffer {expr} exists
-buflisted({expr})		Number	|TRUE| if buffer {expr} is listed
-bufload({expr})			Number	load buffer {expr} if not loaded yet
-bufloaded({expr})		Number	|TRUE| if buffer {expr} is loaded
-bufname([{expr}])		String	Name of the buffer {expr}
-bufnr([{expr} [, {create}]])	Number	Number of the buffer {expr}
-bufwinid({expr})		Number	|window-ID| of buffer {expr}
-bufwinnr({expr})		Number	window number of buffer {expr}
-byte2line({byte})		Number	line number at byte count {byte}
-byteidx({expr}, {nr})		Number	byte index of {nr}th char in {expr}
-byteidxcomp({expr}, {nr})	Number	byte index of {nr}th char in {expr}
-call({func}, {arglist} [, {dict}])
-				any	call {func} with arguments {arglist}
-ceil({expr})			Float	round {expr} up
-changenr()			Number	current change number
-chanclose({id} [, {stream}])	Number	Closes a channel or one of its streams
-chansend({id}, {data})		Number	Writes {data} to channel
-char2nr({expr} [, {utf8}])	Number	ASCII/UTF-8 value of first char in {expr}
-charclass({string})		Number	character class of {string}
-charcol({expr} [, {winid}])	Number	column number of cursor or mark
-charidx({string}, {idx} [, {countcc}])
-				Number	char index of byte {idx} in {string}
-chdir({dir})			String	change current working directory
-cindent({lnum})			Number	C indent for line {lnum}
-clearmatches([{win}])		none	clear all matches
-col({expr} [, {winid}])		Number	column byte index of cursor or mark
-complete({startcol}, {matches}) none	set Insert mode completion
-complete_add({expr})		Number	add completion match
-complete_check()		Number	check for key typed during completion
-complete_info([{what}])		Dict	get current completion information
-confirm({msg} [, {choices} [, {default} [, {type}]]])
-				Number	number of choice picked by user
-copy({expr})			any	make a shallow copy of {expr}
-cos({expr})			Float	cosine of {expr}
-cosh({expr})			Float	hyperbolic cosine of {expr}
-count({comp}, {expr} [, {ic} [, {start}]])
-				Number	count how many {expr} are in {comp}
-ctxget([{index}])		Dict	return the |context| dict at {index}
-ctxpop()			none	pop and restore |context| from the
-					|context-stack|
-ctxpush([{types}])		none	push the current |context| to the
-					|context-stack|
-ctxset({context} [, {index}])	none	set |context| at {index}
-ctxsize()			Number	return |context-stack| size
-cursor({lnum}, {col} [, {off}])
-				Number	move cursor to {lnum}, {col}, {off}
-cursor({list})			Number	move cursor to position in {list}
-debugbreak({pid})		Number	interrupt process being debugged
-deepcopy({expr} [, {noref}])	any	make a full copy of {expr}
-delete({fname} [, {flags}])	Number	delete the file or directory {fname}
-deletebufline({buf}, {first} [, {last}])
-				Number	delete lines from buffer {buf}
-dictwatcheradd({dict}, {pattern}, {callback})
-				Start watching a dictionary
-dictwatcherdel({dict}, {pattern}, {callback})
-				Stop watching a dictionary
-did_filetype()			Number	|TRUE| if FileType autocommand event used
-diff_filler({lnum})		Number	diff filler lines about {lnum}
-diff_hlID({lnum}, {col})	Number	diff highlighting at {lnum}/{col}
-digraph_get({chars})		String	get the |digraph| of {chars}
-digraph_getlist([{listall}])	List	get all |digraph|s
-digraph_set({chars}, {digraph})	Boolean	register |digraph|
-digraph_setlist({digraphlist})	Boolean	register multiple |digraph|s
-empty({expr})			Number	|TRUE| if {expr} is empty
-environ()			Dict	return environment variables
-escape({string}, {chars})	String	escape {chars} in {string} with '\'
-eval({string})			any	evaluate {string} into its value
-eventhandler()			Number	|TRUE| if inside an event handler
-executable({expr})		Number	1 if executable {expr} exists
-execute({command})		String	execute and capture output of {command}
-exepath({expr})			String	full path of the command {expr}
-exists({expr})			Number	|TRUE| if {expr} exists
-exp({expr})			Float	exponential of {expr}
-expand({expr} [, {nosuf} [, {list}]])
-				any	expand special keywords in {expr}
-expandcmd({string} [, {options}])
-				String	expand {string} like with `:edit`
-extend({expr1}, {expr2} [, {expr3}])
-				List/Dict insert items of {expr2} into {expr1}
-feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
-filereadable({file})		Number	|TRUE| if {file} is a readable file
-filewritable({file})		Number	|TRUE| if {file} is a writable file
-filter({expr1}, {expr2})	List/Dict  remove items from {expr1} where
-					{expr2} is 0
-finddir({name} [, {path} [, {count}]])
-				String	find directory {name} in {path}
-findfile({name} [, {path} [, {count}]])
-				String	find file {name} in {path}
-flatten({list} [, {maxdepth}])	List	flatten {list} up to {maxdepth} levels
-float2nr({expr})		Number	convert Float {expr} to a Number
-floor({expr})			Float	round {expr} down
-fmod({expr1}, {expr2})		Float	remainder of {expr1} / {expr2}
-fnameescape({fname})		String	escape special characters in {fname}
-fnamemodify({fname}, {mods})	String	modify file name
-foldclosed({lnum})		Number	first line of fold at {lnum} if closed
-foldclosedend({lnum})		Number	last line of fold at {lnum} if closed
-foldlevel({lnum})		Number	fold level at {lnum}
-foldtext()			String	line displayed for closed fold
-foldtextresult({lnum})		String	text for closed fold at {lnum}
-fullcommand({name})		String	get full command from {name}
-funcref({name} [, {arglist}] [, {dict}])
-				Funcref	reference to function {name}
-function({name} [, {arglist}] [, {dict}])
-				Funcref	named reference to function {name}
-garbagecollect([{atexit}])	none	free memory, breaking cyclic references
-get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
-get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
-get({func}, {what})		any	get property of funcref/partial {func}
-getbufinfo([{buf}])		List	information about buffers
-getbufline({buf}, {lnum} [, {end}])
-				List	lines {lnum} to {end} of buffer {buf}
-getbufoneline({buf}, {lnum})	String	line {lnum} of buffer {buf}
-getbufvar({buf}, {varname} [, {def}])
-				any	variable {varname} in buffer {buf}
-getcellwidths()			List	get character cell width overrides
-getchangelist([{buf}])		List	list of change list items
-getchar([expr])			Number or String
-					get one character from the user
-getcharmod()			Number	modifiers for the last typed character
-getcharpos({expr})		List	position of cursor, mark, etc.
-getcharsearch()			Dict	last character search
-getcharstr([expr])		String	get one character from the user
-getcmdcompltype()		String	return the type of the current
-					command-line completion
-getcmdline()			String	return the current command-line
-getcmdpos()			Number	return cursor position in command-line
-getcmdscreenpos()		Number	return cursor screen position in
-					command-line
-getcmdtype()			String	return current command-line type
-getcmdwintype()			String	return current command-line window type
-getcompletion({pat}, {type} [, {filtered}])
-				List	list of cmdline completion matches
-getcurpos([{winnr}])		List	position of the cursor
-getcursorcharpos([{winnr}])	List	character position of the cursor
-getcwd([{winnr} [, {tabnr}]])	String	get the current working directory
-getenv({name})			String	return environment variable
-getfontname([{name}])		String	name of font being used
-getfperm({fname})		String	file permissions of file {fname}
-getfsize({fname})		Number	size in bytes of file {fname}
-getftime({fname})		Number	last modification time of file
-getftype({fname})		String	description of type of file {fname}
-getjumplist([{winnr} [, {tabnr}]])
-				List	list of jump list items
-getline({lnum})			String	line {lnum} of current buffer
-getline({lnum}, {end})		List	lines {lnum} to {end} of current buffer
-getloclist({nr})		List	list of location list items
-getloclist({nr}, {what})	Dict	get specific location list properties
-getmarklist([{buf}])		List	list of global/local marks
-getmatches([{win}])		List	list of current matches
-getmousepos()			Dict	last known mouse position
-getpid()			Number	process ID of Vim
-getpos({expr})			List	position of cursor, mark, etc.
-getqflist()			List	list of quickfix items
-getqflist({what})		Dict	get specific quickfix list properties
-getreg([{regname} [, 1 [, {list}]]])
-				String or List   contents of a register
-getreginfo([{regname}])		Dict	information about a register
-getregtype([{regname}])		String	type of a register
-gettabinfo([{expr}])		List	list of tab pages
-gettabvar({nr}, {varname} [, {def}])
-				any	variable {varname} in tab {nr} or {def}
-gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
-				any	{name} in {winnr} in tab page {tabnr}
-gettagstack([{nr}])		Dict	get the tag stack of window {nr}
-gettext({text})			String	lookup translation of {text}
-getwininfo([{winid}])		List	list of info about each window
-getwinpos([{timeout}])		List	X and Y coord in pixels of the Vim window
-getwinposx()			Number	X coord in pixels of Vim window
-getwinposy()			Number	Y coord in pixels of Vim window
-getwinvar({nr}, {varname} [, {def}])
-				any	variable {varname} in window {nr}
-glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])
-				any	expand file wildcards in {expr}
-glob2regpat({expr})		String	convert a glob pat into a search pat
-globpath({path}, {expr} [, {nosuf} [, {list} [, {alllinks}]]])
-				String	do glob({expr}) for all dirs in {path}
-has({feature})			Number	|TRUE| if feature {feature} supported
-has_key({dict}, {key})		Number	|TRUE| if {dict} has entry {key}
-haslocaldir([{winnr} [, {tabnr}]])
-				Number	|TRUE| if the window executed |:lcd| or
-					the tab executed |:tcd|
-hasmapto({what} [, {mode} [, {abbr}]])
-				Number	|TRUE| if mapping to {what} exists
-histadd({history}, {item})	Number	add an item to a history
-histdel({history} [, {item}])	Number	remove an item from a history
-histget({history} [, {index}])	String	get the item {index} from a history
-histnr({history})		Number	highest index of a history
-hlID({name})			Number	syntax ID of highlight group {name}
-hlexists({name})		Number	|TRUE| if highlight group {name} exists
-hostname()			String	name of the machine Vim is running on
-iconv({expr}, {from}, {to})	String	convert encoding of {expr}
-indent({lnum})			Number	indent of line {lnum}
-index({object}, {expr} [, {start} [, {ic}]])
-				Number	index in {object} where {expr} appears
-input({prompt} [, {text} [, {completion}]])
-				String	get input from the user
-inputlist({textlist})		Number	let the user pick from a choice list
-inputrestore()			Number	restore typeahead
-inputsave()			Number	save and clear typeahead
-inputsecret({prompt} [, {text}])
-				String	like input() but hiding the text
-insert({object}, {item} [, {idx}])
-				List	insert {item} in {object} [before {idx}]
-interrupt()			none	interrupt script execution
-invert({expr})			Number	bitwise invert
-isdirectory({directory})	Number	|TRUE| if {directory} is a directory
-isinf({expr})			Number	determine if {expr} is infinity value
-					(positive or negative)
-islocked({expr})		Number	|TRUE| if {expr} is locked
-isnan({expr})			Number	|TRUE| if {expr} is NaN
-id({expr})			String	identifier of the container
-items({dict})			List	key-value pairs in {dict}
-jobpid({id})			Number	Returns pid of a job.
-jobresize({id}, {width}, {height})
-				Number	Resize pseudo terminal window of a job
-jobstart({cmd} [, {opts}])	Number	Spawns {cmd} as a job
-jobstop({id})			Number	Stops a job
-jobwait({ids} [, {timeout}])	Number	Wait for a set of jobs
-join({list} [, {sep}])		String	join {list} items into one String
-json_decode({expr})		any	Convert {expr} from JSON
-json_encode({expr})		String	Convert {expr} to JSON
-keys({dict})			List	keys in {dict}
-keytrans({string})		String	translate internal keycodes to a form
-					that can be used by |:map|
-len({expr})			Number	the length of {expr}
-libcall({lib}, {func}, {arg})	String	call {func} in library {lib} with {arg}
-libcallnr({lib}, {func}, {arg})	Number	idem, but return a Number
-line({expr} [, {winid}])	Number	line nr of cursor, last line or mark
-line2byte({lnum})		Number	byte count of line {lnum}
-lispindent({lnum})		Number	Lisp indent for line {lnum}
-list2str({list} [, {utf8}])	String	turn numbers in {list} into a String
-localtime()			Number	current time
-log({expr})			Float	natural logarithm (base e) of {expr}
-log10({expr})			Float	logarithm of Float {expr} to base 10
-luaeval({expr} [, {expr}])	any	evaluate |Lua| expression
-map({expr1}, {expr2})		List/Dict  change each item in {expr1} to {expr}
-maparg({name} [, {mode} [, {abbr} [, {dict}]]])
-				String or Dict
-					rhs of mapping {name} in mode {mode}
-mapcheck({name} [, {mode} [, {abbr}]])
-				String	check for mappings matching {name}
-mapset({mode}, {abbr}, {dict})
-				none	restore mapping from |maparg()| result
-match({expr}, {pat} [, {start} [, {count}]])
-				Number	position where {pat} matches in {expr}
-matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
-				Number	highlight {pattern} with {group}
-matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
-				Number	highlight positions with {group}
-matcharg({nr})			List	arguments of |:match|
-matchdelete({id} [, {win}])	Number	delete match identified by {id}
-matchend({expr}, {pat} [, {start} [, {count}]])
-				Number	position where {pat} ends in {expr}
-matchfuzzy({list}, {str} [, {dict}])
-				List	fuzzy match {str} in {list}
-matchfuzzypos({list}, {str} [, {dict}])
-				List	fuzzy match {str} in {list}
-matchlist({expr}, {pat} [, {start} [, {count}]])
-				List	match and submatches of {pat} in {expr}
-matchstr({expr}, {pat} [, {start} [, {count}]])
-				String	{count}th match of {pat} in {expr}
-matchstrpos({expr}, {pat} [, {start} [, {count}]])
-				List	{count}th match of {pat} in {expr}
-max({expr})			Number	maximum value of items in {expr}
-menu_get({path} [, {modes}])	List	description of |menus| matched by {path}
-menu_info({name} [, {mode}])	Dict	get menu item information
-min({expr})			Number	minimum value of items in {expr}
-mkdir({name} [, {path} [, {prot}]])
-				Number	create directory {name}
-mode([expr])			String	current editing mode
-msgpackdump({list} [, {type}])	List/Blob  dump objects to msgpack
-msgpackparse({data})		List	parse msgpack to a list of objects
-nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
-nr2char({expr} [, {utf8}])	String	single char with ASCII/UTF-8 value {expr}
-nvim_...({args}...)		any	call nvim |api| functions
-or({expr}, {expr})		Number	bitwise OR
-pathshorten({expr} [, {len}])	String	shorten directory names in a path
-perleval({expr})		any	evaluate |perl| expression
-pow({x}, {y})			Float	{x} to the power of {y}
-prevnonblank({lnum})		Number	line nr of non-blank line <= {lnum}
-printf({fmt}, {expr1}...)	String	format text
-prompt_getprompt({buf})		String	get prompt text
-prompt_setcallback({buf}, {expr}) none	set prompt callback function
-prompt_setinterrupt({buf}, {text}) none	set prompt interrupt function
-prompt_setprompt({buf}, {text}) none	set prompt text
-pum_getpos()			Dict	position and size of pum if visible
-pumvisible()			Number	whether popup menu is visible
-py3eval({expr})			any	evaluate |python3| expression
-pyeval({expr})			any	evaluate |Python| expression
-pyxeval({expr})			any	evaluate |python_x| expression
-rand([{expr}])			Number	get pseudo-random number
-range({expr} [, {max} [, {stride}]])
-				List	items from {expr} to {max}
-readblob({fname})		Blob	read a |Blob| from {fname}
-readdir({dir} [, {expr}])	List	file names in {dir} selected by {expr}
-readfile({fname} [, {type} [, {max}]])
-				List	get list of lines from file {fname}
-reduce({object}, {func} [, {initial}])
-				any	reduce {object} using {func}
-reg_executing()			String	get the executing register name
-reg_recorded()			String	get the last recorded register name
-reg_recording()			String	get the recording register name
-reltime([{start} [, {end}]])	List	get time value
-reltimefloat({time})		Float	turn the time value into a Float
-reltimestr({time})		String	turn time value into a String
-remove({list}, {idx} [, {end}])	any/List
-					remove items {idx}-{end} from {list}
-remove({blob}, {idx} [, {end}])	Number/Blob
-					remove bytes {idx}-{end} from {blob}
-remove({dict}, {key})		any	remove entry {key} from {dict}
-rename({from}, {to})		Number	rename (move) file from {from} to {to}
-repeat({expr}, {count})		String	repeat {expr} {count} times
-resolve({filename})		String	get filename a shortcut points to
-reverse({list})			List	reverse {list} in-place
-round({expr})			Float	round off {expr}
-rubyeval({expr})		any	evaluate |Ruby| expression
-rpcnotify({channel}, {event} [, {args}...])
-				Sends an |RPC| notification to {channel}
-rpcrequest({channel}, {method} [, {args}...])
-				Sends an |RPC| request to {channel}
-screenattr({row}, {col})	Number	attribute at screen position
-screenchar({row}, {col})	Number	character at screen position
-screenchars({row}, {col})	List	List of characters at screen position
-screencol()			Number	current cursor column
-screenpos({winid}, {lnum}, {col}) Dict	screen row and col of a text character
-screenrow()			Number	current cursor row
-screenstring({row}, {col})	String	characters at screen position
-search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
-				Number	search for {pattern}
-searchcount([{options}])	Dict	Get or update the last search count
-searchdecl({name} [, {global} [, {thisblock}]])
-				Number	search for variable declaration
-searchpair({start}, {middle}, {end} [, {flags} [, {skip} [...]]])
-				Number	search for other end of start/end pair
-searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [...]]])
-				List	search for other end of start/end pair
-searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
-				List	search for {pattern}
-serverlist()			String	get a list of available servers
-setbufline({expr}, {lnum}, {text})
-				Number	set line {lnum} to {text} in buffer
-					{expr}
-setbufvar({buf}, {varname}, {val})	set {varname} in buffer {buf} to {val}
-setcellwidths({list})		none	set character cell width overrides
-setcharpos({expr}, {list})	Number	set the {expr} position to {list}
-setcharsearch({dict})		Dict	set character search from {dict}
-setcmdline({str} [, {pos}])	Number	set command-line
-setcmdpos({pos})		Number	set cursor position in command-line
-setcursorcharpos({list})	Number	move cursor to position in {list}
-setenv({name}, {val})		none	set environment variable
-setfperm({fname}, {mode}	Number	set {fname} file permissions to {mode}
-setline({lnum}, {line})		Number	set line {lnum} to {line}
-setloclist({nr}, {list} [, {action}])
-				Number	modify location list using {list}
-setloclist({nr}, {list}, {action}, {what})
-				Number	modify specific location list props
-setmatches({list} [, {win}])	Number	restore a list of matches
-setpos({expr}, {list})		Number	set the {expr} position to {list}
-setqflist({list} [, {action}])	Number	modify quickfix list using {list}
-setqflist({list}, {action}, {what})
-				Number	modify specific quickfix list props
-setreg({n}, {v} [, {opt}])	Number	set register to value and type
-settabvar({nr}, {varname}, {val})	set {varname} in tab page {nr} to {val}
-settabwinvar({tabnr}, {winnr}, {varname}, {val})    set {varname} in window
-					{winnr} in tab page {tabnr} to {val}
-settagstack({nr}, {dict} [, {action}])
-				Number	modify tag stack using {dict}
-setwinvar({nr}, {varname}, {val})	set {varname} in window {nr} to {val}
-sha256({string})		String	SHA256 checksum of {string}
-shellescape({string} [, {special}])
-				String	escape {string} for use as shell
-					command argument
-shiftwidth([{col}])		Number	effective value of 'shiftwidth'
-sign_define({name} [, {dict}])	Number	define or update a sign
-sign_define({list})		List	define or update a list of signs
-sign_getdefined([{name}])	List	get a list of defined signs
-sign_getplaced([{buf} [, {dict}]])
-				List	get a list of placed signs
-sign_jump({id}, {group}, {buf})
-				Number	jump to a sign
-sign_place({id}, {group}, {name}, {buf} [, {dict}])
-				Number	place a sign
-sign_placelist({list})		List	place a list of signs
-sign_undefine([{name}])		Number	undefine a sign
-sign_undefine({list})		List	undefine a list of signs
-sign_unplace({group} [, {dict}])
-				Number	unplace a sign
-sign_unplacelist({list})	List	unplace a list of signs
-simplify({filename})		String	simplify filename as much as possible
-sin({expr})			Float	sine of {expr}
-sinh({expr})			Float	hyperbolic sine of {expr}
-sockconnect({mode}, {address} [, {opts}])
-				Number	Connects to socket
-sort({list} [, {func} [, {dict}]])
-				List	sort {list}, using {func} to compare
-soundfold({word})		String	sound-fold {word}
-spellbadword()			String	badly spelled word at cursor
-spellsuggest({word} [, {max} [, {capital}]])
-				List	spelling suggestions
-split({expr} [, {pat} [, {keepempty}]])
-				List	make |List| from {pat} separated {expr}
-sqrt({expr})			Float	square root of {expr}
-srand([{expr}])			List	get seed for |rand()|
-stdioopen({dict})		Number	open stdio in a headless instance.
-stdpath({what})			String/List  returns the standard path(s) for {what}
-str2float({expr} [, {quoted}])	Float	convert String to Float
-str2list({expr} [, {utf8}])	List	convert each character of {expr} to
-					ASCII/UTF-8 value
-str2nr({expr} [, {base} [, {quoted}]])
-				Number	convert String to Number
-strcharlen({expr})		Number	character length of the String {expr}
-strcharpart({str}, {start} [, {len}])
-				String	{len} characters of {str} at
-					character {start}
-strchars({expr} [, {skipcc}])	Number	character count of the String {expr}
-strdisplaywidth({expr} [, {col}]) Number display length of the String {expr}
-strftime({format} [, {time}])	String	format time with a specified format
-strgetchar({str}, {index})	Number	get char {index} from {str}
-stridx({haystack}, {needle} [, {start}])
-				Number	index of {needle} in {haystack}
-string({expr})			String	String representation of {expr} value
-strlen({expr})			Number	length of the String {expr}
-strpart({str}, {start} [, {len} [, {chars}]])
-				String	{len} bytes/chars of {str} at
-					byte {start}
-strptime({format}, {timestring})
-				Number	Convert {timestring} to unix timestamp
-strridx({haystack}, {needle} [, {start}])
-				Number	last index of {needle} in {haystack}
-strtrans({expr})		String	translate string to make it printable
-strwidth({expr})		Number	display cell length of the String {expr}
-submatch({nr} [, {list}])	String or List
-					specific match in ":s" or substitute()
-substitute({expr}, {pat}, {sub}, {flags})
-				String	all {pat} in {expr} replaced with {sub}
-swapinfo({fname})		Dict	information about swap file {fname}
-swapname({buf})			String	swap file of buffer {buf}
-synID({lnum}, {col}, {trans})	Number	syntax ID at {lnum} and {col}
-synIDattr({synID}, {what} [, {mode}])
-				String	attribute {what} of syntax ID {synID}
-synIDtrans({synID})		Number	translated syntax ID of {synID}
-synconcealed({lnum}, {col})	List	info about concealing
-synstack({lnum}, {col})	List	stack of syntax IDs at {lnum} and {col}
-system({cmd} [, {input}])	String	output of shell command/filter {cmd}
-systemlist({cmd} [, {input}])	List	output of shell command/filter {cmd}
-tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
-tabpagenr([{arg}])		Number	number of current or last tab page
-tabpagewinnr({tabarg} [, {arg}])
-				Number	number of current window in tab page
-tagfiles()			List	tags files used
-taglist({expr} [, {filename}])	List	list of tags matching {expr}
-tan({expr})			Float	tangent of {expr}
-tanh({expr})			Float	hyperbolic tangent of {expr}
-tempname()			String	name for a temporary file
-test_garbagecollect_now()	none	free memory right now for testing
-timer_info([{id}])		List	information about timers
-timer_pause({id}, {pause})	none	pause or unpause a timer
-timer_start({time}, {callback} [, {options}])
-				Number	create a timer
-timer_stop({timer})		none	stop a timer
-timer_stopall()			none	stop all timers
-tolower({expr})			String	the String {expr} switched to lowercase
-toupper({expr})			String	the String {expr} switched to uppercase
-tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
-					to chars in {tostr}
-trim({text} [, {mask} [, {dir}]])
-				String	trim characters in {mask} from {text}
-trunc({expr})			Float	truncate Float {expr}
-type({name})			Number	type of variable {name}
-undofile({name})		String	undo file name for {name}
-undotree()			List	undo file tree
-uniq({list} [, {func} [, {dict}]])
-				List	remove adjacent duplicates from a list
-values({dict})			List	values in {dict}
-virtcol({expr})			Number	screen column of cursor or mark
-virtcol2col({winid}, {lnum}, {col})
-				Number  byte index of a character on screen
-visualmode([expr])		String	last visual mode used
-wait({timeout}, {condition} [, {interval}])
-				Number	Wait until {condition} is satisfied
-wildmenumode()			Number	whether 'wildmenu' mode is active
-win_execute({id}, {command} [, {silent}])
-				String	execute {command} in window {id}
-win_findbuf({bufnr})		List	find windows containing {bufnr}
-win_getid([{win} [, {tab}]])	Number	get |window-ID| for {win} in {tab}
-win_gettype([{nr}])		String	type of window {nr}
-win_gotoid({expr})		Number	go to |window-ID| {expr}
-win_id2tabwin({expr})		List	get tab and window nr from |window-ID|
-win_id2win({expr})		Number	get window nr from |window-ID|
-win_move_separator({nr})	Number	move window vertical separator
-win_move_statusline({nr})	Number	move window status line
-win_screenpos({nr})		List	get screen position of window {nr}
-win_splitmove({nr}, {target} [, {options}])
-				Number	move window {nr} to split of {target}
-winbufnr({nr})			Number	buffer number of window {nr}
-wincol()			Number	window column of the cursor
-windowsversion()		String	MS-Windows OS version
-winheight({nr})			Number	height of window {nr}
-winlayout([{tabnr}])		List	layout of windows in tab {tabnr}
-winline()			Number	window line of the cursor
-winnr([{expr}])			Number	number of current window
-winrestcmd()			String	returns command to restore window sizes
-winrestview({dict})		none	restore view of current window
-winsaveview()			Dict	save view of current window
-winwidth({nr})			Number	width of window {nr}
-wordcount()			Dict	get byte/char/word statistics
-writefile({object}, {fname} [, {flags}])
-				Number	write |Blob| or |List| of lines to file
-xor({expr}, {expr})		Number	bitwise XOR
-
 ==============================================================================
-2. Details					*builtin-function-details*
-
-Not all functions are here, some have been moved to a help file covering the
-specific functionality.
+1. Details					*builtin-function-details*
 
-abs({expr})							*abs()*
+abs({expr})                                                              *abs()*
 		Return the absolute value of {expr}.  When {expr} evaluates to
 		a |Float| abs() returns a |Float|.  When {expr} can be
 		converted to a |Number| abs() returns a |Number|.  Otherwise
 		abs() gives an error message and returns -1.
-		Examples: >
+		Examples: >vim
 			echo abs(1.456)
-<			1.456  >
+<			1.456  >vim
 			echo abs(-5.456)
-<			5.456  >
+<			5.456  >vim
 			echo abs(-4)
 <			4
 
-		Can also be used as a |method|: >
-			Compute()->abs()
-
-acos({expr})							*acos()*
+acos({expr})                                                            *acos()*
 		Return the arc cosine of {expr} measured in radians, as a
 		|Float| in the range of [0, pi].
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		[-1, 1].
 		Returns NaN if {expr} is outside the range [-1, 1].  Returns
 		0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo acos(0)
-<			1.570796 >
-			:echo acos(-0.5)
+		Examples: >vim
+			echo acos(0)
+<			1.570796 >vim
+			echo acos(-0.5)
 <			2.094395
 
-		Can also be used as a |method|: >
-			Compute()->acos()
-
-add({object}, {expr})					*add()*
+add({object}, {expr})                                                    *add()*
 		Append the item {expr} to |List| or |Blob| {object}.  Returns
-		the resulting |List| or |Blob|.  Examples: >
-			:let alist = add([1, 2, 3], item)
-			:call add(mylist, "woodstock")
+		the resulting |List| or |Blob|.  Examples: >vim
+			let alist = add([1, 2, 3], item)
+			call add(mylist, "woodstock")
 <		Note that when {expr} is a |List| it is appended as a single
 		item.  Use |extend()| to concatenate |Lists|.
 		When {object} is a |Blob| then {expr} must be a number.
 		Use |insert()| to add an item at another position.
 		Returns 1 if {object} is not a |List| or a |Blob|.
 
-		Can also be used as a |method|: >
-			mylist->add(val1)->add(val2)
-
-and({expr}, {expr})					*and()*
+and({expr}, {expr})                                                      *and()*
 		Bitwise AND on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
-		Example: >
-			:let flag = and(bits, 0x80)
-<		Can also be used as a |method|: >
-			:let flag = bits->and(0x80)
+		Also see `or()` and `xor()`.
+		Example: >vim
+			let flag = and(bits, 0x80)
+<
 
-api_info()						*api_info()*
+api_info()                                                          *api_info()*
 		Returns Dictionary of |api-metadata|.
 
-		View it in a nice human-readable format: >
-		       :lua print(vim.inspect(vim.fn.api_info()))
+		View it in a nice human-readable format: >vim
+		       lua vim.print(vim.fn.api_info())
+<
 
-append({lnum}, {text})					*append()*
+append({lnum}, {text})                                                *append()*
 		When {text} is a |List|: Append each item of the |List| as a
 		text line below line {lnum} in the current buffer.
 		Otherwise append {text} as one text line below line {lnum} in
@@ -644,14 +73,13 @@ append({lnum}, {text})					*append()*
 		{lnum} can be zero to insert a line before the first one.
 		{lnum} is used like with |getline()|.
 		Returns 1 for failure ({lnum} out of range or out of memory),
-		0 for success.  Example: >
-			:let failed = append(line('$'), "# THE END")
-			:let failed = append(0, ["Chapter 1", "the beginning"])
-
-<		Can also be used as a |method| after a List: >
-			mylist->append(lnum)
+		0 for success.  When {text} is an empty list zero is returned,
+		no matter the value of {lnum}.  Example: >vim
+			let failed = append(line('$'), "# THE END")
+			let failed = append(0, ["Chapter 1", "the beginning"])
+<
 
-appendbufline({buf}, {lnum}, {text})			*appendbufline()*
+appendbufline({buf}, {lnum}, {text})                           *appendbufline()*
 		Like |append()| but append the text in buffer {expr}.
 
 		This function works only for loaded buffers. First call
@@ -667,13 +95,12 @@ appendbufline({buf}, {lnum}, {text})			*appendbufline()*
 		On success 0 is returned, on failure 1 is returned.
 
 		If {buf} is not a valid buffer or {lnum} is not valid, an
-		error message is given. Example: >
-			:let failed = appendbufline(13, 0, "# THE START")
-<
-		Can also be used as a |method| after a List: >
-			mylist->appendbufline(buf, lnum)
+		error message is given. Example: >vim
+			let failed = appendbufline(13, 0, "# THE START")
+<		However, when {text} is an empty list then no error is given
+		for an invalid {lnum}, since {lnum} isn't actually used.
 
-argc([{winid}])					*argc()*
+argc([{winid}])                                                         *argc()*
 		The result is the number of files in the argument list.  See
 		|arglist|.
 		If {winid} is not supplied, the argument list of the current
@@ -683,12 +110,11 @@ argc([{winid}])					*argc()*
 		list is used: either the window number or the window ID.
 		Returns -1 if the {winid} argument is invalid.
 
-							*argidx()*
-argidx()	The result is the current index in the argument list.  0 is
+argidx()                                                              *argidx()*
+		The result is the current index in the argument list.  0 is
 		the first file.  argc() - 1 is the last one.  See |arglist|.
 
-							*arglistid()*
-arglistid([{winnr} [, {tabnr}]])
+arglistid([{winnr} [, {tabnr}]])                                   *arglistid()*
 		Return the argument list ID.  This is a number which
 		identifies the argument list being used.  Zero is used for the
 		global argument list.  See |arglist|.
@@ -700,16 +126,15 @@ arglistid([{winnr} [, {tabnr}]])
 		page.
 		{winnr} can be the window number or the |window-ID|.
 
-							*argv()*
-argv([{nr} [, {winid}]])
+argv([{nr} [, {winid}]])                                                *argv()*
 		The result is the {nr}th file in the argument list.  See
-		|arglist|.  "argv(0)" is the first one.  Example: >
-	:let i = 0
-	:while i < argc()
-	:  let f = escape(fnameescape(argv(i)), '.')
-	:  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
-	:  let i = i + 1
-	:endwhile
+		|arglist|.  "argv(0)" is the first one.  Example: >vim
+			let i = 0
+			while i < argc()
+			  let f = escape(fnameescape(argv(i)), '.')
+			  exe 'amenu Arg.' .. f .. ' :e ' .. f .. '<CR>'
+			  let i = i + 1
+			endwhile
 <		Without the {nr} argument, or when {nr} is -1, a |List| with
 		the whole |arglist| is returned.
 
@@ -720,57 +145,193 @@ argv([{nr} [, {winid}]])
 		the argument list.  Returns an empty List if the {winid}
 		argument is invalid.
 
-asin({expr})						*asin()*
+asin({expr})                                                            *asin()*
 		Return the arc sine of {expr} measured in radians, as a |Float|
 		in the range of [-pi/2, pi/2].
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		[-1, 1].
 		Returns NaN if {expr} is outside the range [-1, 1].  Returns
 		0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo asin(0.8)
-<			0.927295 >
-			:echo asin(-0.5)
+		Examples: >vim
+			echo asin(0.8)
+<			0.927295 >vim
+			echo asin(-0.5)
 <			-0.523599
 
-		Can also be used as a |method|: >
-			Compute()->asin()
-
-
-assert_ functions are documented here: |assert-functions-details|
-
-
-atan({expr})						*atan()*
+assert_beeps({cmd})                                             *assert_beeps()*
+		Run {cmd} and add an error message to |v:errors| if it does
+		NOT produce a beep or visual bell.
+		Also see |assert_fails()|, |assert_nobeep()| and
+		|assert-return|.
+
+assert_equal({expected}, {actual} [, {msg}])                    *assert_equal()*
+		When {expected} and {actual} are not equal an error message is
+		added to |v:errors| and 1 is returned.  Otherwise zero is
+		returned. |assert-return|
+		The error is in the form "Expected {expected} but got
+		{actual}".  When {msg} is present it is prefixed to that.
+
+		There is no automatic conversion, the String "4" is different
+		from the Number 4.  And the number 4 is different from the
+		Float 4.0.  The value of 'ignorecase' is not used here, case
+		always matters.
+		Example: >vim
+			assert_equal('foo', 'bar')
+<		Will result in a string to be added to |v:errors|:
+			test.vim line 12: Expected 'foo' but got 'bar' ~
+
+assert_equalfile({fname-one}, {fname-two})                  *assert_equalfile()*
+		When the files {fname-one} and {fname-two} do not contain
+		exactly the same text an error message is added to |v:errors|.
+		Also see |assert-return|.
+		When {fname-one} or {fname-two} does not exist the error will
+		mention that.
+
+assert_exception({error} [, {msg}])                         *assert_exception()*
+		When v:exception does not contain the string {error} an error
+		message is added to |v:errors|.  Also see |assert-return|.
+		This can be used to assert that a command throws an exception.
+		Using the error number, followed by a colon, avoids problems
+		with translations: >vim
+			try
+			  commandthatfails
+			  call assert_false(1, 'command should have failed')
+			catch
+			  call assert_exception('E492:')
+			endtry
+<
+
+                                                                *assert_fails()*
+assert_fails({cmd} [, {error} [, {msg} [, {lnum} [, {context}]]]])
+		Run {cmd} and add an error message to |v:errors| if it does
+		NOT produce an error or when {error} is not found in the
+		error message.  Also see |assert-return|.
+
+		When {error} is a string it must be found literally in the
+		first reported error. Most often this will be the error code,
+		including the colon, e.g. "E123:". >vim
+			assert_fails('bad cmd', 'E987:')
+<
+		When {error} is a |List| with one or two strings, these are
+		used as patterns.  The first pattern is matched against the
+		first reported error: >vim
+			assert_fails('cmd', ['E987:.*expected bool'])
+<		The second pattern, if present, is matched against the last
+		reported error.  To only match the last error use an empty
+		string for the first error: >vim
+			assert_fails('cmd', ['', 'E987:'])
+<
+		If {msg} is empty then it is not used.  Do this to get the
+		default message when passing the {lnum} argument.
+
+		When {lnum} is present and not negative, and the {error}
+		argument is present and matches, then this is compared with
+		the line number at which the error was reported. That can be
+		the line number in a function or in a script.
+
+		When {context} is present it is used as a pattern and matched
+		against the context (script name or function name) where
+		{lnum} is located in.
+
+		Note that beeping is not considered an error, and some failing
+		commands only beep.  Use |assert_beeps()| for those.
+
+assert_false({actual} [, {msg}])                                *assert_false()*
+		When {actual} is not false an error message is added to
+		|v:errors|, like with |assert_equal()|.
+		The error is in the form "Expected False but got {actual}".
+		When {msg} is present it is prepended to that.
+		Also see |assert-return|.
+
+		A value is false when it is zero. When {actual} is not a
+		number the assert fails.
+
+assert_inrange({lower}, {upper}, {actual} [, {msg}])          *assert_inrange()*
+		This asserts number and |Float| values.  When {actual}  is lower
+		than {lower} or higher than {upper} an error message is added
+		to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Expected range {lower} - {upper},
+		but got {actual}".  When {msg} is present it is prefixed to
+		that.
+
+assert_match({pattern}, {actual} [, {msg}])                     *assert_match()*
+		When {pattern} does not match {actual} an error message is
+		added to |v:errors|.  Also see |assert-return|.
+		The error is in the form "Pattern {pattern} does not match
+		{actual}".  When {msg} is present it is prefixed to that.
+
+		{pattern} is used as with |expr-=~|: The matching is always done
+		like 'magic' was set and 'cpoptions' is empty, no matter what
+		the actual value of 'magic' or 'cpoptions' is.
+
+		{actual} is used as a string, automatic conversion applies.
+		Use "^" and "$" to match with the start and end of the text.
+		Use both to match the whole text.
+
+		Example: >vim
+			assert_match('^f.*o$', 'foobar')
+<		Will result in a string to be added to |v:errors|:
+			test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
+
+assert_nobeep({cmd})                                           *assert_nobeep()*
+		Run {cmd} and add an error message to |v:errors| if it
+		produces a beep or visual bell.
+		Also see |assert_beeps()|.
+
+assert_notequal({expected}, {actual} [, {msg}])              *assert_notequal()*
+		The opposite of `assert_equal()`: add an error message to
+		|v:errors| when {expected} and {actual} are equal.
+		Also see |assert-return|.
+
+assert_notmatch({pattern}, {actual} [, {msg}])               *assert_notmatch()*
+		The opposite of `assert_match()`: add an error message to
+		|v:errors| when {pattern} matches {actual}.
+		Also see |assert-return|.
+
+assert_report({msg})                                           *assert_report()*
+		Report a test failure directly, using String {msg}.
+		Always returns one.
+
+assert_true({actual} [, {msg}])                                  *assert_true()*
+		When {actual} is not true an error message is added to
+		|v:errors|, like with |assert_equal()|.
+		Also see |assert-return|.
+		A value is |TRUE| when it is a non-zero number or |v:true|.
+		When {actual} is not a number or |v:true| the assert fails.
+		When {msg} is given it precedes the default message.
+
+atan({expr})                                                            *atan()*
 		Return the principal value of the arc tangent of {expr}, in
 		the range [-pi/2, +pi/2] radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo atan(100)
-<			1.560797 >
-			:echo atan(-4.01)
+		Examples: >vim
+			echo atan(100)
+<			1.560797 >vim
+			echo atan(-4.01)
 <			-1.326405
 
-		Can also be used as a |method|: >
-			Compute()->atan()
-
-atan2({expr1}, {expr2})					*atan2()*
+atan2({expr1}, {expr2})                                                *atan2()*
 		Return the arc tangent of {expr1} / {expr2}, measured in
 		radians, as a |Float| in the range [-pi, pi].
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 		|Number|.
-		Examples: >
-			:echo atan2(-1, 1)
-<			-0.785398 >
-			:echo atan2(1, -1)
+		Examples: >vim
+			echo atan2(-1, 1)
+<			-0.785398 >vim
+			echo atan2(1, -1)
 <			2.356194
 
-		Can also be used as a |method|: >
-			Compute()->atan2(1)
+blob2list({blob})                                                  *blob2list()*
+		Return a List containing the number value of each byte in Blob
+		{blob}.  Examples: >vim
+			blob2list(0z0102.0304)	" returns [1, 2, 3, 4]
+			blob2list(0z)		" returns []
+<		Returns an empty List on error.  |list2blob()| does the
+		opposite.
 
-							*browse()*
-browse({save}, {title}, {initdir}, {default})
+browse({save}, {title}, {initdir}, {default})                         *browse()*
 		Put up a file requester.  This only works when "has("browse")"
 		returns |TRUE| (only in some GUI versions).
 		The input fields are:
@@ -781,8 +342,7 @@ browse({save}, {title}, {initdir}, {default})
 		An empty string is returned when the "Cancel" button is hit,
 		something went wrong, or browsing is not possible.
 
-							*browsedir()*
-browsedir({title}, {initdir})
+browsedir({title}, {initdir})                                      *browsedir()*
 		Put up a directory requester.  This only works when
 		"has("browse")" returns |TRUE| (only in some GUI versions).
 		On systems where a directory browser is not supported a file
@@ -794,7 +354,7 @@ browsedir({title}, {initdir})
 		When the "Cancel" button is hit, something went wrong, or
 		browsing is not possible, an empty string is returned.
 
-bufadd({name})						*bufadd()*
+bufadd({name})                                                        *bufadd()*
 		Add a buffer to the buffer list with name {name} (must be a
 		String).
 		If a buffer for file {name} already exists, return that buffer
@@ -802,15 +362,13 @@ bufadd({name})						*bufadd()*
 		created buffer.  When {name} is an empty string then a new
 		buffer is always created.
 		The buffer will not have 'buflisted' set and not be loaded
-		yet.  To add some text to the buffer use this: >
+		yet.  To add some text to the buffer use this: >vim
 			let bufnr = bufadd('someName')
 			call bufload(bufnr)
 			call setbufline(bufnr, 1, ['some', 'text'])
 <		Returns 0 on error.
-		Can also be used as a |method|: >
-			let bufnr = 'somename'->bufadd()
 
-bufexists({buf})					*bufexists()*
+bufexists({buf})                                                   *bufexists()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists.
 		If the {buf} argument is a number, buffer numbers are used.
@@ -832,39 +390,27 @@ bufexists({buf})					*bufexists()*
 		Use "bufexists(0)" to test for the existence of an alternate
 		file name.
 
-		Can also be used as a |method|: >
-			let exists = 'somename'->bufexists()
-
-buflisted({buf})					*buflisted()*
+buflisted({buf})                                                   *buflisted()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is listed (has the 'buflisted' option set).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
-			let listed = 'somename'->buflisted()
-
-bufload({buf})						*bufload()*
+bufload({buf})                                                       *bufload()*
 		Ensure the buffer {buf} is loaded.  When the buffer name
 		refers to an existing file then the file is read.  Otherwise
 		the buffer will be empty.  If the buffer was already loaded
 		then there is no change.  If the buffer is not related to a
-		file the no file is read (e.g., when 'buftype' is "nofile").
+		file then no file is read (e.g., when 'buftype' is "nofile").
 		If there is an existing swap file for the file of the buffer,
 		there will be no dialog, the buffer will be loaded anyway.
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
-			eval 'somename'->bufload()
-
-bufloaded({buf})					*bufloaded()*
+bufloaded({buf})                                                   *bufloaded()*
 		The result is a Number, which is |TRUE| if a buffer called
 		{buf} exists and is loaded (shown in a window or hidden).
 		The {buf} argument is used like with |bufexists()|.
 
-		Can also be used as a |method|: >
-			let loaded = 'somename'->bufloaded()
-
-bufname([{buf}])						*bufname()*
+bufname([{buf}])                                                     *bufname()*
 		The result is the name of a buffer.  Mostly as it is displayed
 		by the `:ls` command, but not using special names such as
 		"[No Name]".
@@ -885,65 +431,53 @@ bufname([{buf}])						*bufname()*
 		with a listed buffer, that one is returned.  Next unlisted
 		buffers are searched for.
 		If the {buf} is a String, but you want to use it as a buffer
-		number, force it to be a Number by adding zero to it: >
-			:echo bufname("3" + 0)
-<		Can also be used as a |method|: >
-			echo bufnr->bufname()
-
+		number, force it to be a Number by adding zero to it: >vim
+			echo bufname("3" + 0)
 <		If the buffer doesn't exist, or doesn't have a name, an empty
-		string is returned. >
-	bufname("#")		alternate buffer name
-	bufname(3)		name of buffer 3
-	bufname("%")		name of current buffer
-	bufname("file2")	name of buffer where "file2" matches.
-<
-							*bufnr()*
-bufnr([{buf} [, {create}]])
+		string is returned. >vim
+			echo bufname("#")	" alternate buffer name
+			echo bufname(3)		" name of buffer 3
+			echo bufname("%")	" name of current buffer
+			echo bufname("file2")	" name of buffer where "file2" matches.
+<
+
+bufnr([{buf} [, {create}]])                                            *bufnr()*
 		The result is the number of a buffer, as it is displayed by
 		the `:ls` command.  For the use of {buf}, see |bufname()|
 		above.
 		If the buffer doesn't exist, -1 is returned.  Or, if the
 		{create} argument is present and TRUE, a new, unlisted,
 		buffer is created and its number is returned.
-		bufnr("$") is the last buffer: >
-			:let last_buffer = bufnr("$")
+		bufnr("$") is the last buffer: >vim
+			let last_buffer = bufnr("$")
 <		The result is a Number, which is the highest buffer number
 		of existing buffers.  Note that not all buffers with a smaller
 		number necessarily exist, because ":bwipeout" may have removed
 		them.  Use bufexists() to test for the existence of a buffer.
 
-		Can also be used as a |method|: >
-			echo bufref->bufnr()
-
-bufwinid({buf})						*bufwinid()*
+bufwinid({buf})                                                     *bufwinid()*
 		The result is a Number, which is the |window-ID| of the first
 		window associated with buffer {buf}.  For the use of {buf},
 		see |bufname()| above.  If buffer {buf} doesn't exist or
-		there is no such window, -1 is returned.  Example: >
+		there is no such window, -1 is returned.  Example: >vim
 
-	echo "A window containing buffer 1 is " .. (bufwinid(1))
+			echo "A window containing buffer 1 is " .. (bufwinid(1))
 <
 		Only deals with the current tab page.  See |win_findbuf()| for
 		finding more.
 
-		Can also be used as a |method|: >
-			FindBuffer()->bufwinid()
-
-bufwinnr({buf})						*bufwinnr()*
+bufwinnr({buf})                                                     *bufwinnr()*
 		Like |bufwinid()| but return the window number instead of the
 		|window-ID|.
 		If buffer {buf} doesn't exist or there is no such window, -1
-		is returned.  Example: >
+		is returned.  Example: >vim
 
-	echo "A window containing buffer 1 is " .. (bufwinnr(1))
+			echo "A window containing buffer 1 is " .. (bufwinnr(1))
 
 <		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
 
-		Can also be used as a |method|: >
-			FindBuffer()->bufwinnr()
-
-byte2line({byte})					*byte2line()*
+byte2line({byte})                                                  *byte2line()*
 		Return the line number that contains the character at byte
 		count {byte} in the current buffer.  This includes the
 		end-of-line character, depending on the 'fileformat' option
@@ -953,10 +487,7 @@ byte2line({byte})					*byte2line()*
 
 		Returns -1 if the {byte} value is invalid.
 
-		Can also be used as a |method|: >
-			GetOffset()->byte2line()
-
-byteidx({expr}, {nr})					*byteidx()*
+byteidx({expr}, {nr} [, {utf16}])                                    *byteidx()*
 		Return byte index of the {nr}th character in the String
 		{expr}.  Use zero for the first character, it then returns
 		zero.
@@ -966,10 +497,17 @@ byteidx({expr}, {nr})					*byteidx()*
 		length is added to the preceding base character.  See
 		|byteidxcomp()| below for counting composing characters
 		separately.
-		Example : >
+		When {utf16} is present and TRUE, {nr} is used as the UTF-16
+		index in the String {expr} instead of as the character index.
+		The UTF-16 index is the index in the string when it is encoded
+		with 16-bit words.  If the specified UTF-16 index is in the
+		middle of a character (e.g. in a 4-byte character), then the
+		byte index of the first byte in the character is returned.
+		Refer to |string-offset-encoding| for more information.
+		Example : >vim
 			echo matchstr(str, ".", byteidx(str, 3))
 <		will display the fourth character.  Another way to do the
-		same: >
+		same: >vim
 			let s = strpart(str, byteidx(str, 3))
 			echo strpart(s, 0, byteidx(s, 1))
 <		Also see |strgetchar()| and |strcharpart()|.
@@ -977,13 +515,17 @@ byteidx({expr}, {nr})					*byteidx()*
 		If there are less than {nr} characters -1 is returned.
 		If there are exactly {nr} characters the length of the string
 		in bytes is returned.
+		See |charidx()| and |utf16idx()| for getting the character and
+		UTF-16 index respectively from the byte index.
+		Examples: >vim
+			echo byteidx('a😊😊', 2)	" returns 5
+			echo byteidx('a😊😊', 2, 1)	" returns 1
+			echo byteidx('a😊😊', 3, 1)	" returns 5
+<
 
-		Can also be used as a |method|: >
-			GetName()->byteidx(idx)
-
-byteidxcomp({expr}, {nr})					*byteidxcomp()*
+byteidxcomp({expr}, {nr} [, {utf16}])                            *byteidxcomp()*
 		Like byteidx(), except that a composing character is counted
-		as a separate character.  Example: >
+		as a separate character.  Example: >vim
 			let s = 'e' .. nr2char(0x301)
 			echo byteidx(s, 1)
 			echo byteidxcomp(s, 1)
@@ -992,10 +534,7 @@ byteidxcomp({expr}, {nr})					*byteidxcomp()*
 		character is 3 bytes), the second echo results in 1 ('e' is
 		one byte).
 
-		Can also be used as a |method|: >
-			GetName()->byteidxcomp(idx)
-
-call({func}, {arglist} [, {dict}])			*call()* *E699*
+call({func}, {arglist} [, {dict}])                                 *call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
 		arguments.
 		{func} can either be a |Funcref| or the name of a function.
@@ -1004,36 +543,21 @@ call({func}, {arglist} [, {dict}])			*call()* *E699*
 		{dict} is for functions with the "dict" attribute.  It will be
 		used to set the local variable "self". |Dictionary-function|
 
-		Can also be used as a |method|: >
-			GetFunc()->call([arg, arg], dict)
-
-ceil({expr})							*ceil()*
+ceil({expr})                                                            *ceil()*
 		Return the smallest integral value greater than or equal to
 		{expr} as a |Float| (round up).
 		{expr} must evaluate to a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo ceil(1.456)
-<			2.0  >
+<			2.0  >vim
 			echo ceil(-5.456)
-<			-5.0  >
+<			-5.0  >vim
 			echo ceil(4.0)
 <			4.0
 
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
 
-		Can also be used as a |method|: >
-			Compute()->ceil()
-
-changenr()						*changenr()*
-		Return the number of the most recent change.  This is the same
-		number as what is displayed with |:undolist| and can be used
-		with the |:undo| command.
-		When a change was made it is the number of that change.  After
-		redo it is the number of the redone change.  After undo it is
-		one less than the number of the undone change.
-		Returns 0 if the undo list is empty.
-
-chanclose({id} [, {stream}])				*chanclose()*
+chanclose({id} [, {stream}])                                       *chanclose()*
 		Close a channel or a specific stream associated with it.
 		For a job, {stream} can be one of "stdin", "stdout",
 		"stderr" or "rpc" (closes stdin/stdout for a job started
@@ -1043,7 +567,16 @@ chanclose({id} [, {stream}])				*chanclose()*
 		For a socket, there is only one stream, and {stream} should be
 		omitted.
 
-chansend({id}, {data})					*chansend()*
+changenr()                                                          *changenr()*
+		Return the number of the most recent change.  This is the same
+		number as what is displayed with |:undolist| and can be used
+		with the |:undo| command.
+		When a change was made it is the number of that change.  After
+		redo it is the number of the redone change.  After undo it is
+		one less than the number of the undone change.
+		Returns 0 if the undo list is empty.
+
+chansend({id}, {data})                                              *chansend()*
 		Send data to channel {id}. For a job, it writes it to the
 		stdin of the process. For the stdio channel |channel-stdio|,
 		it writes to Nvim's stdout.  Returns the number of bytes
@@ -1053,23 +586,22 @@ chansend({id}, {data})					*chansend()*
 		{data} may be a string, string convertible, |Blob|, or a list.
 		If {data} is a list, the items will be joined by newlines; any
 		newlines in an item will be sent as NUL. To send a final
-		newline, include a final empty string. Example: >
-			:call chansend(id, ["abc", "123\n456", ""])
-< 		will send "abc<NL>123<NUL>456<NL>".
+		newline, include a final empty string. Example: >vim
+			call chansend(id, ["abc", "123\n456", ""])
+<		will send "abc<NL>123<NUL>456<NL>".
 
 		chansend() writes raw data, not RPC messages.  If the channel
 		was created with `"rpc":v:true` then the channel expects RPC
 		messages, use |rpcnotify()| and |rpcrequest()| instead.
 
-
-char2nr({string} [, {utf8}])					*char2nr()*
+char2nr({string} [, {utf8}])                                         *char2nr()*
 		Return Number value of the first char in {string}.
-		Examples: >
-			char2nr(" ")		returns 32
-			char2nr("ABC")		returns 65
-			char2nr("á")		returns 225
-			char2nr("á"[0])		returns 195
-			char2nr("\<M-x>")	returns 128
+		Examples: >vim
+			echo char2nr(" ")	" returns 32
+			echo char2nr("ABC")	" returns 65
+			echo char2nr("á")	" returns 225
+			echo char2nr("á"[0])	" returns 195
+			echo char2nr("\<M-x>")	" returns 128
 <		Non-ASCII characters are always treated as UTF-8 characters.
 		{utf8} is ignored, it exists only for backwards-compatibility.
 		A combining character is a separate character.
@@ -1077,10 +609,7 @@ char2nr({string} [, {utf8}])					*char2nr()*
 
 		Returns 0 if {string} is not a |String|.
 
-		Can also be used as a |method|: >
-			GetChar()->char2nr()
-
-charclass({string})					*charclass()*
+charclass({string})                                                *charclass()*
 		Return the character class of the first character in {string}.
 		The character class is one of:
 			0	blank
@@ -1091,46 +620,50 @@ charclass({string})					*charclass()*
 		The class is used in patterns and word motions.
 		Returns 0 if {string} is not a |String|.
 
-
-charcol({expr} [, {winid}])				*charcol()*
+charcol({expr} [, {winid}])                                          *charcol()*
 		Same as |col()| but returns the character index of the column
 		position given with {expr} instead of the byte position.
 
 		Example:
-		With the cursor on '세' in line 5 with text "여보세요": >
-			charcol('.')		returns 3
-			col('.')		returns 7
+		With the cursor on '세' in line 5 with text "여보세요": >vim
+			echo charcol('.')	" returns 3
+			echo col('.')		" returns 7
 
-<		Can also be used as a |method|: >
-			GetPos()->col()
-<
-							*charidx()*
-charidx({string}, {idx} [, {countcc}])
+charidx({string}, {idx} [, {countcc} [, {utf16}]])                   *charidx()*
 		Return the character index of the byte at {idx} in {string}.
 		The index of the first character is zero.
 		If there are no multibyte characters the returned value is
 		equal to {idx}.
+
 		When {countcc} is omitted or |FALSE|, then composing characters
-		are not counted separately, their byte length is
-		added to the preceding base character.
+		are not counted separately, their byte length is added to the
+		preceding base character.
 		When {countcc} is |TRUE|, then composing characters are
 		counted as separate characters.
-		Returns -1 if the arguments are invalid or if {idx} is greater
-		than the index of the last byte in {string}.  An error is
-		given if the first argument is not a string, the second
-		argument is not a number or when the third argument is present
-		and is not zero or one.
+
+		When {utf16} is present and TRUE, {idx} is used as the UTF-16
+		index in the String {expr} instead of as the byte index.
+
+		Returns -1 if the arguments are invalid or if there are less
+		than {idx} bytes. If there are exactly {idx} bytes the length
+		of the string in characters is returned.
+
+		An error is given and -1 is returned if the first argument is
+		not a string, the second argument is not a number or when the
+		third argument is present and is not zero or one.
+
 		See |byteidx()| and |byteidxcomp()| for getting the byte index
-		from the character index.
-		Examples: >
-			echo charidx('áb́ć', 3)		returns 1
-			echo charidx('áb́ć', 6, 1)	returns 4
-			echo charidx('áb́ć', 16)		returns -1
+		from the character index and |utf16idx()| for getting the
+		UTF-16 index from the character index.
+		Refer to |string-offset-encoding| for more information.
+		Examples: >vim
+			echo charidx('áb́ć', 3)		" returns 1
+			echo charidx('áb́ć', 6, 1)	" returns 4
+			echo charidx('áb́ć', 16)		" returns -1
+			echo charidx('a😊😊', 4, 0, 1)	" returns 2
 <
-		Can also be used as a |method|: >
-			GetName()->charidx(idx)
 
-chdir({dir})						*chdir()*
+chdir({dir})                                                           *chdir()*
 		Change the current working directory to {dir}.  The scope of
 		the directory change depends on the directory of the current
 		window:
@@ -1145,17 +678,14 @@ chdir({dir})						*chdir()*
 		this to another chdir() to restore the directory.
 		On failure, returns an empty string.
 
-		Example: >
+		Example: >vim
 			let save_dir = chdir(newdir)
 			if save_dir != ""
 			   " ... do some work
 			   call chdir(save_dir)
 			endif
 
-<		Can also be used as a |method|: >
-			GetDir()->chdir()
-<
-cindent({lnum})						*cindent()*
+cindent({lnum})                                                      *cindent()*
 		Get the amount of indent for line {lnum} according the C
 		indenting rules, as with 'cindent'.
 		The indent is counted in spaces, the value of 'tabstop' is
@@ -1163,19 +693,13 @@ cindent({lnum})						*cindent()*
 		When {lnum} is invalid -1 is returned.
 		See |C-indenting|.
 
-		Can also be used as a |method|: >
-			GetLnum()->cindent()
-
-clearmatches([{win}])					*clearmatches()*
+clearmatches([{win}])                                           *clearmatches()*
 		Clears all matches previously defined for the current window
 		by |matchadd()| and the |:match| commands.
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
-			GetWin()->clearmatches()
-<
-col({expr} [, {winid})					*col()*
+col({expr} [, {winid}])                                                  *col()*
 		The result is a Number, which is the byte index of the column
 		position given with {expr}.  The accepted positions are:
 		    .	    the cursor position
@@ -1198,11 +722,11 @@ col({expr} [, {winid})					*col()*
 		For the screen column position use |virtcol()|.  For the
 		character position use |charcol()|.
 		Note that only marks in the current file can be used.
-		Examples: >
-			col(".")		column of cursor
-			col("$")		length of cursor line plus one
-			col("'t")		column of mark t
-			col("'" .. markname)	column of mark markname
+		Examples: >vim
+			echo col(".")			" column of cursor
+			echo col("$")			" length of cursor line plus one
+			echo col("'t")			" column of mark t
+			echo col("'" .. markname)	" column of mark markname
 <		The first column is 1.  Returns 0 if {expr} is invalid or when
 		the window with ID {winid} is not found.
 		For an uppercase mark the column may actually be in another
@@ -1210,14 +734,10 @@ col({expr} [, {winid})					*col()*
 		For the cursor position, when 'virtualedit' is active, the
 		column is one higher if the cursor is after the end of the
 		line.  Also, when using a <Cmd> mapping the cursor isn't
-		moved, this can be used to obtain the column in Insert mode: >
-			:imap <F2> <Cmd>echo col(".").."\n"<CR>
-
-<		Can also be used as a |method|: >
-			GetPos()->col()
-<
+		moved, this can be used to obtain the column in Insert mode: >vim
+			imap <F2> <Cmd>echo col(".").."\n"<CR>
 
-complete({startcol}, {matches})			*complete()* *E785*
+complete({startcol}, {matches})                                *complete()* *E785*
 		Set the matches for Insert mode completion.
 		Can only be used in Insert mode.  You need to use a mapping
 		with CTRL-R = (see |i_CTRL-R|).  It does not work after CTRL-O
@@ -1235,23 +755,19 @@ complete({startcol}, {matches})			*complete()* *E785*
 		The match can be selected with CTRL-N and CTRL-P as usual with
 		Insert mode completion.  The popup menu will appear if
 		specified, see |ins-completion-menu|.
-		Example: >
-	inoremap <F5> <C-R>=ListMonths()<CR>
-
-	func! ListMonths()
-	  call complete(col('.'), ['January', 'February', 'March',
-		\ 'April', 'May', 'June', 'July', 'August', 'September',
-		\ 'October', 'November', 'December'])
-	  return ''
-	endfunc
+		Example: >vim
+			inoremap <F5> <C-R>=ListMonths()<CR>
+
+			func ListMonths()
+			  call complete(col('.'), ['January', 'February', 'March',
+			    \ 'April', 'May', 'June', 'July', 'August', 'September',
+			    \ 'October', 'November', 'December'])
+			  return ''
+			endfunc
 <		This isn't very useful, but it shows how it works.  Note that
 		an empty string is returned to avoid a zero being inserted.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetMatches()->complete(col('.'))
-
-complete_add({expr})				*complete_add()*
+complete_add({expr})                                            *complete_add()*
 		Add {expr} to the list of matches.  Only to be used by the
 		function specified with the 'completefunc' option.
 		Returns 0 for failure (empty string or out of memory),
@@ -1260,10 +776,7 @@ complete_add({expr})				*complete_add()*
 		See |complete-functions| for an explanation of {expr}.  It is
 		the same as one item in the list that 'omnifunc' would return.
 
-		Can also be used as a |method|: >
-			GetMoreMatches()->complete_add()
-
-complete_check()				*complete_check()*
+complete_check()                                              *complete_check()*
 		Check for a key typed while looking for completion matches.
 		This is to be used when looking for matches takes some time.
 		Returns |TRUE| when searching for matches is to be aborted,
@@ -1271,8 +784,7 @@ complete_check()				*complete_check()*
 		Only to be used by the function specified with the
 		'completefunc' option.
 
-
-complete_info([{what}])				*complete_info()*
+complete_info([{what}])                                        *complete_info()*
 		Returns a |Dictionary| with information about Insert mode
 		completion.  See |ins-completion|.
 		The items are:
@@ -1322,7 +834,7 @@ complete_info([{what}])				*complete_info()*
 
 		Returns an empty |Dictionary| on error.
 
-		Examples: >
+		Examples: >vim
 			" Get all items
 			call complete_info()
 			" Get only 'mode'
@@ -1330,11 +842,7 @@ complete_info([{what}])				*complete_info()*
 			" Get only 'mode' and 'pum_visible'
 			call complete_info(['mode', 'pum_visible'])
 
-<		Can also be used as a |method|: >
-			GetItems()->complete_info()
-<
-						*confirm()*
-confirm({msg} [, {choices} [, {default} [, {type}]]])
+confirm({msg} [, {choices} [, {default} [, {type}]]])                *confirm()*
 		confirm() offers the user a dialog, from which a choice can be
 		made.  It returns the number of the choice.  For the first
 		choice this is 1.
@@ -1346,11 +854,11 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])
 		some systems the string is wrapped when it doesn't fit.
 
 		{choices} is a String, with the individual choices separated
-		by '\n', e.g. >
+		by '\n', e.g. >vim
 			confirm("Save changes?", "&Yes\n&No\n&Cancel")
 <		The letter after the '&' is the shortcut key for that choice.
 		Thus you can type 'c' to select "Cancel".  The shortcut does
-		not need to be the first letter: >
+		not need to be the first letter: >vim
 			confirm("file has been modified", "&Save\nSave &All")
 <		For the console, the first letter of each choice is used as
 		the default shortcut key.  Case is ignored.
@@ -1369,7 +877,7 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])
 		If the user aborts the dialog by pressing <Esc>, CTRL-C,
 		or another valid interrupt key, confirm() returns 0.
 
-		An example: >
+		An example: >vim
 		   let choice = confirm("What do you want?",
 					\ "&Apples\n&Oranges\n&Bananas", 2)
 		   if choice == 0
@@ -1386,11 +894,8 @@ confirm({msg} [, {choices} [, {default} [, {type}]]])
 		don't fit, a vertical layout is used anyway.  For some systems
 		the horizontal layout is always used.
 
-		Can also be used as a |method|in: >
-			BuildMessage()->confirm("&Yes\n&No")
-<
-							*copy()*
-copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
+copy({expr})                                                            *copy()*
+		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a shallow copy is created.  This means
 		that the original |List| can be changed without changing the
@@ -1398,37 +903,29 @@ copy({expr})	Make a copy of {expr}.  For Numbers and Strings this isn't
 		changing an item changes the contents of both |Lists|.
 		A |Dictionary| is copied in a similar way as a |List|.
 		Also see |deepcopy()|.
-		Can also be used as a |method|: >
-			mylist->copy()
 
-cos({expr})						*cos()*
+cos({expr})                                                              *cos()*
 		Return the cosine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo cos(100)
-<			0.862319 >
-			:echo cos(-4.01)
+		Examples: >vim
+			echo cos(100)
+<			0.862319 >vim
+			echo cos(-4.01)
 <			-0.646043
 
-		Can also be used as a |method|: >
-			Compute()->cos()
-
-cosh({expr})						*cosh()*
+cosh({expr})                                                            *cosh()*
 		Return the hyperbolic cosine of {expr} as a |Float| in the range
 		[1, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo cosh(0.5)
-<			1.127626 >
-			:echo cosh(-0.5)
+		Examples: >vim
+			echo cosh(0.5)
+<			1.127626 >vim
+			echo cosh(-0.5)
 <			-1.127626
 
-		Can also be used as a |method|: >
-			Compute()->cosh()
-
-count({comp}, {expr} [, {ic} [, {start}]])			*count()*
+count({comp}, {expr} [, {ic} [, {start}]])                        *count()* *E706*
 		Return the number of times an item with value {expr} appears
 		in |String|, |List| or |Dictionary| {comp}.
 
@@ -1441,36 +938,33 @@ count({comp}, {expr} [, {ic} [, {start}]])			*count()*
 		occurrences of {expr} is returned. Zero is returned when
 		{expr} is an empty string.
 
-		Can also be used as a |method|: >
-			mylist->count(val)
-<
-ctxget([{index}])					*ctxget()*
+ctxget([{index}])                                                     *ctxget()*
 		Returns a |Dictionary| representing the |context| at {index}
 		from the top of the |context-stack| (see |context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxpop()						*ctxpop()*
+ctxpop()                                                              *ctxpop()*
 		Pops and restores the |context| at the top of the
 		|context-stack|.
 
-ctxpush([{types}])					*ctxpush()*
+ctxpush([{types}])                                                   *ctxpush()*
 		Pushes the current editor state (|context|) on the
 		|context-stack|.
 		If {types} is given and is a |List| of |String|s, it specifies
 		which |context-types| to include in the pushed context.
 		Otherwise, all context types are included.
 
-ctxset({context} [, {index}])				*ctxset()*
+ctxset({context} [, {index}])                                         *ctxset()*
 		Sets the |context| at {index} from the top of the
 		|context-stack| to that represented by {context}.
 		{context} is a Dictionary with context data (|context-dict|).
 		If {index} is not given, it is assumed to be 0 (i.e.: top).
 
-ctxsize()						*ctxsize()*
+ctxsize()                                                            *ctxsize()*
 		Returns the size of the |context-stack|.
 
-cursor({lnum}, {col} [, {off}])				*cursor()*
-cursor({list})
+cursor({lnum}, {col} [, {off}])
+cursor({list})                                                        *cursor()*
 		Positions the cursor at the column (byte count) {col} in the
 		line {lnum}.  The first column is one.
 
@@ -1482,7 +976,7 @@ cursor({list})
 		This is like the return value of |getpos()| or |getcurpos()|,
 		but without the first item.
 
-		To position the cursor using the character count, use
+		To position the cursor using {col} as the character count, use
 		|setcursorcharpos()|.
 
 		Does not change the jumplist.
@@ -1502,10 +996,7 @@ cursor({list})
 		position within a <Tab> or after the last character.
 		Returns 0 when the position could be set, -1 otherwise.
 
-		Can also be used as a |method|: >
-			GetCursorPos()->cursor()
-
-debugbreak({pid})					*debugbreak()*
+debugbreak({pid})                                                 *debugbreak()*
 		Specifically used to interrupt a program being debugged.  It
 		will cause process {pid} to get a SIGTRAP.  Behavior for other
 		processes is undefined. See |terminal-debug|.
@@ -1514,10 +1005,7 @@ debugbreak({pid})					*debugbreak()*
 		Returns |TRUE| if successfully interrupted the program.
 		Otherwise returns |FALSE|.
 
-		Can also be used as a |method|: >
-			GetPid()->debugbreak()
-
-deepcopy({expr} [, {noref}])				*deepcopy()* *E698*
+deepcopy({expr} [, {noref}])                                   *deepcopy()* *E698*
 		Make a copy of {expr}.  For Numbers and Strings this isn't
 		different from using {expr} directly.
 		When {expr} is a |List| a full copy is created.  This means
@@ -1537,10 +1025,7 @@ deepcopy({expr} [, {noref}])				*deepcopy()* *E698*
 		{noref} set to 1 will fail.
 		Also see |copy()|.
 
-		Can also be used as a |method|: >
-			GetObject()->deepcopy()
-
-delete({fname} [, {flags}])				*delete()*
+delete({fname} [, {flags}])                                           *delete()*
 		Without {flags} or with {flags} empty: Deletes the file by the
 		name {fname}.
 
@@ -1559,10 +1044,7 @@ delete({fname} [, {flags}])				*delete()*
 		operation was successful and -1/true when the deletion failed
 		or partly failed.
 
-		Can also be used as a |method|: >
-			GetName()->delete()
-
-deletebufline({buf}, {first} [, {last}])		*deletebufline()*
+deletebufline({buf}, {first} [, {last}])                       *deletebufline()*
 		Delete lines {first} to {last} (inclusive) from buffer {buf}.
 		If {last} is omitted then delete line {first} only.
 		On success 0 is returned, on failure 1 is returned.
@@ -1576,10 +1058,7 @@ deletebufline({buf}, {first} [, {last}])		*deletebufline()*
 		when using |line()| this refers to the current buffer. Use "$"
 		to refer to the last line in buffer {buf}.
 
-		Can also be used as a |method|: >
-			GetBuffer()->deletebufline(1)
-<
-dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
+dictwatcheradd({dict}, {pattern}, {callback})                 *dictwatcheradd()*
 		Adds a watcher to a dictionary. A dictionary watcher is
 		identified by three components:
 
@@ -1590,7 +1069,7 @@ dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
 		After this is called, every change on {dict} and on keys
 		matching {pattern} will result in {callback} being invoked.
 
-		For example, to watch all global variables: >
+		For example, to watch all global variables: >vim
 			silent! call dictwatcherdel(g:, '*', 'OnDictChanged')
 			function! OnDictChanged(d,k,z)
 			  echomsg string(a:k) string(a:z)
@@ -1619,13 +1098,13 @@ dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
 		This function can be used by plugins to implement options with
 		validation and parsing logic.
 
-dictwatcherdel({dict}, {pattern}, {callback})		      *dictwatcherdel()*
+dictwatcherdel({dict}, {pattern}, {callback})                 *dictwatcherdel()*
 		Removes a watcher added  with |dictwatcheradd()|. All three
 		arguments must match the ones passed to |dictwatcheradd()| in
 		order for the watcher to be successfully deleted.
 
-							*did_filetype()*
-did_filetype()	Returns |TRUE| when autocommands are being executed and the
+did_filetype()                                                  *did_filetype()*
+		Returns |TRUE| when autocommands are being executed and the
 		FileType event has been triggered at least once.  Can be used
 		to avoid triggering the FileType event again in the scripts
 		that detect the file type. |FileType|
@@ -1636,7 +1115,7 @@ did_filetype()	Returns |TRUE| when autocommands are being executed and the
 		editing another buffer to set 'filetype' and load a syntax
 		file.
 
-diff_filler({lnum})					*diff_filler()*
+diff_filler({lnum})                                              *diff_filler()*
 		Returns the number of filler lines above line {lnum}.
 		These are the lines that were inserted at this point in
 		another diff'ed window.  These filler lines are shown in the
@@ -1645,10 +1124,7 @@ diff_filler({lnum})					*diff_filler()*
 		line, "'m" mark m, etc.
 		Returns 0 if the current window is not in diff mode.
 
-		Can also be used as a |method|: >
-			GetLnum()->diff_filler()
-
-diff_hlID({lnum}, {col})				*diff_hlID()*
+diff_hlID({lnum}, {col})                                           *diff_hlID()*
 		Returns the highlight ID for diff mode at line {lnum} column
 		{col} (byte index).  When the current line does not have a
 		diff change zero is returned.
@@ -1659,11 +1135,7 @@ diff_hlID({lnum}, {col})				*diff_hlID()*
 		The highlight ID can be used with |synIDattr()| to obtain
 		syntax information about the highlighting.
 
-		Can also be used as a |method|: >
-			GetLnum()->diff_hlID(col)
-<
-
-digraph_get({chars})					*digraph_get()* *E1214*
+digraph_get({chars})                                       *digraph_get()* *E1214*
 		Return the digraph of {chars}.  This should be a string with
 		exactly two characters.  If {chars} are not just two
 		characters, or the digraph of {chars} does not exist, an error
@@ -1671,37 +1143,31 @@ digraph_get({chars})					*digraph_get()* *E1214*
 
 		Also see |digraph_getlist()|.
 
-		Examples: >
+		Examples: >vim
 		" Get a built-in digraph
-		:echo digraph_get('00')		" Returns '∞'
+		echo digraph_get('00')		" Returns '∞'
 
 		" Get a user-defined digraph
-		:call digraph_set('aa', 'あ')
-		:echo digraph_get('aa')		" Returns 'あ'
-<
-		Can also be used as a |method|: >
-			GetChars()->digraph_get()
+		call digraph_set('aa', 'あ')
+		echo digraph_get('aa')		" Returns 'あ'
 <
 
-digraph_getlist([{listall}])				*digraph_getlist()*
+digraph_getlist([{listall}])                                 *digraph_getlist()*
 		Return a list of digraphs.  If the {listall} argument is given
 		and it is TRUE, return all digraphs, including the default
 		digraphs.  Otherwise, return only user-defined digraphs.
 
 		Also see |digraph_get()|.
 
-		Examples: >
+		Examples: >vim
 		" Get user-defined digraphs
-		:echo digraph_getlist()
+		echo digraph_getlist()
 
 		" Get all the digraphs, including default digraphs
-		:echo digraph_getlist(1)
-<
-		Can also be used as a |method|: >
-			GetNumber()->digraph_getlist()
+		echo digraph_getlist(1)
 <
 
-digraph_set({chars}, {digraph})				*digraph_set()*
+digraph_set({chars}, {digraph})                                  *digraph_set()*
 		Add digraph {chars} to the list.  {chars} must be a string
 		with two characters.  {digraph} is a string with one UTF-8
 		encoded character.  *E1215*
@@ -1715,33 +1181,33 @@ digraph_set({chars}, {digraph})				*digraph_set()*
 		If you want to define multiple digraphs at once, you can use
 		|digraph_setlist()|.
 
-		Example: >
+		Example: >vim
 			call digraph_set('  ', 'あ')
 <
-		Can be used as a |method|: >
+		Can be used as a |method|: >vim
 			GetString()->digraph_set('あ')
 <
 
-digraph_setlist({digraphlist})				*digraph_setlist()*
+digraph_setlist({digraphlist})                               *digraph_setlist()*
 		Similar to |digraph_set()| but this function can add multiple
 		digraphs at once.  {digraphlist} is a list composed of lists,
 		where each list contains two strings with {chars} and
 		{digraph} as in |digraph_set()|. *E1216*
-		Example: >
+		Example: >vim
 		    call digraph_setlist([['aa', 'あ'], ['ii', 'い']])
 <
-		It is similar to the following: >
+		It is similar to the following: >vim
 		    for [chars, digraph] in [['aa', 'あ'], ['ii', 'い']]
 			  call digraph_set(chars, digraph)
 		    endfor
 <		Except that the function returns after the first error,
 		following digraphs will not be added.
 
-		Can be used as a |method|: >
+		Can be used as a |method|: >vim
 		    GetList()->digraph_setlist()
 <
 
-empty({expr})						*empty()*
+empty({expr})                                                          *empty()*
 		Return the Number 1 if {expr} is empty, zero otherwise.
 		- A |List| or |Dictionary| is empty when it does not have any
 		  items.
@@ -1750,45 +1216,37 @@ empty({expr})						*empty()*
 		- |v:false| and |v:null| are empty, |v:true| is not.
 		- A |Blob| is empty when its length is zero.
 
-		Can also be used as a |method|: >
-			mylist->empty()
-
-environ()						*environ()*
+environ()                                                            *environ()*
 		Return all of environment variables as dictionary. You can
-		check if an environment variable exists like this: >
-			:echo has_key(environ(), 'HOME')
+		check if an environment variable exists like this: >vim
+			echo has_key(environ(), 'HOME')
 <		Note that the variable name may be CamelCase; to ignore case
-		use this: >
-			:echo index(keys(environ()), 'HOME', 0, 1) != -1
+		use this: >vim
+			echo index(keys(environ()), 'HOME', 0, 1) != -1
+<
 
-escape({string}, {chars})				*escape()*
+escape({string}, {chars})                                             *escape()*
 		Escape the characters in {chars} that occur in {string} with a
-		backslash.  Example: >
-			:echo escape('c:\program files\vim', ' \')
+		backslash.  Example: >vim
+			echo escape('c:\program files\vim', ' \')
 <		results in: >
 			c:\\program\ files\\vim
 <		Also see |shellescape()| and |fnameescape()|.
 
-		Can also be used as a |method|: >
-			GetText()->escape(' \')
-<
-							*eval()*
-eval({string})	Evaluate {string} and return the result.  Especially useful to
+eval({string})                                                          *eval()*
+		Evaluate {string} and return the result.  Especially useful to
 		turn the result of |string()| back into the original value.
 		This works for Numbers, Floats, Strings, Blobs and composites
 		of them.  Also works for |Funcref|s that refer to existing
 		functions.
 
-		Can also be used as a |method|: >
-			argv->join()->eval()
-
-eventhandler()						*eventhandler()*
+eventhandler()                                                  *eventhandler()*
 		Returns 1 when inside an event handler.  That is that Vim got
 		interrupted while waiting for the user to type a character,
 		e.g., when dropping a file on Vim.  This means interactive
 		commands cannot be used.  Otherwise zero is returned.
 
-executable({expr})					*executable()*
+executable({expr})                                                *executable()*
 		This function checks if an executable with the name {expr}
 		exists.  {expr} must be the name of the program without any
 		arguments.
@@ -1811,16 +1269,14 @@ executable({expr})					*executable()*
 			-1	not implemented on this system
 		|exepath()| can be used to get the full path of an executable.
 
-		Can also be used as a |method|: >
-			GetCommand()->executable()
-
-execute({command} [, {silent}])				*execute()*
+execute({command} [, {silent}])                                      *execute()*
 		Execute {command} and capture its output.
 		If {command} is a |String|, returns {command} output.
 		If {command} is a |List|, returns concatenated outputs.
-		Examples: >
+		Line continuations in {command} are not recognized.
+		Examples: >vim
 			echo execute('echon "foo"')
-<			foo >
+<			foo >vim
 			echo execute(['echon "foo"', 'echon "bar"'])
 <			foobar
 
@@ -1831,7 +1287,7 @@ execute({command} [, {silent}])				*execute()*
 		The default is "silent".  Note that with "silent!", unlike
 		`:redir`, error messages are dropped.
 
-		To get a list of lines use |split()| on the result: >
+		To get a list of lines use `split()` on the result: >vim
 			execute('args')->split("\n")
 
 <		This function is not available in the |sandbox|.
@@ -1841,20 +1297,14 @@ execute({command} [, {silent}])				*execute()*
 		To execute a command in another window than the current one
 		use `win_execute()`.
 
-		Can also be used as a |method|: >
-			GetCommand()->execute()
-
-exepath({expr})						*exepath()*
+exepath({expr})                                                      *exepath()*
 		Returns the full path of {expr} if it is an executable and
 		given as a (partial or full) path or is found in $PATH.
 		Returns empty string otherwise.
 		If {expr} starts with "./" the |current-directory| is used.
 
-		Can also be used as a |method|: >
-			GetCommand()->exepath()
-<
-							*exists()*
-exists({expr})	The result is a Number, which is |TRUE| if {expr} is
+exists({expr})                                                        *exists()*
+		The result is a Number, which is |TRUE| if {expr} is
 		defined, zero otherwise.
 
 		For checking for a supported feature use |has()|.
@@ -1867,11 +1317,11 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 					entries, |List| items, etc.
 					Beware that evaluating an index may
 					cause an error message for an invalid
-					expression.  E.g.: >
-					   :let l = [1, 2, 3]
-					   :echo exists("l[5]")
-<					   0 >
-					   :echo exists("l[xx]")
+					expression.  E.g.: >vim
+					   let l = [1, 2, 3]
+					   echo exists("l[5]")
+<					   0 >vim
+					   echo exists("l[xx]")
 <					   E121: Undefined variable: xx
 					   0
 			&option-name	Vim option (only checks if it exists,
@@ -1880,7 +1330,7 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 			$ENVNAME	environment variable (could also be
 					done by comparing with an empty
 					string)
-			*funcname	built-in function (see |functions|)
+			`*funcname`	built-in function (see |functions|)
 					or user defined function (see
 					|user-function|). Also works for a
 					variable that is a Funcref.
@@ -1911,55 +1361,49 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 			##event		autocommand for this event is
 					supported.
 
-		Examples: >
-			exists("&mouse")
-			exists("$HOSTNAME")
-			exists("*strftime")
-			exists("*s:MyFunc")
-			exists("*MyFunc")
-			exists("bufcount")
-			exists(":Make")
-			exists("#CursorHold")
-			exists("#BufReadPre#*.gz")
-			exists("#filetypeindent")
-			exists("#filetypeindent#FileType")
-			exists("#filetypeindent#FileType#*")
-			exists("##ColorScheme")
+		Examples: >vim
+			echo exists("&mouse")
+			echo exists("$HOSTNAME")
+			echo exists("*strftime")
+			echo exists("*s:MyFunc")
+			echo exists("*MyFunc")
+			echo exists("bufcount")
+			echo exists(":Make")
+			echo exists("#CursorHold")
+			echo exists("#BufReadPre#*.gz")
+			echo exists("#filetypeindent")
+			echo exists("#filetypeindent#FileType")
+			echo exists("#filetypeindent#FileType#*")
+			echo exists("##ColorScheme")
 <		There must be no space between the symbol (&/$/*/#) and the
 		name.
 		There must be no extra characters after the name, although in
 		a few cases this is ignored.  That may become stricter in the
 		future, thus don't count on it!
-		Working example: >
-			exists(":make")
-<		NOT working example: >
-			exists(":make install")
+		Working example: >vim
+			echo exists(":make")
+<		NOT working example: >vim
+			echo exists(":make install")
 
 <		Note that the argument must be a string, not the name of the
-		variable itself.  For example: >
-			exists(bufcount)
+		variable itself.  For example: >vim
+			echo exists(bufcount)
 <		This doesn't check for existence of the "bufcount" variable,
 		but gets the value of "bufcount", and checks if that exists.
 
-		Can also be used as a |method|: >
-			Varname()->exists()
-
-exp({expr})						*exp()*
+exp({expr})                                                              *exp()*
 		Return the exponential of {expr} as a |Float| in the range
 		[0, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo exp(2)
-<			7.389056 >
-			:echo exp(-1)
+		Examples: >vim
+			echo exp(2)
+<			7.389056 >vim
+			echo exp(-1)
 <			0.367879
 
-		Can also be used as a |method|: >
-			Compute()->exp()
-
-expand({string} [, {nosuf} [, {list}]])				*expand()*
-		Expand wildcards and the following special keywords in 
+expand({string} [, {nosuf} [, {list}]])                               *expand()*
+		Expand wildcards and the following special keywords in
 		{string}.  'wildignorecase' applies.
 
 		If {list} is given and it is |TRUE|, a List will be returned.
@@ -2003,18 +1447,18 @@ expand({string} [, {nosuf} [, {list}]])				*expand()*
 			:r		root (one extension removed)
 			:e		extension only
 
-		Example: >
-			:let &tags = expand("%:p:h") .. "/tags"
+		Example: >vim
+			let &tags = expand("%:p:h") .. "/tags"
 <		Note that when expanding a string that starts with '%', '#' or
-		'<', any following text is ignored.  This does NOT work: >
-			:let doesntwork = expand("%:h.bak")
-<		Use this: >
-			:let doeswork = expand("%:h") .. ".bak"
+		'<', any following text is ignored.  This does NOT work: >vim
+			let doesntwork = expand("%:h.bak")
+<		Use this: >vim
+			let doeswork = expand("%:h") .. ".bak"
 <		Also note that expanding "<cfile>" and others only returns the
 		referenced file name without further expansion.  If "<cfile>"
 		is "~/.cshrc", you need to do another expand() to have the
-		"~/" expanded into the path of the home directory: >
-			:echo expand(expand("<cfile>"))
+		"~/" expanded into the path of the home directory: >vim
+			echo expand(expand("<cfile>"))
 <
 		There cannot be white space between the variables and the
 		following modifier.  The |fnamemodify()| function can be used
@@ -2034,8 +1478,8 @@ expand({string} [, {nosuf} [, {list}]])				*expand()*
 		{nosuf} argument is given and it is |TRUE|.
 		Names for non-existing files are included.  The "**" item can
 		be used to search in a directory tree.  For example, to find
-		all "README" files in the current directory and below: >
-			:echo expand("**/README")
+		all "README" files in the current directory and below: >vim
+			echo expand("**/README")
 <
 		expand() can also be used to expand variables and environment
 		variables that are only known in a shell.  But this can be
@@ -2049,10 +1493,7 @@ expand({string} [, {nosuf} [, {list}]])				*expand()*
 		See |glob()| for finding existing files.  See |system()| for
 		getting the raw output of an external command.
 
-		Can also be used as a |method|: >
-			Getpattern()->expand()
-
-expandcmd({string} [, {options}])			*expandcmd()*
+expandcmd({string} [, {options}])                                  *expandcmd()*
 		Expand special items in String {string} like what is done for
 		an Ex command such as `:edit`.  This expands special keywords,
 		like with |expand()|, and environment variables, anywhere in
@@ -2068,15 +1509,15 @@ expandcmd({string} [, {options}])			*expandcmd()*
 		Returns the expanded string.  If an error is encountered
 		during expansion, the unmodified {string} is returned.
 
-		Example: >
-			:echo expandcmd('make %<.o')
+		Example: >vim
+			echo expandcmd('make %<.o')
+<		 >
 			make /path/runtime/doc/builtin.o
-			:echo expandcmd('make %<.o', {'errmsg': v:true})
+<		 >vim
+			echo expandcmd('make %<.o', {'errmsg': v:true})
 <
-		Can also be used as a |method|: >
-			GetCommand()->expandcmd()
-<
-extend({expr1}, {expr2} [, {expr3}])			*extend()*
+
+extend({expr1}, {expr2} [, {expr3}])                                  *extend()*
 		{expr1} and {expr2} must be both |Lists| or both
 		|Dictionaries|.
 
@@ -2085,16 +1526,16 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		item with index {expr3} in {expr1}.  When {expr3} is zero
 		insert before the first item.  When {expr3} is equal to
 		len({expr1}) then {expr2} is appended.
-		Examples: >
-			:echo sort(extend(mylist, [7, 5]))
-			:call extend(mylist, [2, 3], 1)
+		Examples: >vim
+			echo sort(extend(mylist, [7, 5]))
+			call extend(mylist, [2, 3], 1)
 <		When {expr1} is the same List as {expr2} then the number of
 		items copied is equal to the original length of the List.
 		E.g., when {expr3} is 1 you get N new copies of the first item
 		(where N is the original length of the List).
 		Use |add()| to concatenate one item to a list.  To concatenate
-		two lists into a new list use the + operator: >
-			:let newlist = [1, 2, 3] + [4, 5]
+		two lists into a new list use the + operator: >vim
+			let newlist = [1, 2, 3] + [4, 5]
 <
 		If they are |Dictionaries|:
 		Add all entries from {expr2} to {expr1}.
@@ -2112,10 +1553,12 @@ extend({expr1}, {expr2} [, {expr3}])			*extend()*
 		fails.
 		Returns {expr1}.  Returns 0 on error.
 
-		Can also be used as a |method|: >
-			mylist->extend(otherlist)
+extendnew({expr1}, {expr2} [, {expr3}])                            *extendnew()*
+		Like |extend()| but instead of adding items to {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.
 
-feedkeys({string} [, {mode}])				*feedkeys()*
+feedkeys({string} [, {mode}])                                       *feedkeys()*
 		Characters in {string} are queued for processing as if they
 		come from a mapping or were typed by the user.
 
@@ -2160,39 +1603,35 @@ feedkeys({string} [, {mode}])				*feedkeys()*
 
 		Return value is always 0.
 
-		Can also be used as a |method|: >
-			GetInput()->feedkeys()
-
-filereadable({file})					*filereadable()*
+filereadable({file})                                            *filereadable()*
 		The result is a Number, which is |TRUE| when a file with the
 		name {file} exists, and can be read.  If {file} doesn't exist,
 		or is a directory, the result is |FALSE|.  {file} is any
 		expression, which is used as a String.
 		If you don't care about the file being readable you can use
 		|glob()|.
-		{file} is used as-is, you may want to expand wildcards first: >
+		{file} is used as-is, you may want to expand wildcards first: >vim
 			echo filereadable('~/.vimrc')
+<		 >
 			0
+<		 >vim
 			echo filereadable(expand('~/.vimrc'))
+<		 >
 			1
+<
 
-<		Can also be used as a |method|: >
-			GetName()->filereadable()
-
-filewritable({file})					*filewritable()*
+filewritable({file})                                            *filewritable()*
 		The result is a Number, which is 1 when a file with the
 		name {file} exists, and can be written.  If {file} doesn't
 		exist, or is not writable, the result is 0.  If {file} is a
 		directory, and we can write to it, the result is 2.
 
-		Can also be used as a |method|: >
-			GetName()->filewritable()
-
-filter({expr1}, {expr2})					*filter()*
-		{expr1} must be a |List|, |Blob|, or a |Dictionary|.
+filter({expr1}, {expr2})                                              *filter()*
+		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
 		For each item in {expr1} evaluate {expr2} and when the result
-		is zero remove the item from the |List| or |Dictionary|. For a
-		|Blob| each byte is removed.
+		is zero or false remove the item from the |List| or
+		|Dictionary|.  Similarly for each byte in a |Blob| and each
+		character in a |String|.
 
 		{expr2} must be a |string| or |Funcref|.
 
@@ -2200,13 +1639,13 @@ filter({expr1}, {expr2})					*filter()*
 		of the current item.  For a |Dictionary| |v:key| has the key
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
-		current byte.
-
-		Examples: >
+		current byte. For a |String| |v:key| has the index of the
+		current character.
+		Examples: >vim
 			call filter(mylist, 'v:val !~ "OLD"')
-<		Removes the items where "OLD" appears. >
+<		Removes the items where "OLD" appears. >vim
 			call filter(mydict, 'v:key >= 8')
-<		Removes the items with a key below 8. >
+<		Removes the items with a key below 8. >vim
 			call filter(var, 0)
 <		Removes all the items, thus clears the |List| or |Dictionary|.
 
@@ -2218,30 +1657,29 @@ filter({expr1}, {expr2})					*filter()*
 			1. the key or the index of the current item.
 			2. the value of the current item.
 		The function must return |TRUE| if the item should be kept.
-		Example that keeps the odd items of a list: >
+		Example that keeps the odd items of a list: >vim
 			func Odd(idx, val)
 			  return a:idx % 2 == 1
 			endfunc
 			call filter(mylist, function('Odd'))
-<		It is shorter when using a |lambda|: >
+<		It is shorter when using a |lambda|: >vim
 			call filter(myList, {idx, val -> idx * val <= 42})
-<		If you do not use "val" you can leave it out: >
+<		If you do not use "val" you can leave it out: >vim
 			call filter(myList, {idx -> idx % 2 == 1})
 <
-		The operation is done in-place.  If you want a |List| or
-		|Dictionary| to remain unmodified make a copy first: >
-			:let l = filter(copy(mylist), 'v:val =~ "KEEP"')
+		For a |List| and a |Dictionary| the operation is done
+		in-place.  If you want it to remain unmodified make a copy
+		first: >vim
+			let l = filter(copy(mylist), 'v:val =~ "KEEP"')
 
-<		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
-		filtered.  When an error is encountered while evaluating
-		{expr2} no further items in {expr1} are processed.  When
-		{expr2} is a Funcref errors inside a function are ignored,
+<		Returns {expr1}, the |List| or |Dictionary| that was filtered,
+		or a new |Blob| or |String|.
+		When an error is encountered while evaluating {expr2} no
+		further items in {expr1} are processed.
+		When {expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >
-			mylist->filter(expr2)
-
-finddir({name} [, {path} [, {count}]])				*finddir()*
+finddir({name} [, {path} [, {count}]])                               *finddir()*
 		Find directory {name} in {path}.  Supports both downwards and
 		upwards recursive directory searches.  See |file-searching|
 		for the syntax of {path}.
@@ -2259,25 +1697,19 @@ finddir({name} [, {path} [, {count}]])				*finddir()*
 
 		This is quite similar to the ex-command `:find`.
 
-		Can also be used as a |method|: >
-			GetName()->finddir()
-
-findfile({name} [, {path} [, {count}]])				*findfile()*
+findfile({name} [, {path} [, {count}]])                             *findfile()*
 		Just like |finddir()|, but find a file instead of a directory.
 		Uses 'suffixesadd'.
-		Example: >
-			:echo findfile("tags.vim", ".;")
+		Example: >vim
+			echo findfile("tags.vim", ".;")
 <		Searches from the directory of the current file upwards until
 		it finds the file "tags.vim".
 
-		Can also be used as a |method|: >
-			GetName()->findfile()
-
-flatten({list} [, {maxdepth}])					*flatten()*
+flatten({list} [, {maxdepth}])                                       *flatten()*
 		Flatten {list} up to {maxdepth} levels.  Without {maxdepth}
 		the result is a |List| without nesting, as if {maxdepth} is
 		a very large number.
-		The {list} is changed in place, make a copy first if you do
+		The {list} is changed in place, use |flattennew()| if you do
 		not want that.
 								*E900*
 		{maxdepth} means how deep in nested lists changes are made.
@@ -2286,16 +1718,16 @@ flatten({list} [, {maxdepth}])					*flatten()*
 
 		If there is an error the number zero is returned.
 
-		Example: >
-			:echo flatten([1, [2, [3, 4]], 5])
-<			[1, 2, 3, 4, 5] >
-			:echo flatten([1, [2, [3, 4]], 5], 1)
+		Example: >vim
+			echo flatten([1, [2, [3, 4]], 5])
+<			[1, 2, 3, 4, 5] >vim
+			echo flatten([1, [2, [3, 4]], 5], 1)
 <			[1, 2, [3, 4], 5]
 
-		Can also be used as a |method|: >
-			mylist->flatten()
-<
-float2nr({expr})					*float2nr()*
+flattennew({list} [, {maxdepth}])                                 *flattennew()*
+		Like |flatten()| but first make a copy of {list}.
+
+float2nr({expr})                                                    *float2nr()*
 		Convert {expr} to a Number by omitting the part after the
 		decimal point.
 		{expr} must evaluate to a |Float| or a |Number|.
@@ -2305,38 +1737,32 @@ float2nr({expr})					*float2nr()*
 		64-bit Number support is enabled, 0x7fffffffffffffff or
 		-0x7fffffffffffffff).  NaN results in -0x80000000 (or when
 		64-bit Number support is enabled, -0x8000000000000000).
-		Examples: >
+		Examples: >vim
 			echo float2nr(3.95)
-<			3  >
+<			3  >vim
 			echo float2nr(-23.45)
-<			-23  >
+<			-23  >vim
 			echo float2nr(1.0e100)
-<			2147483647  (or 9223372036854775807) >
+<			2147483647  (or 9223372036854775807) >vim
 			echo float2nr(-1.0e150)
-<			-2147483647 (or -9223372036854775807) >
+<			-2147483647 (or -9223372036854775807) >vim
 			echo float2nr(1.0e-100)
 <			0
 
-		Can also be used as a |method|: >
-			Compute()->float2nr()
-
-floor({expr})							*floor()*
+floor({expr})                                                          *floor()*
 		Return the largest integral value less than or equal to
 		{expr} as a |Float| (round down).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo floor(1.856)
-<			1.0  >
+<			1.0  >vim
 			echo floor(-5.456)
-<			-6.0  >
+<			-6.0  >vim
 			echo floor(4.0)
 <			4.0
 
-		Can also be used as a |method|: >
-			Compute()->floor()
-
-fmod({expr1}, {expr2})					*fmod()*
+fmod({expr1}, {expr2})                                                  *fmod()*
 		Return the remainder of {expr1} / {expr2}, even if the
 		division is not representable.  Returns {expr1} - i * {expr2}
 		for some integer i such that if {expr2} is non-zero, the
@@ -2346,18 +1772,15 @@ fmod({expr1}, {expr2})					*fmod()*
 		{expr1} and {expr2} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr1} or {expr2} is not a |Float| or a
 		|Number|.
-		Examples: >
-			:echo fmod(12.33, 1.22)
-<			0.13 >
-			:echo fmod(-12.33, 1.22)
+		Examples: >vim
+			echo fmod(12.33, 1.22)
+<			0.13 >vim
+			echo fmod(-12.33, 1.22)
 <			-0.13
 
-		Can also be used as a |method|: >
-			Compute()->fmod(1.22)
-
-fnameescape({string})					*fnameescape()*
+fnameescape({string})                                            *fnameescape()*
 		Escape {string} for use as file name command argument.  All
-		characters that have a special meaning, such as '%' and '|'
+		characters that have a special meaning, such as `'%'` and `'|'`
 		are escaped with a backslash.
 		For most systems the characters escaped are
 		" \t\n*?[{`$\\%#'\"|!<".  For systems where a backslash
@@ -2365,21 +1788,19 @@ fnameescape({string})					*fnameescape()*
 		A leading '+' and '>' is also escaped (special after |:edit|
 		and |:write|).  And a "-" by itself (special after |:cd|).
 		Returns an empty string on error.
-		Example: >
-			:let fname = '+some str%nge|name'
-			:exe "edit " .. fnameescape(fname)
-<		results in executing: >
+		Example: >vim
+			let fname = '+some str%nge|name'
+			exe "edit " .. fnameescape(fname)
+<		results in executing: >vim
 			edit \+some\ str\%nge\|name
 <
-		Can also be used as a |method|: >
-			GetName()->fnameescape()
 
-fnamemodify({fname}, {mods})				*fnamemodify()*
+fnamemodify({fname}, {mods})                                     *fnamemodify()*
 		Modify file name {fname} according to {mods}.  {mods} is a
 		string of characters like it is used for file names on the
 		command line.  See |filename-modifiers|.
-		Example: >
-			:echo fnamemodify("main.c", ":p:h")
+		Example: >vim
+			echo fnamemodify("main.c", ":p:h")
 <		results in: >
 			/home/user/vim/vim/src
 <		If {mods} is empty or an unsupported modifier is used then
@@ -2391,30 +1812,21 @@ fnamemodify({fname}, {mods})				*fnamemodify()*
 		Note: Environment variables don't work in {fname}, use
 		|expand()| first then.
 
-		Can also be used as a |method|: >
-			GetName()->fnamemodify(':p:h')
-
-foldclosed({lnum})					*foldclosed()*
+foldclosed({lnum})                                                *foldclosed()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the first line in that fold.
 		If the line {lnum} is not in a closed fold, -1 is returned.
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
-			GetLnum()->foldclosed()
-
-foldclosedend({lnum})					*foldclosedend()*
+foldclosedend({lnum})                                          *foldclosedend()*
 		The result is a Number.  If the line {lnum} is in a closed
 		fold, the result is the number of the last line in that fold.
 		If the line {lnum} is not in a closed fold, -1 is returned.
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
-			GetLnum()->foldclosedend()
-
-foldlevel({lnum})					*foldlevel()*
+foldlevel({lnum})                                                  *foldlevel()*
 		The result is a Number, which is the foldlevel of line {lnum}
 		in the current buffer.  For nested folds the deepest level is
 		returned.  If there is no fold at line {lnum}, zero is
@@ -2426,11 +1838,8 @@ foldlevel({lnum})					*foldlevel()*
 		{lnum} is used like with |getline()|.  Thus "." is the current
 		line, "'m" mark m, etc.
 
-		Can also be used as a |method|: >
-			GetLnum()->foldlevel()
-<
-							*foldtext()*
-foldtext()	Returns a String, to be displayed for a closed fold.  This is
+foldtext()                                                          *foldtext()*
+		Returns a String, to be displayed for a closed fold.  This is
 		the default function used for the 'foldtext' option and should
 		only be called from evaluating 'foldtext'.  It uses the
 		|v:foldstart|, |v:foldend| and |v:folddashes| variables.
@@ -2446,7 +1855,7 @@ foldtext()	Returns a String, to be displayed for a closed fold.  This is
 		setting.
 		Returns an empty string when there is no fold.
 
-foldtextresult({lnum})					*foldtextresult()*
+foldtextresult({lnum})                                        *foldtextresult()*
 		Returns the text that is displayed for the closed fold at line
 		{lnum}.  Evaluates 'foldtext' in the appropriate context.
 		When there is no closed fold at {lnum} an empty string is
@@ -2455,10 +1864,8 @@ foldtextresult({lnum})					*foldtextresult()*
 		line, "'m" mark m, etc.
 		Useful when exporting folded text, e.g., to HTML.
 
-		Can also be used as a |method|: >
-			GetLnum()->foldtextresult()
-<
-fullcommand({name})						*fullcommand()*
+
+fullcommand({name})                                              *fullcommand()*
 		Get the full command name from a short abbreviated command
 		name; see |20.2| for details on command abbreviations.
 
@@ -2470,11 +1877,7 @@ fullcommand({name})						*fullcommand()*
 		For example `fullcommand('s')`, `fullcommand('sub')`,
 		`fullcommand(':%substitute')` all return "substitute".
 
-		Can also be used as a |method|: >
-			GetName()->fullcommand()
-<
-						*funcref()*
-funcref({name} [, {arglist}] [, {dict}])
+funcref({name} [, {arglist}] [, {dict}])                             *funcref()*
 		Just like |function()|, but the returned Funcref will lookup
 		the function by reference, not by name.  This matters when the
 		function {name} is redefined later.
@@ -2486,18 +1889,14 @@ funcref({name} [, {arglist}] [, {dict}])
 		instead). {name} cannot be a builtin function.
 		Returns 0 on error.
 
-		Can also be used as a |method|: >
-			GetFuncname()->funcref([arg])
-<
-				*function()* *partial* *E700* *E922* *E923*
-function({name} [, {arglist}] [, {dict}])
+function({name} [, {arglist}] [, {dict}])         *function()* *partial* *E700* *E923*
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be the name of a user defined function or an
 		internal function.
 
 		{name} can also be a Funcref or a partial. When it is a
 		partial the dict stored in it will be used and the {dict}
-		argument is not allowed. E.g.: >
+		argument is not allowed. E.g.: >vim
 			let FuncWithArg = function(dict.Func, [arg])
 			let Broken = function(dict.Func, [arg], dict)
 <
@@ -2510,38 +1909,41 @@ function({name} [, {arglist}] [, {dict}])
 		the Funcref and will be used when the Funcref is called.
 
 		The arguments are passed to the function in front of other
-		arguments, but after any argument from |method|.  Example: >
+		arguments, but after any argument from |method|.  Example: >vim
 			func Callback(arg1, arg2, name)
 			"...
+			endfunc
 			let Partial = function('Callback', ['one', 'two'])
 			"...
 			call Partial('name')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call Callback('one', 'two', 'name')
 
-<		With a |method|: >
+<		With a |method|: >vim
 			func Callback(one, two, three)
 			"...
+			endfunc
 			let Partial = function('Callback', ['two'])
 			"...
 			eval 'one'->Partial('three')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			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: >
+		arguments.  Example: >vim
 			func Callback(arg1, arg2, name)
 			"...
+			endfunc
 			let Func = function('Callback', ['one'])
 			let Func2 = function(Func, ['two'])
 			"...
 			call Func2('name')
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call Callback('one', 'two', 'name')
 
 <		The Dictionary is only useful when calling a "dict" function.
-		In that case the {dict} is passed in as "self". Example: >
+		In that case the {dict} is passed in as "self". Example: >vim
 			function Callback() dict
 			   echo "called for " .. self.name
 			endfunction
@@ -2552,26 +1954,24 @@ function({name} [, {arglist}] [, {dict}])
 			call Func()	" will echo: called for example
 <		The use of function() is not needed when there are no extra
 		arguments, these two are equivalent, if Callback() is defined
-		as context.Callback(): >
+		as context.Callback(): >vim
 			let Func = function('Callback', context)
 			let Func = context.Callback
 
-<		The argument list and the Dictionary can be combined: >
+<		The argument list and the Dictionary can be combined: >vim
 			function Callback(arg1, count) dict
 			"...
+			endfunction
 			let context = {"name": "example"}
 			let Func = function('Callback', ['one'], context)
 			"...
 			call Func(500)
-<		Invokes the function as with: >
+<		Invokes the function as with: >vim
 			call context.Callback('one', 500)
 <
 		Returns 0 on error.
 
-		Can also be used as a |method|: >
-			GetFuncname()->function([arg])
-
-garbagecollect([{atexit}])				*garbagecollect()*
+garbagecollect([{atexit}])                                    *garbagecollect()*
 		Cleanup unused |Lists| and |Dictionaries| that have circular
 		references.
 
@@ -2591,23 +1991,24 @@ garbagecollect([{atexit}])				*garbagecollect()*
 		it's safe to perform.  This is when waiting for the user to
 		type a character.
 
-get({list}, {idx} [, {default}])			*get()*
+get({list}, {idx} [, {default}])                                         *get()*
 		Get item {idx} from |List| {list}.  When this item is not
 		available return {default}.  Return zero when {default} is
 		omitted.
-		Can also be used as a |method|: >
-			mylist->get(idx)
+
 get({blob}, {idx} [, {default}])
 		Get byte {idx} from |Blob| {blob}.  When this byte is not
 		available return {default}.  Return -1 when {default} is
 		omitted.
+
 get({dict}, {key} [, {default}])
 		Get item with key {key} from |Dictionary| {dict}.  When this
 		item is not available return {default}.  Return zero when
-		{default} is omitted.  Useful example: >
+		{default} is omitted.  Useful example: >vim
 			let val = get(g:, 'var_name', 'default')
 <		This gets the value of g:var_name if it exists, and uses
 		"default" when it does not exist.
+
 get({func}, {what})
 		Get item {what} from Funcref {func}.  Possible values for
 		{what} are:
@@ -2617,9 +2018,8 @@ get({func}, {what})
 			"args"	The list with arguments
 		Returns zero on error.
 
-							*getbufinfo()*
 getbufinfo([{buf}])
-getbufinfo([{dict}])
+getbufinfo([{dict}])                                              *getbufinfo()*
 		Get information about buffers as a List of Dictionaries.
 
 		Without an argument information about all the buffers is
@@ -2653,8 +2053,8 @@ getbufinfo([{dict}])
 					displayed in the window in the past.
 					If you want the line number of the
 					last known cursor position in a given
-					window, use |line()|: >
-						:echo line('.', {winid})
+					window, use |line()|: >vim
+						echo line('.', {winid})
 <
 			linecount	Number of lines in the buffer (only
 					valid when loaded)
@@ -2671,25 +2071,21 @@ getbufinfo([{dict}])
 			windows		List of |window-ID|s that display this
 					buffer
 
-		Examples: >
+		Examples: >vim
 			for buf in getbufinfo()
 			    echo buf.name
 			endfor
 			for buf in getbufinfo({'buflisted':1})
 			    if buf.changed
-				....
+				" ....
 			    endif
 			endfor
 <
-		To get buffer-local options use: >
+		To get buffer-local options use: >vim
 			getbufvar({bufnr}, '&option_name')
 <
-		Can also be used as a |method|: >
-			GetBufnr()->getbufinfo()
-<
 
-							*getbufline()*
-getbufline({buf}, {lnum} [, {end}])
+getbufline({buf}, {lnum} [, {end}])                               *getbufline()*
 		Return a |List| with the lines starting from {lnum} to {end}
 		(inclusive) in the buffer {buf}.  If {end} is omitted, a
 		|List| with only the line {lnum} is returned.  See
@@ -2711,18 +2107,14 @@ getbufline({buf}, {lnum} [, {end}])
 		This function works only for loaded buffers.  For unloaded and
 		non-existing buffers, an empty |List| is returned.
 
-		Example: >
-			:let lines = getbufline(bufnr("myfile"), 1, "$")
+		Example: >vim
+			let lines = getbufline(bufnr("myfile"), 1, "$")
 
-<		Can also be used as a |method|: >
-			GetBufnr()->getbufline(lnum)
-<
-							*getbufoneline()*
-getbufoneline({buf}, {lnum})
+getbufoneline({buf}, {lnum})                                   *getbufoneline()*
 		Just like `getbufline()` but only get one line and return it
 		as a string.
 
-getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
+getbufvar({buf}, {varname} [, {def}])                              *getbufvar()*
 		The result is the value of option or local buffer variable
 		{varname} in buffer {buf}.  Note that the name without "b:"
 		must be used.
@@ -2739,21 +2131,17 @@ getbufvar({buf}, {varname} [, {def}])				*getbufvar()*
 		For the use of {buf}, see |bufname()| above.
 		When the buffer or variable doesn't exist {def} or an empty
 		string is returned, there is no error message.
-		Examples: >
-			:let bufmodified = getbufvar(1, "&mod")
-			:echo "todo myvar = " .. getbufvar("todo", "myvar")
+		Examples: >vim
+			let bufmodified = getbufvar(1, "&mod")
+			echo "todo myvar = " .. getbufvar("todo", "myvar")
 
-<		Can also be used as a |method|: >
-			GetBufnr()->getbufvar(varname)
-<
-getcellwidths()						*getcellwidths()*
+getcellwidths()                                                *getcellwidths()*
 		Returns a |List| of cell widths of character ranges overridden
 		by |setcellwidths()|.  The format is equal to the argument of
 		|setcellwidths()|.  If no character ranges have their cell
 		widths overridden, an empty List is returned.
 
-
-getchangelist([{buf}])					*getchangelist()*
+getchangelist([{buf}])                                         *getchangelist()*
 		Returns the |changelist| for the buffer {buf}. For the use
 		of {buf}, see |bufname()| above. If buffer {buf} doesn't
 		exist, an empty list is returned.
@@ -2769,10 +2157,7 @@ getchangelist([{buf}])					*getchangelist()*
 		position refers to the position in the list. For other
 		buffers, it is set to the length of the list.
 
-		Can also be used as a |method|: >
-			GetBufnr()->getchangelist()
-
-getchar([expr])						*getchar()*
+getchar([expr])                                                      *getchar()*
 		Get a single character from the user or input stream.
 		If [expr] is omitted, wait until a character is available.
 		If [expr] is 0, only get a character when one is available.
@@ -2806,7 +2191,7 @@ getchar([expr])						*getchar()*
 		|v:mouse_lnum|, |v:mouse_winid| and |v:mouse_win|.
 		|getmousepos()| can also be used.  Mouse move events will be
 		ignored.
-		This example positions the mouse as it would normally happen: >
+		This example positions the mouse as it would normally happen: >vim
 			let c = getchar()
 			if c == "\<LeftMouse>" && v:mouse_win > 0
 			  exe v:mouse_win .. "wincmd w"
@@ -2821,22 +2206,23 @@ getchar([expr])						*getchar()*
 		There is no mapping for the character.
 		Key codes are replaced, thus when the user presses the <Del>
 		key you get the code for the <Del> key, not the raw character
-		sequence.  Examples: >
+		sequence.  Examples: >vim
 			getchar() == "\<Del>"
 			getchar() == "\<S-Left>"
-<		This example redefines "f" to ignore case: >
-			:nmap f :call FindChar()<CR>
-			:function FindChar()
-			:  let c = nr2char(getchar())
-			:  while col('.') < col('$') - 1
-			:    normal l
-			:    if getline('.')[col('.') - 1] ==? c
-			:      break
-			:    endif
-			:  endwhile
-			:endfunction
-<
-getcharmod()						*getcharmod()*
+<		This example redefines "f" to ignore case: >vim
+			nmap f :call FindChar()<CR>
+			function FindChar()
+			  let c = nr2char(getchar())
+			  while col('.') < col('$') - 1
+			    normal l
+			    if getline('.')[col('.') - 1] ==? c
+			      break
+			    endif
+			  endwhile
+			endfunction
+<
+
+getcharmod()                                                      *getcharmod()*
 		The result is a Number which is the state of the modifiers for
 		the last obtained character with getchar() or in another way.
 		These values are added together:
@@ -2852,21 +2238,21 @@ getcharmod()						*getcharmod()*
 		character itself are obtained.  Thus Shift-a results in "A"
 		without a modifier.  Returns 0 if no modifiers are used.
 
-							*getcharpos()*
-getcharpos({expr})
+getcharpos({expr})                                                *getcharpos()*
 		Get the position for String {expr}. Same as |getpos()| but the
 		column number in the returned List is a character index
 		instead of a byte index.
+		If |getpos()| returns a very large column number, equal to
+		|v:maxcol|, then getcharpos() will return the character index
+		of the last character.
 
 		Example:
-		With the cursor on '세' in line 5 with text "여보세요": >
+		With the cursor on '세' in line 5 with text "여보세요": >vim
 			getcharpos('.')		returns [0, 5, 3, 0]
 			getpos('.')		returns [0, 5, 7, 0]
 <
-		Can also be used as a |method|: >
-			GetMark()->getcharpos()
 
-getcharsearch()						*getcharsearch()*
+getcharsearch()                                                *getcharsearch()*
 		Return the current character search information as a {dict}
 		with the following entries:
 
@@ -2881,13 +2267,12 @@ getcharsearch()						*getcharsearch()*
 
 		This can be useful to always have |;| and |,| search
 		forward/backward regardless of the direction of the previous
-		character search: >
-			:nnoremap <expr> ; getcharsearch().forward ? ';' : ','
-			:nnoremap <expr> , getcharsearch().forward ? ',' : ';'
+		character search: >vim
+			nnoremap <expr> ; getcharsearch().forward ? ';' : ','
+			nnoremap <expr> , getcharsearch().forward ? ',' : ';'
 <		Also see |setcharsearch()|.
 
-
-getcharstr([expr])					*getcharstr()*
+getcharstr([expr])                                                *getcharstr()*
 		Get a single character from the user or input stream as a
 		string.
 		If [expr] is omitted, wait until a character is available.
@@ -2899,7 +2284,7 @@ getcharstr([expr])					*getcharstr()*
 		Otherwise this works like |getchar()|, except that a number
 		result is converted to a string.
 
-getcmdcompltype()					*getcmdcompltype()*
+getcmdcompltype()                                            *getcmdcompltype()*
 		Return the type of the current command-line completion.
 		Only works when the command line is being edited, thus
 		requires use of |c_CTRL-\_e| or |c_CTRL-R_=|.
@@ -2908,18 +2293,18 @@ getcmdcompltype()					*getcmdcompltype()*
 		|setcmdline()|.
 		Returns an empty string when completion is not defined.
 
-getcmdline()						*getcmdline()*
+getcmdline()                                                      *getcmdline()*
 		Return the current command-line.  Only works when the command
 		line is being edited, thus requires use of |c_CTRL-\_e| or
 		|c_CTRL-R_=|.
-		Example: >
-			:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
+		Example: >vim
+			cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
 <		Also see |getcmdtype()|, |getcmdpos()|, |setcmdpos()| and
 		|setcmdline()|.
 		Returns an empty string when entering a password or using
 		|inputsecret()|.
 
-getcmdpos()						*getcmdpos()*
+getcmdpos()                                                        *getcmdpos()*
 		Return the position of the cursor in the command line as a
 		byte count.  The first column is 1.
 		Only works when editing the command line, thus requires use of
@@ -2928,7 +2313,7 @@ getcmdpos()						*getcmdpos()*
 		Also see |getcmdtype()|, |setcmdpos()|, |getcmdline()| and
 		|setcmdline()|.
 
-getcmdscreenpos()					*getcmdscreenpos()*
+getcmdscreenpos()                                            *getcmdscreenpos()*
 		Return the screen position of the cursor in the command line
 		as a byte count.  The first column is 1.
 		Instead of |getcmdpos()|, it adds the prompt position.
@@ -2938,7 +2323,7 @@ getcmdscreenpos()					*getcmdscreenpos()*
 		Also see |getcmdpos()|, |setcmdpos()|, |getcmdline()| and
 		|setcmdline()|.
 
-getcmdtype()						*getcmdtype()*
+getcmdtype()                                                      *getcmdtype()*
 		Return the current command-line type. Possible return values
 		are:
 		    :	normal Ex command
@@ -2946,19 +2331,19 @@ getcmdtype()						*getcmdtype()*
 		    /	forward search command
 		    ?	backward search command
 		    @	|input()| command
-		    -	|:insert| or |:append| command
+		    `-`	|:insert| or |:append| command
 		    =	|i_CTRL-R_=|
 		Only works when editing the command line, thus requires use of
 		|c_CTRL-\_e| or |c_CTRL-R_=| or an expression mapping.
 		Returns an empty string otherwise.
 		Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
 
-getcmdwintype()						*getcmdwintype()*
+getcmdwintype()                                                *getcmdwintype()*
 		Return the current |command-line-window| type. Possible return
 		values are the same as |getcmdtype()|. Returns an empty string
 		when not in the command-line window.
 
-getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
+getcompletion({pat}, {type} [, {filtered}])                    *getcompletion()*
 		Return a list of command-line completion matches. The String
 		{type} argument specifies what for.  The following completion
 		types are supported:
@@ -2966,13 +2351,14 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		arglist		file names in argument list
 		augroup		autocmd groups
 		buffer		buffer names
-		behave		|:behave| suboptions
 		breakpoint	|:breakadd| and |:breakdel| suboptions
 		cmdline		|cmdline-completion| result
 		color		color schemes
 		command		Ex command
 		compiler	compilers
-		diff_buffer     |:diffget| and |:diffput| completion
+		custom,{func}	custom completion, defined via {func}
+		customlist,{func} custom completion, defined via {func}
+		diff_buffer	|:diffget| and |:diffput| completion
 		dir		directory names
 		environment	environment variable names
 		event		autocommand events
@@ -2991,6 +2377,7 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 		messages	|:messages| suboptions
 		option		options
 		packadd		optional package |pack-add| names
+		runtime		|:runtime| completion
 		scriptnames	sourced script names |:scriptnames|
 		shellcmd	Shell command
 		sign		|:sign| suboptions
@@ -3018,22 +2405,19 @@ getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
 
 		If {type} is "cmdline", then the |cmdline-completion| result is
 		returned.  For example, to complete the possible values after
-		a ":call" command: >
+		a ":call" command: >vim
 			echo getcompletion('call ', 'cmdline')
 <
 		If there are no matches, an empty list is returned.  An
 		invalid value for {type} produces an error.
 
-		Can also be used as a |method|: >
-			GetPattern()->getcompletion('color')
-<
-							*getcurpos()*
-getcurpos([{winid}])
+getcurpos([{winid}])                                               *getcurpos()*
 		Get the position of the cursor.  This is like getpos('.'), but
-		includes an extra "curswant" in the list:
+		includes an extra "curswant" item in the list:
 		    [0, lnum, col, off, curswant] ~
 		The "curswant" number is the preferred column when moving the
-		cursor vertically.  Also see |getcursorcharpos()| and
+		cursor vertically.  After |$| command it will be a very large
+		number equal to |v:maxcol|.  Also see |getcursorcharpos()| and
 		|getpos()|.
 		The first "bufnum" item is always zero. The byte position of
 		the cursor is returned in "col". To get the character
@@ -3045,37 +2429,31 @@ getcurpos([{winid}])
 		current value of the buffer if it is not the current window.
 		If {winid} is invalid a list with zeroes is returned.
 
-		This can be used to save and restore the cursor position: >
+		This can be used to save and restore the cursor position: >vim
 			let save_cursor = getcurpos()
 			MoveTheCursorAround
 			call setpos('.', save_cursor)
 <		Note that this only works within the window.  See
 		|winrestview()| for restoring more state.
 
-		Can also be used as a |method|: >
-			GetWinid()->getcurpos()
-<
-							*getcursorcharpos()*
-getcursorcharpos([{winid}])
+getcursorcharpos([{winid}])                                 *getcursorcharpos()*
 		Same as |getcurpos()| but the column number in the returned
 		List is a character index instead of a byte index.
 
 		Example:
-		With the cursor on '보' in line 3 with text "여보세요": >
-			getcursorcharpos()	returns [0, 3, 2, 0, 3]
-			getcurpos()		returns [0, 3, 4, 0, 3]
+		With the cursor on '보' in line 3 with text "여보세요": >vim
+			getcursorcharpos()	" returns [0, 3, 2, 0, 3]
+			getcurpos()		" returns [0, 3, 4, 0, 3]
 <
-		Can also be used as a |method|: >
-			GetWinid()->getcursorcharpos()
 
-getcwd([{winnr} [, {tabnr}]])				*getcwd()*
+getcwd([{winnr} [, {tabnr}]])                                         *getcwd()*
 		With no arguments, returns the name of the effective
 		|current-directory|. With {winnr} or {tabnr} the working
 		directory of that scope is returned, and 'autochdir' is
 		ignored.
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing tab number implies 0.
-		Thus the following are equivalent: >
+		Thus the following are equivalent: >vim
 			getcwd(0)
 			getcwd(0, 0)
 <		If {winnr} is -1 it is ignored, only the tab is resolved.
@@ -3084,22 +2462,16 @@ getcwd([{winnr} [, {tabnr}]])				*getcwd()*
 		directory is returned.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >
-			GetWinnr()->getcwd()
-
-getenv({name})						*getenv()*
+getenv({name})                                                        *getenv()*
 		Return the value of environment variable {name}.  The {name}
-		argument is a string, without a leading '$'.  Example: >
+		argument is a string, without a leading '$'.  Example: >vim
 			myHome = getenv('HOME')
 
 <		When the variable does not exist |v:null| is returned.  That
 		is different from a variable set to an empty string.
 		See also |expr-env|.
 
-		Can also be used as a |method|: >
-			GetVarname()->getenv()
-
-getfontname([{name}])					*getfontname()*
+getfontname([{name}])                                            *getfontname()*
 		Without an argument returns the name of the normal font being
 		used.  Like what is used for the Normal highlight group
 		|hl-Normal|.
@@ -3111,7 +2483,7 @@ getfontname([{name}])					*getfontname()*
 		gvimrc file.  Use the |GUIEnter| autocommand to use this
 		function just after the GUI has started.
 
-getfperm({fname})					*getfperm()*
+getfperm({fname})                                                   *getfperm()*
 		The result is a String, which is the read, write, and execute
 		permissions of the given file {fname}.
 		If {fname} does not exist or its directory cannot be read, an
@@ -3120,18 +2492,15 @@ getfperm({fname})					*getfperm()*
 		"rwx" flags represent, in turn, the permissions of the owner
 		of the file, the group the file belongs to, and other users.
 		If a user does not have a given permission the flag for this
-		is replaced with the string "-".  Examples: >
-			:echo getfperm("/etc/passwd")
-			:echo getfperm(expand("~/.config/nvim/init.vim"))
+		is replaced with the string "-".  Examples: >vim
+			echo getfperm("/etc/passwd")
+			echo getfperm(expand("~/.config/nvim/init.vim"))
 <		This will hopefully (from a security point of view) display
 		the string "rw-r--r--" or even "rw-------".
 
-		Can also be used as a |method|: >
-			GetFilename()->getfperm()
-<
 		For setting permissions use |setfperm()|.
 
-getfsize({fname})					*getfsize()*
+getfsize({fname})                                                   *getfsize()*
 		The result is a Number, which is the size in bytes of the
 		given file {fname}.
 		If {fname} is a directory, 0 is returned.
@@ -3139,20 +2508,14 @@ getfsize({fname})					*getfsize()*
 		If the size of {fname} is too big to fit in a Number then -2
 		is returned.
 
-		Can also be used as a |method|: >
-			GetFilename()->getfsize()
-
-getftime({fname})					*getftime()*
+getftime({fname})                                                   *getftime()*
 		The result is a Number, which is the last modification time of
 		the given file {fname}.  The value is measured as seconds
 		since 1st Jan 1970, and may be passed to strftime().  See also
 		|localtime()| and |strftime()|.
 		If the file {fname} can't be found -1 is returned.
 
-		Can also be used as a |method|: >
-			GetFilename()->getftime()
-
-getftype({fname})					*getftype()*
+getftype({fname})                                                   *getftype()*
 		The result is a String, which is a description of the kind of
 		file of the given file {fname}.
 		If {fname} does not exist an empty string is returned.
@@ -3166,16 +2529,13 @@ getftype({fname})					*getftype()*
 			Socket			"socket"
 			FIFO			"fifo"
 			All other		"other"
-		Example: >
+		Example: >vim
 			getftype("/home")
 <		Note that a type such as "link" will only be returned on
 		systems that support it.  On some systems only "dir" and
 		"file" are returned.
 
-		Can also be used as a |method|: >
-			GetFilename()->getftype()
-
-getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
+getjumplist([{winnr} [, {tabnr}]])                               *getjumplist()*
 		Returns the |jumplist| for the specified window.
 
 		Without arguments use the current window.
@@ -3195,17 +2555,13 @@ getjumplist([{winnr} [, {tabnr}]])			*getjumplist()*
 			filename	filename if available
 			lnum		line number
 
-		Can also be used as a |method|: >
-			GetWinnr()->getjumplist()
-
-<							*getline()*
-getline({lnum} [, {end}])
+getline({lnum} [, {end}])                                            *getline()*
 		Without {end} the result is a String, which is line {lnum}
-		from the current buffer.  Example: >
+		from the current buffer.  Example: >vim
 			getline(1)
 <		When {lnum} is a String that doesn't start with a
 		digit, |line()| is called to translate the String into a Number.
-		To get the line under the cursor: >
+		To get the line under the cursor: >vim
 			getline(".")
 <		When {lnum} is a number smaller than 1 or bigger than the
 		number of lines in the buffer, an empty string is returned.
@@ -3216,18 +2572,15 @@ getline({lnum} [, {end}])
 		{end} is used in the same way as {lnum}.
 		Non-existing lines are silently omitted.
 		When {end} is before {lnum} an empty |List| is returned.
-		Example: >
-			:let start = line('.')
-			:let end = search("^$") - 1
-			:let lines = getline(start, end)
-
-<		Can also be used as a |method|: >
-			ComputeLnum()->getline()
+		Example: >vim
+			let start = line('.')
+			let end = search("^$") - 1
+			let lines = getline(start, end)
 
 <		To get lines from another buffer see |getbufline()| and
 		|getbufoneline()|
 
-getloclist({nr} [, {what}])				*getloclist()*
+getloclist({nr} [, {what}])                                       *getloclist()*
 		Returns a |List| with all the entries in the location list for
 		window {nr}.  {nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
@@ -3254,12 +2607,12 @@ getloclist({nr} [, {what}])				*getloclist()*
 		location list for the window {nr}.
 		Returns an empty Dictionary if window {nr} does not exist.
 
-		Examples (See also |getqflist-examples|): >
-			:echo getloclist(3, {'all': 0})
-			:echo getloclist(5, {'filewinid': 0})
-
+		Examples (See also |getqflist-examples|): >vim
+			echo getloclist(3, {'all': 0})
+			echo getloclist(5, {'filewinid': 0})
+<
 
-getmarklist([{buf}])					*getmarklist()*
+getmarklist([{buf}])                                             *getmarklist()*
 		Without the {buf} argument returns a |List| with information
 		about all the global marks. |mark|
 
@@ -3278,10 +2631,7 @@ getmarklist([{buf}])					*getmarklist()*
 		Refer to |getpos()| for getting information about a specific
 		mark.
 
-		Can also be used as a |method|: >
-			GetBufnr()->getmarklist()
-
-getmatches([{win}])					*getmatches()*
+getmatches([{win}])                                               *getmatches()*
 		Returns a |List| with all matches previously defined for the
 		current window by |matchadd()| and the |:match| commands.
 		|getmatches()| is useful in combination with |setmatches()|,
@@ -3290,24 +2640,31 @@ getmatches([{win}])					*getmatches()*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.  If {win} is invalid,
 		an empty list is returned.
-		Example: >
-			:echo getmatches()
-<			[{"group": "MyGroup1", "pattern": "TODO",
+		Example: >vim
+			echo getmatches()
+<		 >
+			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
-			"pattern": "FIXME", "priority": 10, "id": 2}] >
-			:let m = getmatches()
-			:call clearmatches()
-			:echo getmatches()
-<			[] >
-			:call setmatches(m)
-			:echo getmatches()
-<			[{"group": "MyGroup1", "pattern": "TODO",
+			"pattern": "FIXME", "priority": 10, "id": 2}]
+<		 >vim
+			let m = getmatches()
+			call clearmatches()
+			echo getmatches()
+<		 >
+			[]
+<		 >vim
+			call setmatches(m)
+			echo getmatches()
+<		 >
+			[{"group": "MyGroup1", "pattern": "TODO",
 			"priority": 10, "id": 1}, {"group": "MyGroup2",
-			"pattern": "FIXME", "priority": 10, "id": 2}] >
-			:unlet m
+			"pattern": "FIXME", "priority": 10, "id": 2}]
+<		 >vim
+			unlet m
 <
-getmousepos()						*getmousepos()*
-		Returns a Dictionary with the last known position of the
+
+getmousepos()                                                    *getmousepos()*
+		Returns a |Dictionary| with the last known position of the
 		mouse.  This can be used in a mapping for a mouse click.  The
 		items are:
 			screenrow	screen row
@@ -3317,6 +2674,8 @@ getmousepos()						*getmousepos()*
 			wincol		column inside "winid"
 			line		text line inside "winid"
 			column		text column inside "winid"
+			coladd		offset (in screen columns) from the
+					start of the clicked char
 		All numbers are 1-based.
 
 		If not over a window, e.g. when in the command line, then only
@@ -3335,12 +2694,12 @@ getmousepos()						*getmousepos()*
 		When using |getchar()| the Vim variables |v:mouse_lnum|,
 		|v:mouse_col| and |v:mouse_winid| also provide these values.
 
-							*getpid()*
-getpid()	Return a Number which is the process ID of the Vim process.
+getpid()                                                              *getpid()*
+		Return a Number which is the process ID of the Vim process.
 		This is a unique number, until Vim exits.
 
-							*getpos()*
-getpos({expr})	Get the position for String {expr}.  For possible values of
+getpos({expr})                                                        *getpos()*
+		Get the position for String {expr}.  For possible values of
 		{expr} see |line()|.  For getting the cursor position see
 		|getcurpos()|.
 		The result is a |List| with four numbers:
@@ -3355,23 +2714,20 @@ getpos({expr})	Get the position for String {expr}.  For possible values of
 		character.
 		Note that for '< and '> Visual mode matters: when it is "V"
 		(visual line mode) the column of '< is zero and the column of
-		'> is a large number.
+		'> is a large number equal to |v:maxcol|.
 		The column number in the returned List is the byte position
 		within the line. To get the character position in the line,
 		use |getcharpos()|.
-		The column number can be very large, e.g. 2147483647, in which
-		case it means "after the end of the line".
+		A very large column number equal to |v:maxcol| can be returned,
+		in which case it means "after the end of the line".
 		If {expr} is invalid, returns a list with all zeros.
-		This can be used to save and restore the position of a mark: >
+		This can be used to save and restore the position of a mark: >vim
 			let save_a_mark = getpos("'a")
-			...
+			" ...
 			call setpos("'a", save_a_mark)
 <		Also see |getcharpos()|, |getcurpos()| and |setpos()|.
 
-		Can also be used as a |method|: >
-			GetMark()->getpos()
-
-getqflist([{what}])					*getqflist()*
+getqflist([{what}])                                                *getqflist()*
 		Returns a |List| with all the current quickfix errors.  Each
 		list item is a dictionary with these entries:
 			bufnr	number of buffer that has the file name, use
@@ -3389,6 +2745,9 @@ getqflist([{what}])					*getqflist()*
 			text	description of the error
 			type	type of the error, 'E', '1', etc.
 			valid	|TRUE|: recognized error message
+			user_data
+				custom data associated with the item, can be
+				any type.
 
 		When there is no error list or it's empty, an empty list is
 		returned. Quickfix list entries with a non-existing buffer
@@ -3397,11 +2756,11 @@ getqflist([{what}])					*getqflist()*
 		you may need to explicitly check for zero).
 
 		Useful application: Find pattern matches in multiple files and
-		do something with them: >
-			:vimgrep /theword/jg *.c
-			:for d in getqflist()
-			:   echo bufname(d.bufnr) ':' d.lnum '=' d.text
-			:endfor
+		do something with them: >vim
+			vimgrep /theword/jg *.c
+			for d in getqflist()
+			   echo bufname(d.bufnr) ':' d.lnum '=' d.text
+			endfor
 <
 		If the optional {what} dictionary argument is supplied, then
 		returns only the items listed in {what} as a dictionary. The
@@ -3466,15 +2825,16 @@ getqflist([{what}])					*getqflist()*
 				to "".
 			winid	quickfix |window-ID|. If not present, set to 0
 
-		Examples (See also |getqflist-examples|): >
-			:echo getqflist({'all': 1})
-			:echo getqflist({'nr': 2, 'title': 1})
-			:echo getqflist({'lines' : ["F1:10:L10"]})
+		Examples (See also |getqflist-examples|): >vim
+			echo getqflist({'all': 1})
+			echo getqflist({'nr': 2, 'title': 1})
+			echo getqflist({'lines' : ["F1:10:L10"]})
 <
-getreg([{regname} [, 1 [, {list}]]])			*getreg()*
+
+getreg([{regname} [, 1 [, {list}]]])                                  *getreg()*
 		The result is a String, which is the contents of register
-		{regname}.  Example: >
-			:let cliptext = getreg('*')
+		{regname}.  Example: >vim
+			let cliptext = getreg('*')
 <		When register {regname} was not set the result is an empty
 		string.
 		The {regname} argument must be a string.
@@ -3494,10 +2854,7 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 
 		If {regname} is not specified, |v:register| is used.
 
-		Can also be used as a |method|: >
-			GetRegname()->getreg()
-
-getreginfo([{regname}])					*getreginfo()*
+getreginfo([{regname}])                                           *getreginfo()*
 		Returns detailed information about register {regname} as a
 		Dictionary with the following entries:
 			regcontents	List of lines contained in register
@@ -3521,10 +2878,7 @@ getreginfo([{regname}])					*getreginfo()*
 		If {regname} is not specified, |v:register| is used.
 		The returned Dictionary can be passed to |setreg()|.
 
-		Can also be used as a |method|: >
-			GetRegname()->getreginfo()
-
-getregtype([{regname}])					*getregtype()*
+getregtype([{regname}])                                           *getregtype()*
 		The result is a String, which is type of register {regname}.
 		The value will be one of:
 		    "v"			for |charwise| text
@@ -3535,10 +2889,44 @@ getregtype([{regname}])					*getregtype()*
 		The {regname} argument is a string.  If {regname} is not
 		specified, |v:register| is used.
 
-		Can also be used as a |method|: >
-			GetRegname()->getregtype()
-
-gettabinfo([{tabnr}])					*gettabinfo()*
+getscriptinfo([{opts}])                                        *getscriptinfo()*
+		Returns a |List| with information about all the sourced Vim
+		scripts in the order they were sourced, like what
+		`:scriptnames` shows.
+
+		The optional Dict argument {opts} supports the following
+		optional items:
+		    name	Script name match pattern. If specified,
+				and "sid" is not specified, information about
+				scripts with a name that match the pattern
+				"name" are returned.
+		    sid		Script ID |<SID>|.  If specified, only
+				information about the script with ID "sid" is
+				returned and "name" is ignored.
+
+		Each item in the returned List is a |Dict| with the following
+		items:
+		    autoload	Always set to FALSE.
+		    functions   List of script-local function names defined in
+				the script.  Present only when a particular
+				script is specified using the "sid" item in
+				{opts}.
+		    name	Vim script file name.
+		    sid		Script ID |<SID>|.
+		    variables   A dictionary with the script-local variables.
+				Present only when a particular script is
+				specified using the "sid" item in {opts}.
+				Note that this is a copy, the value of
+				script-local variables cannot be changed using
+				this dictionary.
+		    version	Vim script version, always 1
+
+		Examples: >vim
+			echo getscriptinfo({'name': 'myscript'})
+			echo getscriptinfo({'sid': 15}).variables
+<
+
+gettabinfo([{tabnr}])                                             *gettabinfo()*
 		If {tabnr} is not specified, then information about all the
 		tab pages is returned as a |List|. Each List item is a
 		|Dictionary|.  Otherwise, {tabnr} specifies the tab page
@@ -3551,10 +2939,7 @@ gettabinfo([{tabnr}])					*gettabinfo()*
 					tabpage-local variables
 			windows		List of |window-ID|s in the tab page.
 
-		Can also be used as a |method|: >
-			GetTabnr()->gettabinfo()
-
-gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
+gettabvar({tabnr}, {varname} [, {def}])                            *gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
 		{tabnr}. |t:var|
 		Tabs are numbered starting with one.
@@ -3564,10 +2949,7 @@ gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 		When the tab or variable doesn't exist {def} or an empty
 		string is returned, there is no error message.
 
-		Can also be used as a |method|: >
-			GetTabnr()->gettabvar(varname)
-
-gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
+gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])             *gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
 		The {varname} argument is a string.  When {varname} is empty a
@@ -3586,17 +2968,15 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 		or buffer-local variable.
 		When the tab, window or variable doesn't exist {def} or an
 		empty string is returned, there is no error message.
-		Examples: >
-			:let list_is_on = gettabwinvar(1, 2, '&list')
-			:echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
+		Examples: >vim
+			let list_is_on = gettabwinvar(1, 2, '&list')
+			echo "myvar = " .. gettabwinvar(3, 1, 'myvar')
 <
-		To obtain all window-local variables use: >
+		To obtain all window-local variables use: >vim
 			gettabwinvar({tabnr}, {winnr}, '&')
+<
 
-<		Can also be used as a |method|: >
-			GetTabnr()->gettabwinvar(winnr, varname)
-
-gettagstack([{winnr}])					*gettagstack()*
+gettagstack([{winnr}])                                           *gettagstack()*
 		The result is a Dict, which is the tag stack of window {winnr}.
 		{winnr} can be the window number or the |window-ID|.
 		When {winnr} is not specified, the current window is used.
@@ -3624,11 +3004,7 @@ gettagstack([{winnr}])					*gettagstack()*
 
 		See |tagstack| for more information about the tag stack.
 
-		Can also be used as a |method|: >
-			GetWinnr()->gettagstack()
-
-
-gettext({text})						*gettext()*
+gettext({text})                                                      *gettext()*
 		Translate String {text} if possible.
 		This is mainly for use in the distributed Vim scripts.  When
 		generating message translations the {text} is extracted by
@@ -3639,8 +3015,7 @@ gettext({text})						*gettext()*
 		xgettext does not understand escaping in single quoted
 		strings.
 
-
-getwininfo([{winid}])					*getwininfo()*
+getwininfo([{winid}])                                             *getwininfo()*
 		Returns information about windows as a |List| with Dictionaries.
 
 		If {winid} is given Information about the window with that ID
@@ -3674,10 +3049,7 @@ getwininfo([{winid}])					*getwininfo()*
 			winrow		topmost screen line of the window;
 					"row" from |win_screenpos()|
 
-		Can also be used as a |method|: >
-			GetWinnr()->getwininfo()
-
-getwinpos([{timeout}])					*getwinpos()*
+getwinpos([{timeout}])                                             *getwinpos()*
 		The result is a |List| with two numbers, the result of
 		|getwinposx()| and |getwinposy()| combined:
 			[x-pos, y-pos]
@@ -3688,7 +3060,7 @@ getwinpos([{timeout}])					*getwinpos()*
 		When using a value less than 10 and no response is received
 		within that time, a previously reported position is returned,
 		if available.  This can be used to poll for the position and
-		do some work in the meantime: >
+		do some work in the meantime: >vim
 			while 1
 			  let res = getwinpos(1)
 			  if res[0] >= 0
@@ -3697,31 +3069,26 @@ getwinpos([{timeout}])					*getwinpos()*
 			  " Do some work here
 			endwhile
 <
-		Can also be used as a |method|: >
-			GetTimeout()->getwinpos()
-<
-							*getwinposx()*
-getwinposx()	The result is a Number, which is the X coordinate in pixels of
+
+getwinposx()                                                      *getwinposx()*
+		The result is a Number, which is the X coordinate in pixels of
 		the left hand side of the GUI Vim window.  The result will be
 		-1 if the information is not available.
 		The value can be used with `:winpos`.
 
-							*getwinposy()*
-getwinposy()	The result is a Number, which is the Y coordinate in pixels of
+getwinposy()                                                      *getwinposy()*
+		The result is a Number, which is the Y coordinate in pixels of
 		the top of the GUI Vim window.  The result will be -1 if the
 		information is not available.
 		The value can be used with `:winpos`.
 
-getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
+getwinvar({winnr}, {varname} [, {def}])                            *getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
-		Examples: >
-			:let list_is_on = getwinvar(2, '&list')
-			:echo "myvar = " .. getwinvar(1, 'myvar')
+		Examples: >vim
+			let list_is_on = getwinvar(2, '&list')
+			echo "myvar = " .. getwinvar(1, 'myvar')
 
-<		Can also be used as a |method|: >
-			GetWinnr()->getwinvar(varname)
-<
-glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
+glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])                      *glob()*
 		Expand the file wildcards in {expr}.  See |wildcards| for the
 		use of special characters.
 
@@ -3748,37 +3115,35 @@ glob({expr} [, {nosuf} [, {list} [, {alllinks}]]])		*glob()*
 		|TRUE| then all symbolic links are included.
 
 		For most systems backticks can be used to get files names from
-		any external command.  Example: >
-			:let tagfiles = glob("`find . -name tags -print`")
-			:let &tags = substitute(tagfiles, "\n", ",", "g")
+		any external command.  Example: >vim
+			let tagfiles = glob("`find . -name tags -print`")
+			let &tags = substitute(tagfiles, "\n", ",", "g")
 <		The result of the program inside the backticks should be one
 		item per line.  Spaces inside an item are allowed.
 
 		See |expand()| for expanding special Vim variables.  See
 		|system()| for getting the raw output of an external command.
 
-		Can also be used as a |method|: >
-			GetExpr()->glob()
-
-glob2regpat({string})					 *glob2regpat()*
+glob2regpat({string})                                            *glob2regpat()*
 		Convert a file pattern, as used by glob(), into a search
 		pattern.  The result can be used to match with a string that
-		is a file name.  E.g. >
+		is a file name.  E.g. >vim
 			if filename =~ glob2regpat('Make*.mak')
-<		This is equivalent to: >
+			  " ...
+			endif
+<		This is equivalent to: >vim
 			if filename =~ '^Make.*\.mak$'
+			  " ...
+			endif
 <		When {string} is an empty string the result is "^$", match an
 		empty string.
 		Note that the result depends on the system.  On MS-Windows
 		a backslash usually means a path separator.
 
-		Can also be used as a |method|: >
-			GetExpr()->glob2regpat()
-<								*globpath()*
-globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])
+globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])       *globpath()*
 		Perform glob() for String {expr} on all directories in {path}
-		and concatenate the results.  Example: >
-			:echo globpath(&rtp, "syntax/c.vim")
+		and concatenate the results.  Example: >vim
+			echo globpath(&rtp, "syntax/c.vim")
 <
 		{path} is a comma-separated list of directory names.  Each
 		directory name is prepended to {expr} and expanded like with
@@ -3798,35 +3163,31 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {allinks}]]])
 		with all matching files. The advantage of using a List is, you
 		also get filenames containing newlines correctly. Otherwise
 		the result is a String and when there are several matches,
-		they are separated by <NL> characters.  Example: >
-			:echo globpath(&rtp, "syntax/c.vim", 0, 1)
+		they are separated by <NL> characters.  Example: >vim
+			echo globpath(&rtp, "syntax/c.vim", 0, 1)
 <
 		{allinks} is used as with |glob()|.
 
 		The "**" item can be used to search in a directory tree.
 		For example, to find all "README.txt" files in the directories
-		in 'runtimepath' and below: >
-			:echo globpath(&rtp, "**/README.txt")
+		in 'runtimepath' and below: >vim
+			echo globpath(&rtp, "**/README.txt")
 <		Upwards search and limiting the depth of "**" is not
 		supported, thus using 'path' will not always work properly.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetExpr()->globpath(&rtp)
-<
-							*has()*
-has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
+has({feature})                                                           *has()*
+		Returns 1 if {feature} is supported, 0 otherwise.  The
 		{feature} argument is a feature name like "nvim-0.2.1" or
 		"win32", see below.  See also |exists()|.
 
-		To get the system name use |vim.loop|.os_uname() in Lua: >
-			:lua print(vim.loop.os_uname().sysname)
+		To get the system name use |vim.uv|.os_uname() in Lua: >lua
+			print(vim.uv.os_uname().sysname)
 
 <		If the code has a syntax error then Vimscript may skip the
 		rest of the line.  Put |:if| and |:endif| on separate lines to
-		avoid the syntax error: >
+		avoid the syntax error: >vim
 			if has('feature')
-			  let x = this->breaks->without->the->feature
+			  let x = this_breaks_without_the_feature()
 			endif
 <
 		Vim's compile-time feature-names (prefixed with "+") are not
@@ -3835,12 +3196,16 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 
 		Feature names can be:
 		1.  Nvim version. For example the "nvim-0.2.1" feature means
-		    that Nvim is version 0.2.1 or later: >
-			:if has("nvim-0.2.1")
+		    that Nvim is version 0.2.1 or later: >vim
+			if has("nvim-0.2.1")
+			  " ...
+			endif
 
 <		2.  Runtime condition or other pseudo-feature. For example the
-		    "win32" feature checks if the current system is Windows: >
-			:if has("win32")
+		    "win32" feature checks if the current system is Windows: >vim
+			if has("win32")
+			  " ...
+			endif
 <							*feature-list*
 		    List of supported pseudo-feature names:
 			acl		|ACL| support.
@@ -3848,6 +3213,7 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 			clipboard	|clipboard| provider is available.
 			fname_case	Case in file names matters (for Darwin and MS-Windows
 					this is not present).
+			gui_running	Nvim has a GUI.
 			iconv		Can use |iconv()| for conversion.
 			linux		Linux system.
 			mac		MacOS system.
@@ -3865,43 +3231,41 @@ has({feature})	Returns 1 if {feature} is supported, 0 otherwise.  The
 
 							*has-patch*
 		3.  Vim patch. For example the "patch123" feature means that
-		    Vim patch 123 at the current |v:version| was included: >
-			:if v:version > 602 || v:version == 602 && has("patch148")
+		    Vim patch 123 at the current |v:version| was included: >vim
+			if v:version > 602 || v:version == 602 && has("patch148")
+			  " ...
+			endif
 
 <		4.  Vim version. For example the "patch-7.4.237" feature means
-		    that Nvim is Vim-compatible to version 7.4.237 or later. >
-			:if has("patch-7.4.237")
-
+		    that Nvim is Vim-compatible to version 7.4.237 or later. >vim
+			if has("patch-7.4.237")
+			  " ...
+			endif
+<
 
-has_key({dict}, {key})					*has_key()*
+has_key({dict}, {key})                                               *has_key()*
 		The result is a Number, which is TRUE if |Dictionary| {dict}
 		has an entry with key {key}.  FALSE otherwise. The {key}
 		argument is a string.
 
-		Can also be used as a |method|: >
-			mydict->has_key(key)
-
-haslocaldir([{winnr} [, {tabnr}]])			*haslocaldir()*
+haslocaldir([{winnr} [, {tabnr}]])                               *haslocaldir()*
 		The result is a Number, which is 1 when the window has set a
 		local path via |:lcd| or when {winnr} is -1 and the tabpage
 		has set a local path via |:tcd|, otherwise 0.
 
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing argument implies 0.
-		Thus the following are equivalent: >
-			haslocaldir()
-			haslocaldir(0)
-			haslocaldir(0, 0)
+		Thus the following are equivalent: >vim
+			echo haslocaldir()
+			echo haslocaldir(0)
+			echo haslocaldir(0, 0)
 <		With {winnr} use that window in the current tabpage.
 		With {winnr} and {tabnr} use the window in that tabpage.
 		{winnr} can be the window number or the |window-ID|.
 		If {winnr} is -1 it is ignored, only the tab is resolved.
 		Throw error if the arguments are invalid. |E5000| |E5001| |E5002|
 
-		Can also be used as a |method|: >
-			GetWinnr()->haslocaldir()
-
-hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
+hasmapto({what} [, {mode} [, {abbr}]])                              *hasmapto()*
 		The result is a Number, which is TRUE if there is a mapping
 		that contains {what} in somewhere in the rhs (what it is
 		mapped to) and this mapping exists in one of the modes
@@ -3925,17 +3289,14 @@ hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
 		When {mode} is omitted, "nvo" is used.
 
 		This function is useful to check if a mapping already exists
-		to a function in a Vim script.  Example: >
-			:if !hasmapto('\ABCdoit')
-			:   map <Leader>d \ABCdoit
-			:endif
+		to a function in a Vim script.  Example: >vim
+			if !hasmapto('\ABCdoit')
+			   map <Leader>d \ABCdoit
+			endif
 <		This installs the mapping to "\ABCdoit" only if there isn't
 		already a mapping to "\ABCdoit".
 
-		Can also be used as a |method|: >
-			GetRHS()->hasmapto()
-
-histadd({history}, {item})				*histadd()*
+histadd({history}, {item})                                           *histadd()*
 		Add the String {item} to the history {history} which can be
 		one of:					*hist-names*
 			"cmd"	 or ":"	  command line history
@@ -3951,16 +3312,12 @@ histadd({history}, {item})				*histadd()*
 		The result is a Number: TRUE if the operation was successful,
 		otherwise FALSE is returned.
 
-		Example: >
-			:call histadd("input", strftime("%Y %b %d"))
-			:let date=input("Enter date: ")
+		Example: >vim
+			call histadd("input", strftime("%Y %b %d"))
+			let date=input("Enter date: ")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetHistory()->histadd('search')
-
-histdel({history} [, {item}])				*histdel()*
+histdel({history} [, {item}])                                        *histdel()*
 		Clear {history}, i.e. delete all its entries.  See |hist-names|
 		for the possible values of {history}.
 
@@ -3976,26 +3333,24 @@ histdel({history} [, {item}])				*histdel()*
 		is returned.
 
 		Examples:
-		Clear expression register history: >
-			:call histdel("expr")
+		Clear expression register history: >vim
+			call histdel("expr")
 <
-		Remove all entries starting with "*" from the search history: >
-			:call histdel("/", '^\*')
+		Remove all entries starting with "*" from the search history: >vim
+			call histdel("/", '^\*')
 <
-		The following three are equivalent: >
-			:call histdel("search", histnr("search"))
-			:call histdel("search", -1)
-			:call histdel("search", '^' .. histget("search", -1) .. '$')
+		The following three are equivalent: >vim
+			call histdel("search", histnr("search"))
+			call histdel("search", -1)
+			call histdel("search", '^' .. histget("search", -1) .. '$')
 <
 		To delete the last search pattern and use the last-but-one for
-		the "n" command and 'hlsearch': >
-			:call histdel("search", -1)
-			:let @/ = histget("search", -1)
+		the "n" command and 'hlsearch': >vim
+			call histdel("search", -1)
+			let @/ = histget("search", -1)
 <
-		Can also be used as a |method|: >
-			GetHistory()->histdel()
 
-histget({history} [, {index}])				*histget()*
+histget({history} [, {index}])                                       *histget()*
 		The result is a String, the entry with Number {index} from
 		{history}.  See |hist-names| for the possible values of
 		{history}, and |:history-indexing| for {index}.  If there is
@@ -4003,55 +3358,45 @@ histget({history} [, {index}])				*histget()*
 		omitted, the most recent item from the history is used.
 
 		Examples:
-		Redo the second last search from history. >
-			:execute '/' .. histget("search", -2)
+		Redo the second last search from history. >vim
+			execute '/' .. histget("search", -2)
 
 <		Define an Ex command ":H {num}" that supports re-execution of
-		the {num}th entry from the output of |:history|. >
-			:command -nargs=1 H execute histget("cmd", 0+<args>)
+		the {num}th entry from the output of |:history|. >vim
+			command -nargs=1 H execute histget("cmd", 0+<args>)
 <
-		Can also be used as a |method|: >
-			GetHistory()->histget()
 
-histnr({history})					*histnr()*
+histnr({history})                                                     *histnr()*
 		The result is the Number of the current entry in {history}.
 		See |hist-names| for the possible values of {history}.
 		If an error occurred, -1 is returned.
 
-		Example: >
-			:let inp_index = histnr("expr")
+		Example: >vim
+			let inp_index = histnr("expr")
 
-<		Can also be used as a |method|: >
-			GetHistory()->histnr()
+hlID({name})                                                            *hlID()*
+		The result is a Number, which is the ID of the highlight group
+		with name {name}.  When the highlight group doesn't exist,
+		zero is returned.
+		This can be used to retrieve information about the highlight
+		group.  For example, to get the background color of the
+		"Comment" group: >vim
+			echo synIDattr(synIDtrans(hlID("Comment")), "bg")
 <
-hlexists({name})					*hlexists()*
+
+hlexists({name})                                                    *hlexists()*
 		The result is a Number, which is TRUE if a highlight group
 		called {name} exists.  This is when the group has been
 		defined in some way.  Not necessarily when highlighting has
 		been defined for it, it may also have been used for a syntax
 		item.
 
-		Can also be used as a |method|: >
-			GetName()->hlexists()
-<
-							*hlID()*
-hlID({name})	The result is a Number, which is the ID of the highlight group
-		with name {name}.  When the highlight group doesn't exist,
-		zero is returned.
-		This can be used to retrieve information about the highlight
-		group.  For example, to get the background color of the
-		"Comment" group: >
-	:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
-<
-		Can also be used as a |method|: >
-			GetName()->hlID()
-
-hostname()						*hostname()*
+hostname()                                                          *hostname()*
 		The result is a String, which is the name of the machine on
 		which Vim is currently running.  Machine names greater than
 		256 characters long are truncated.
 
-iconv({string}, {from}, {to})				*iconv()*
+iconv({string}, {from}, {to})                                          *iconv()*
 		The result is a String, which is the text {string} converted
 		from encoding {from} to encoding {to}.
 		When the conversion completely fails an empty string is
@@ -4063,42 +3408,97 @@ iconv({string}, {from}, {to})				*iconv()*
 		from/to UCS-2 is automatically changed to use UTF-8.  You
 		cannot use UCS-2 in a string anyway, because of the NUL bytes.
 
-		Can also be used as a |method|: >
-			GetText()->iconv('latin1', 'utf-8')
-<
-							*indent()*
-indent({lnum})	The result is a Number, which is indent of line {lnum} in the
+id({expr})                                                                *id()*
+		Returns a |String| which is a unique identifier of the
+		container type (|List|, |Dict|, |Blob| and |Partial|). It is
+		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
+		returns true iff `type(v1) == type(v2) && v1 is v2`.
+		Note that `v:_null_string`, `v:_null_list`, `v:_null_dict` and
+		`v:_null_blob` have the same `id()` with different types
+		because they are internally represented as NULL pointers.
+		`id()` returns a hexadecimal representanion of the pointers to
+		the containers (i.e. like `0x994a40`), same as `printf("%p",
+		{expr})`, but it is advised against counting on the exact
+		format of the return value.
+
+		It is not guaranteed that `id(no_longer_existing_container)`
+		will not be equal to some other `id()`: new containers may
+		reuse identifiers of the garbage-collected ones.
+
+indent({lnum})                                                        *indent()*
+		The result is a Number, which is indent of line {lnum} in the
 		current buffer.  The indent is counted in spaces, the value
 		of 'tabstop' is relevant.  {lnum} is used just like in
 		|getline()|.
 		When {lnum} is invalid -1 is returned.
 
-		Can also be used as a |method|: >
-			GetLnum()->indent()
+index({object}, {expr} [, {start} [, {ic}]])                           *index()*
+		Find {expr} in {object} and return its index.  See
+		|indexof()| for using a lambda to select the item.
 
-index({object}, {expr} [, {start} [, {ic}]])			*index()*
 		If {object} is a |List| return the lowest index where the item
 		has a value equal to {expr}.  There is no automatic
 		conversion, so the String "4" is different from the Number 4.
 		And the Number 4 is different from the Float 4.0.  The value
-		of 'ignorecase' is not used here, case always matters.
+		of 'ignorecase' is not used here, case matters as indicated by
+		the {ic} argument.
 
 		If {object} is a |Blob| return the lowest index where the byte
 		value is equal to {expr}.
 
 		If {start} is given then start looking at the item with index
 		{start} (may be negative for an item relative to the end).
+
 		When {ic} is given and it is |TRUE|, ignore case.  Otherwise
 		case must match.
+
 		-1 is returned when {expr} is not found in {object}.
-		Example: >
-			:let idx = index(words, "the")
-			:if index(numbers, 123) >= 0
+		Example: >vim
+			let idx = index(words, "the")
+			if index(numbers, 123) >= 0
+			  " ...
+			endif
+
+indexof({object}, {expr} [, {opts}])                                 *indexof()*
+		Returns the index of an item in {object} where {expr} is
+		v:true.  {object} must be a |List| or a |Blob|.
 
-<		Can also be used as a |method|: >
-			GetObject()->index(what)
+		If {object} is a |List|, evaluate {expr} for each item in the
+		List until the expression is v:true and return the index of
+		this item.
+
+		If {object} is a |Blob| evaluate {expr} for each byte in the
+		Blob until the expression is v:true and return the index of
+		this byte.
+
+		{expr} must be a |string| or |Funcref|.
+
+		If {expr} is a |string|: If {object} is a |List|, inside
+		{expr} |v:key| has the index of the current List item and
+		|v:val| has the value of the item.  If {object} is a |Blob|,
+		inside {expr} |v:key| has the index of the current byte and
+		|v:val| has the byte value.
+
+		If {expr} is a |Funcref| it must take two arguments:
+			1. the key or the index of the current item.
+			2. the value of the current item.
+		The function must return |TRUE| if the item is found and the
+		search should stop.
+
+		The optional argument {opts} is a Dict and supports the
+		following items:
+		    startidx	start evaluating {expr} at the item with this
+				index; may be negative for an item relative to
+				the end
+		Returns -1 when {expr} evaluates to v:false for all the items.
+		Example: >vim
+			let l = [#{n: 10}, #{n: 20}, #{n: 30}]
+			echo indexof(l, "v:val.n == 20")
+			echo indexof(l, {i, v -> v.n == 30})
+			echo indexof(l, "v:val.n == 20", #{startidx: 1})
+
+input({prompt} [, {text} [, {completion}]])                            *input()*
 
-input({prompt} [, {text} [, {completion}]])		*input()*
 input({opts})
 		The result is a String, which is whatever the user typed on
 		the command-line.  The {prompt} argument is either a prompt
@@ -4120,22 +3520,22 @@ input({opts})
 		The input is entered just like a command-line, with the same
 		editing commands and mappings.  There is a separate history
 		for lines typed for input().
-		Example: >
-			:if input("Coffee or beer? ") == "beer"
-			:  echo "Cheers!"
-			:endif
+		Example: >vim
+			if input("Coffee or beer? ") == "beer"
+			  echo "Cheers!"
+			endif
 <
 		If the optional {text} argument is present and not empty, this
 		is used for the default reply, as if the user typed this.
-		Example: >
-			:let color = input("Color? ", "white")
+		Example: >vim
+			let color = input("Color? ", "white")
 
 <		The optional {completion} argument specifies the type of
 		completion supported for the input.  Without it completion is
 		not performed.  The supported completion types are the same as
 		that can be supplied to a user-defined command using the
 		"-complete=" argument.  Refer to |:command-completion| for
-		more information.  Example: >
+		more information.  Example: >vim
 			let fname = input("File: ", "", "file")
 
 <					*input()-highlight* *E5400* *E5402*
@@ -4156,7 +3556,7 @@ input({opts})
 		sections must be ordered so that next hl_start_col is greater
 		then or equal to previous hl_end_col.
 
-		Example (try some input with parentheses): >
+		Example (try some input with parentheses): >vim
 			highlight RBP1 guibg=Red ctermbg=red
 			highlight RBP2 guibg=Yellow ctermbg=yellow
 			highlight RBP3 guibg=Green ctermbg=green
@@ -4201,18 +3601,15 @@ input({opts})
 		that further characters follow in the mapping, e.g., by using
 		|:execute| or |:normal|.
 
-		Example with a mapping: >
-			:nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
-			:function GetFoo()
-			:  call inputsave()
-			:  let g:Foo = input("enter search pattern: ")
-			:  call inputrestore()
-			:endfunction
-
-<		Can also be used as a |method|: >
-			GetPrompt()->input()
+		Example with a mapping: >vim
+			nmap \x :call GetFoo()<CR>:exe "/" .. Foo<CR>
+			function GetFoo()
+			  call inputsave()
+			  let g:Foo = input("enter search pattern: ")
+			  call inputrestore()
+			endfunction
 
-inputlist({textlist})					*inputlist()*
+inputlist({textlist})                                              *inputlist()*
 		{textlist} must be a |List| of strings.  This |List| is
 		displayed, one string per line.  The user will be prompted to
 		enter a number, which is returned.
@@ -4225,20 +3622,17 @@ inputlist({textlist})					*inputlist()*
 		Make sure {textlist} has less than 'lines' entries, otherwise
 		it won't work.  It's a good idea to put the entry number at
 		the start of the string.  And put a prompt in the first item.
-		Example: >
+		Example: >vim
 			let color = inputlist(['Select color:', '1. red',
 				\ '2. green', '3. blue'])
 
-<		Can also be used as a |method|: >
-			GetChoices()->inputlist()
-
-inputrestore()						*inputrestore()*
+inputrestore()                                                  *inputrestore()*
 		Restore typeahead that was saved with a previous |inputsave()|.
 		Should be called the same number of times inputsave() is
 		called.  Calling it more often is harmless though.
 		Returns TRUE when there is nothing to restore, FALSE otherwise.
 
-inputsave()						*inputsave()*
+inputsave()                                                        *inputsave()*
 		Preserve typeahead (also from mappings) and clear it, so that
 		a following prompt gets input from the user.  Should be
 		followed by a matching inputrestore() after the prompt.  Can
@@ -4246,7 +3640,7 @@ inputsave()						*inputsave()*
 		many inputrestore() calls.
 		Returns TRUE when out of memory, FALSE otherwise.
 
-inputsecret({prompt} [, {text}])			*inputsecret()*
+inputsecret({prompt} [, {text}])                                 *inputsecret()*
 		This function acts much like the |input()| function with but
 		two exceptions:
 		a) the user's response will be displayed as a sequence of
@@ -4257,10 +3651,7 @@ inputsecret({prompt} [, {text}])			*inputsecret()*
 		typed on the command-line in response to the issued prompt.
 		NOTE: Command-line completion is not supported.
 
-		Can also be used as a |method|: >
-			GetPrompt()->inputsecret()
-
-insert({object}, {item} [, {idx}])			*insert()*
+insert({object}, {item} [, {idx}])                                    *insert()*
 		When {object} is a |List| or a |Blob| insert {item} at the start
 		of it.
 
@@ -4269,129 +3660,96 @@ insert({object}, {item} [, {idx}])			*insert()*
 		like omitting {idx}.  A negative {idx} is also possible, see
 		|list-index|.  -1 inserts just before the last item.
 
-		Returns the resulting |List| or |Blob|.  Examples: >
-			:let mylist = insert([2, 3, 5], 1)
-			:call insert(mylist, 4, -1)
-			:call insert(mylist, 6, len(mylist))
+		Returns the resulting |List| or |Blob|.  Examples: >vim
+			let mylist = insert([2, 3, 5], 1)
+			call insert(mylist, 4, -1)
+			call insert(mylist, 6, len(mylist))
 <		The last example can be done simpler with |add()|.
 		Note that when {item} is a |List| it is inserted as a single
 		item.  Use |extend()| to concatenate |Lists|.
 
-		Can also be used as a |method|: >
-			mylist->insert(item)
-
-interrupt()						*interrupt()*
+interrupt()                                                        *interrupt()*
 		Interrupt script execution.  It works more or less like the
 		user typing CTRL-C, most commands won't execute and control
 		returns to the user.  This is useful to abort execution
-		from lower down, e.g. in an autocommand.  Example: >
-		:function s:check_typoname(file)
-		:   if fnamemodify(a:file, ':t') == '['
-		:       echomsg 'Maybe typo'
-		:       call interrupt()
-		:   endif
-		:endfunction
-		:au BufWritePre * call s:check_typoname(expand('<amatch>'))
-
-invert({expr})						*invert()*
+		from lower down, e.g. in an autocommand.  Example: >vim
+		function s:check_typoname(file)
+		   if fnamemodify(a:file, ':t') == '['
+		       echomsg 'Maybe typo'
+		       call interrupt()
+		   endif
+		endfunction
+		au BufWritePre * call s:check_typoname(expand('<amatch>'))
+<
+
+invert({expr})                                                        *invert()*
 		Bitwise invert.  The argument is converted to a number.  A
-		List, Dict or Float argument causes an error.  Example: >
-			:let bits = invert(bits)
-<		Can also be used as a |method|: >
-			:let bits = bits->invert()
+		List, Dict or Float argument causes an error.  Example: >vim
+			let bits = invert(bits)
+<
 
-isdirectory({directory})				*isdirectory()*
+isdirectory({directory})                                         *isdirectory()*
 		The result is a Number, which is |TRUE| when a directory
 		with the name {directory} exists.  If {directory} doesn't
 		exist, or isn't a directory, the result is |FALSE|.  {directory}
 		is any expression, which is used as a String.
 
-		Can also be used as a |method|: >
-			GetName()->isdirectory()
-
-isinf({expr})						*isinf()*
+isinf({expr})                                                          *isinf()*
 		Return 1 if {expr} is a positive infinity, or -1 a negative
-		infinity, otherwise 0. >
-			:echo isinf(1.0 / 0.0)
-<			1 >
-			:echo isinf(-1.0 / 0.0)
+		infinity, otherwise 0. >vim
+			echo isinf(1.0 / 0.0)
+<			1 >vim
+			echo isinf(-1.0 / 0.0)
 <			-1
 
-		Can also be used as a |method|: >
-			Compute()->isinf()
-
-islocked({expr})					*islocked()* *E786*
+islocked({expr})                                               *islocked()* *E786*
 		The result is a Number, which is |TRUE| when {expr} is the
 		name of a locked variable.
 		The string argument {expr} must be the name of a variable,
 		|List| item or |Dictionary| entry, not the variable itself!
-		Example: >
-			:let alist = [0, ['a', 'b'], 2, 3]
-			:lockvar 1 alist
-			:echo islocked('alist')		" 1
-			:echo islocked('alist[1]')	" 0
+		Example: >vim
+			let alist = [0, ['a', 'b'], 2, 3]
+			lockvar 1 alist
+			echo islocked('alist')		" 1
+			echo islocked('alist[1]')	" 0
 
 <		When {expr} is a variable that does not exist you get an error
 		message.  Use |exists()| to check for existence.
 
-		Can also be used as a |method|: >
-			GetName()->islocked()
-
-id({expr})						*id()*
-		Returns a |String| which is a unique identifier of the
-		container type (|List|, |Dict|, |Blob| and |Partial|). It is
-		guaranteed that for the mentioned types `id(v1) ==# id(v2)`
-		returns true iff `type(v1) == type(v2) && v1 is v2`.
-		Note that |v:_null_string|, |v:_null_list|, |v:_null_dict| and
-		|v:_null_blob| have the same `id()` with different types
-		because they are internally represented as NULL pointers.
-		`id()` returns a hexadecimal representanion of the pointers to
-		the containers (i.e. like `0x994a40`), same as `printf("%p",
-		{expr})`, but it is advised against counting on the exact
-		format of the return value.
-
-		It is not guaranteed that `id(no_longer_existing_container)`
-		will not be equal to some other `id()`: new containers may
-		reuse identifiers of the garbage-collected ones.
+isnan({expr})                                                          *isnan()*
+		Return |TRUE| if {expr} is a float with value NaN. >vim
+			echo isnan(0.0 / 0.0)
+<			1
 
-items({dict})						*items()*
+items({dict})                                                          *items()*
 		Return a |List| with all the key-value pairs of {dict}.  Each
 		|List| item is a list with two items: the key of a {dict}
 		entry and the value of this entry.  The |List| is in arbitrary
 		order.  Also see |keys()| and |values()|.
-		Example: >
+		Example: >vim
 			for [key, value] in items(mydict)
 			   echo key .. ': ' .. value
 			endfor
 
-<		Can also be used as a |method|: >
-			mydict->items()
-
-isnan({expr})						*isnan()*
-		Return |TRUE| if {expr} is a float with value NaN. >
-			echo isnan(0.0 / 0.0)
-<			1
-
-		Can also be used as a |method|: >
-			Compute()->isnan()
-
-jobpid({job})						*jobpid()*
+jobpid({job})                                                         *jobpid()*
 		Return the PID (process id) of |job-id| {job}.
 
-jobresize({job}, {width}, {height})			*jobresize()*
+jobresize({job}, {width}, {height})                                *jobresize()*
 		Resize the pseudo terminal window of |job-id| {job} to {width}
 		columns and {height} rows.
 		Fails if the job was not started with `"pty":v:true`.
 
-jobstart({cmd} [, {opts}])				*jobstart()*
+jobstart({cmd} [, {opts}])                                          *jobstart()*
+		Note: Prefer |vim.system()| in Lua (unless using the `pty` option).
+
 		Spawns {cmd} as a job.
 		If {cmd} is a List it runs directly (no 'shell').
-		If {cmd} is a String it runs in the 'shell', like this: >
-		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+		If {cmd} is a String it runs in the 'shell', like this: >vim
+		  call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 <		(See |shell-unquoting| for details.)
 
-		Example: >
-		  :call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
+		Example: >vim
+		  call jobstart('nvim -h', {'on_stdout':{j,d,e->append(line('.'),d)}})
 <
 		Returns |job-id| on success, 0 on invalid arguments (or job
 		table is full), -1 if {cmd}[0] or 'shell' is not executable.
@@ -4404,10 +3762,10 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 
 		NOTE: on Windows if {cmd} is a List:
 		  - cmd[0] must be an executable (not a "built-in"). If it is
-		    in $PATH it can be called by name, without an extension: >
-		      :call jobstart(['ping', 'neovim.io'])
-<		    If it is a full or partial path, extension is required: >
-		      :call jobstart(['System32\ping.exe', 'neovim.io'])
+		    in $PATH it can be called by name, without an extension: >vim
+		      call jobstart(['ping', 'neovim.io'])
+<		    If it is a full or partial path, extension is required: >vim
+		      call jobstart(['System32\ping.exe', 'neovim.io'])
 <		  - {cmd} is collapsed to a string of quoted args as expected
 		    by CommandLineToArgvW https://msdn.microsoft.com/bb776391
 		    unless cmd[0] is some form of "cmd.exe".
@@ -4439,11 +3797,9 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 			      stdout data.
 		  |on_stderr|:  (function) Callback invoked when the job emits
 			      stderr data.
-		  overlapped: (boolean) Set FILE_FLAG_OVERLAPPED for the
-			      standard input/output passed to the child process.
-			      Normally you do not need to set this.
-			      (Only available on MS-Windows, On other
-			      platforms, this option is silently ignored.)
+		  overlapped: (boolean) Sets FILE_FLAG_OVERLAPPED for the
+			      stdio passed to the child process. Only on
+			      MS-Windows; ignored on other platforms.
 		  pty:	      (boolean) Connect the job to a new pseudo
 			      terminal, and its streams to the master file
 			      descriptor. `on_stdout` receives all output,
@@ -4469,7 +3825,7 @@ jobstart({cmd} [, {opts}])				*jobstart()*
 		  - -1 if {cmd}[0] is not executable.
 		See also |job-control|, |channel|, |msgpack-rpc|.
 
-jobstop({id})						*jobstop()*
+jobstop({id})                                                        *jobstop()*
 		Stop |job-id| {id} by sending SIGTERM to the job process. If
 		the process does not terminate after a timeout then SIGKILL
 		will be sent. When the job terminates its |on_exit| handler
@@ -4479,14 +3835,14 @@ jobstop({id})						*jobstop()*
 		Returns 1 for valid job id, 0 for invalid id, including jobs have
 		exited or stopped.
 
-jobwait({jobs} [, {timeout}])				*jobwait()*
+jobwait({jobs} [, {timeout}])                                        *jobwait()*
 		Waits for jobs and their |on_exit| handlers to complete.
 
 		{jobs} is a List of |job-id|s to wait for.
 		{timeout} is the maximum waiting time in milliseconds. If
 		omitted or -1, wait forever.
 
-		Timeout of 0 can be used to check the status of a job: >
+		Timeout of 0 can be used to check the status of a job: >vim
 			let running = jobwait([{job-id}], 0)[0] == -1
 <
 		During jobwait() callbacks for jobs not in the {jobs} list may
@@ -4500,21 +3856,18 @@ jobwait({jobs} [, {timeout}])				*jobwait()*
 			-2 if the job was interrupted (by |CTRL-C|)
 			-3 if the job-id is invalid
 
-join({list} [, {sep}])					*join()*
+join({list} [, {sep}])                                                  *join()*
 		Join the items in {list} together into one String.
 		When {sep} is specified it is put in between the items.  If
 		{sep} is omitted a single space is used.
 		Note that {sep} is not added at the end.  You might want to
-		add it there too: >
+		add it there too: >vim
 			let lines = join(mylist, "\n") .. "\n"
 <		String items are used as-is.  |Lists| and |Dictionaries| are
 		converted into a string like with |string()|.
 		The opposite function is |split()|.
 
-		Can also be used as a |method|: >
-			mylist->join()
-
-json_decode({expr})					*json_decode()*
+json_decode({expr})                                              *json_decode()*
 		Convert {expr} from JSON object.  Accepts |readfile()|-style
 		list as the input, as well as regular string.  May output any
 		Vim value. In the following cases it will output
@@ -4530,10 +3883,7 @@ json_decode({expr})					*json_decode()*
 		recommended and the only one required to be supported.
 		Non-UTF-8 characters are an error.
 
-		Can also be used as a |method|: >
-			ReadObject()->json_decode()
-
-json_encode({expr})					*json_encode()*
+json_encode({expr})                                              *json_encode()*
 		Convert {expr} into a JSON string.  Accepts
 		|msgpack-special-dict| as the input.  Will not convert
 		|Funcref|s, mappings with non-string keys (can be created as
@@ -4545,28 +3895,19 @@ json_encode({expr})					*json_encode()*
 		or special escapes like "\t", other are dumped as-is.
 		|Blob|s are converted to arrays of the individual bytes.
 
-		Can also be used as a |method|: >
-			GetObject()->json_encode()
-
-keys({dict})						*keys()*
+keys({dict})                                                            *keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.  Also see |items()| and |values()|.
 
-		Can also be used as a |method|: >
-			mydict->keys()
-
-keytrans({string})					*keytrans()*
+keytrans({string})                                                  *keytrans()*
 		Turn the internal byte representation of keys into a form that
-		can be used for |:map|.  E.g. >
-			:let xx = "\<C-Home>"
-			:echo keytrans(xx)
+		can be used for |:map|.  E.g. >vim
+			let xx = "\<C-Home>"
+			echo keytrans(xx)
 <			<C-Home>
 
-		Can also be used as a |method|: >
-			"\<C-Home>"->keytrans()
-
-<							*len()* *E701*
-len({expr})	The result is a Number, which is the length of the argument.
+len({expr})                                                         *len()* *E701*
+		The result is a Number, which is the length of the argument.
 		When {expr} is a String or a Number the length in bytes is
 		used, as with |strlen()|.
 		When {expr} is a |List| the number of items in the |List| is
@@ -4576,11 +3917,7 @@ len({expr})	The result is a Number, which is the length of the argument.
 		|Dictionary| is returned.
 		Otherwise an error is given and returns zero.
 
-		Can also be used as a |method|: >
-			mylist->len()
-
-<						*libcall()* *E364* *E368*
-libcall({libname}, {funcname}, {argument})
+libcall({libname}, {funcname}, {argument})                 *libcall()* *E364* *E368*
 		Call function {funcname} in the run-time library {libname}
 		with single argument {argument}.
 		This is useful to call functions in a library that you
@@ -4619,27 +3956,19 @@ libcall({libname}, {funcname}, {argument})
 		the DLL is not in the usual places.
 		For Unix: When compiling your own plugins, remember that the
 		object code must be compiled as position-independent ('PIC').
-		Examples: >
-			:echo libcall("libc.so", "getenv", "HOME")
+		Examples: >vim
+			echo libcall("libc.so", "getenv", "HOME")
 
-<		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetValue()->libcall("libc.so", "getenv")
-<
-							*libcallnr()*
-libcallnr({libname}, {funcname}, {argument})
+libcallnr({libname}, {funcname}, {argument})                       *libcallnr()*
 		Just like |libcall()|, but used for a function that returns an
 		int instead of a string.
-		Examples: >
-			:echo libcallnr("/usr/lib/libc.so", "getpid", "")
-			:call libcallnr("libc.so", "printf", "Hello World!\n")
-			:call libcallnr("libc.so", "sleep", 10)
-<
-		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetValue()->libcallnr("libc.so", "printf")
+		Examples: >vim
+			echo libcallnr("/usr/lib/libc.so", "getpid", "")
+			call libcallnr("libc.so", "printf", "Hello World!\n")
+			call libcallnr("libc.so", "sleep", 10)
 <
-line({expr} [, {winid}])				*line()*
+
+line({expr} [, {winid}])                                                *line()*
 		The result is a Number, which is the line number of the file
 		position given with {expr}.  The {expr} argument is a string.
 		The accepted positions are:
@@ -4662,116 +3991,110 @@ line({expr} [, {winid}])				*line()*
 		With the optional {winid} argument the values are obtained for
 		that window instead of the current window.
 		Returns 0 for invalid values of {expr} and {winid}.
-		Examples: >
-			line(".")		line number of the cursor
-			line(".", winid)	idem, in window "winid"
-			line("'t")		line number of mark t
-			line("'" .. marker)	line number of mark marker
+		Examples: >vim
+			echo line(".")			" line number of the cursor
+			echo line(".", winid)		" idem, in window "winid"
+			echo line("'t")			" line number of mark t
+			echo line("'" .. marker)	" line number of mark marker
 <
 		To jump to the last known position when opening a file see
 		|last-position-jump|.
 
-		Can also be used as a |method|: >
-			GetValue()->line()
-
-line2byte({lnum})					*line2byte()*
+line2byte({lnum})                                                  *line2byte()*
 		Return the byte count from the start of the buffer for line
 		{lnum}.  This includes the end-of-line character, depending on
 		the 'fileformat' option for the current buffer.  The first
 		line returns 1. UTF-8 encoding is used, 'fileencoding' is
 		ignored.  This can also be used to get the byte count for the
-		line just below the last line: >
-			line2byte(line("$") + 1)
+		line just below the last line: >vim
+			echo line2byte(line("$") + 1)
 <		This is the buffer size plus one.  If 'fileencoding' is empty
 		it is the file size plus one.  {lnum} is used like with
 		|getline()|.  When {lnum} is invalid -1 is returned.
 		Also see |byte2line()|, |go| and |:goto|.
 
-		Can also be used as a |method|: >
-			GetLnum()->line2byte()
-
-lispindent({lnum})					*lispindent()*
+lispindent({lnum})                                                *lispindent()*
 		Get the amount of indent for line {lnum} according the lisp
 		indenting rules, as with 'lisp'.
 		The indent is counted in spaces, the value of 'tabstop' is
 		relevant.  {lnum} is used just like in |getline()|.
 		When {lnum} is invalid, -1 is returned.
 
-		Can also be used as a |method|: >
-			GetLnum()->lispindent()
+list2blob({list})                                                  *list2blob()*
+		Return a Blob concatenating all the number values in {list}.
+		Examples: >vim
+			echo list2blob([1, 2, 3, 4])	" returns 0z01020304
+			echo list2blob([])		" returns 0z
+<		Returns an empty Blob on error.  If one of the numbers is
+		negative or more than 255 error *E1239* is given.
+
+		|blob2list()| does the opposite.
 
-list2str({list} [, {utf8}])				*list2str()*
+list2str({list} [, {utf8}])                                         *list2str()*
 		Convert each number in {list} to a character string can
-		concatenate them all.  Examples: >
-			list2str([32])		returns " "
-			list2str([65, 66, 67])	returns "ABC"
-<		The same can be done (slowly) with: >
-			join(map(list, {nr, val -> nr2char(val)}), '')
+		concatenate them all.  Examples: >vim
+			echo list2str([32])		" returns " "
+			echo list2str([65, 66, 67])	" returns "ABC"
+<		The same can be done (slowly) with: >vim
+			echo join(map(list, {nr, val -> nr2char(val)}), '')
 <		|str2list()| does the opposite.
 
 		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
-		With UTF-8 composing characters work as expected: >
-			list2str([97, 769])	returns "á"
+		With UTF-8 composing characters work as expected: >vim
+			echo list2str([97, 769])	" returns "á"
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetList()->list2str()
-
-localtime()						*localtime()*
+localtime()                                                        *localtime()*
 		Return the current time, measured as seconds since 1st Jan
 		1970.  See also |strftime()|, |strptime()| and |getftime()|.
 
-
-log({expr})						*log()*
+log({expr})                                                              *log()*
 		Return the natural logarithm (base e) of {expr} as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number| in the range
 		(0, inf].
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo log(10)
-<			2.302585 >
-			:echo log(exp(5))
+		Examples: >vim
+			echo log(10)
+<			2.302585 >vim
+			echo log(exp(5))
 <			5.0
 
-		Can also be used as a |method|: >
-			Compute()->log()
-
-log10({expr})						*log10()*
+log10({expr})                                                          *log10()*
 		Return the logarithm of Float {expr} to base 10 as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo log10(1000)
-<			3.0 >
-			:echo log10(0.01)
+		Examples: >vim
+			echo log10(1000)
+<			3.0 >vim
+			echo log10(0.01)
 <			-2.0
 
-		Can also be used as a |method|: >
-			Compute()->log10()
-
-luaeval({expr} [, {expr}])
+luaeval({expr} [, {expr}])                                           *luaeval()*
 		Evaluate Lua expression {expr} and return its result converted
 		to Vim data structures. See |lua-eval| for more details.
 
-		Can also be used as a |method|: >
-			GetExpr()->luaeval()
-
-map({expr1}, {expr2})					*map()*
-		{expr1} must be a |List|, |Blob| or |Dictionary|.
-		Replace each item in {expr1} with the result of evaluating
-		{expr2}.  For a |Blob| each byte is replaced.
+map({expr1}, {expr2})                                                    *map()*
+		{expr1} must be a |List|, |String|, |Blob| or |Dictionary|.
+		When {expr1} is a |List|| or |Dictionary|, replace each
+		item in {expr1} with the result of evaluating {expr2}.
+		For a |Blob| each byte is replaced.
+		For a |String|, each character, including composing
+		characters, is replaced.
+		If the item type changes you may want to use |mapnew()| to
+		create a new List or Dictionary.
 
-		{expr2} must be a |string| or |Funcref|.
+		{expr2} must be a |String| or |Funcref|.
 
-		If {expr2} is a |string|, inside {expr2} |v:val| has the value
+		If {expr2} is a |String|, inside {expr2} |v:val| has the value
 		of the current item.  For a |Dictionary| |v:key| has the key
 		of the current item and for a |List| |v:key| has the index of
 		the current item.  For a |Blob| |v:key| has the index of the
-		current byte.
-		Example: >
-			:call map(mylist, '"> " .. v:val .. " <"')
+		current byte. For a |String| |v:key| has the index of the
+		current character.
+		Example: >vim
+			call map(mylist, '"> " .. v:val .. " <"')
 <		This puts "> " before and " <" after each item in "mylist".
 
 		Note that {expr2} is the result of an expression and is then
@@ -4783,37 +4106,35 @@ map({expr1}, {expr2})					*map()*
 			1. The key or the index of the current item.
 			2. the value of the current item.
 		The function must return the new value of the item. Example
-		that changes each value by "key-value": >
+		that changes each value by "key-value": >vim
 			func KeyValue(key, val)
 			  return a:key .. '-' .. a:val
 			endfunc
 			call map(myDict, function('KeyValue'))
-<		It is shorter when using a |lambda|: >
+<		It is shorter when using a |lambda|: >vim
 			call map(myDict, {key, val -> key .. '-' .. val})
-<		If you do not use "val" you can leave it out: >
+<		If you do not use "val" you can leave it out: >vim
 			call map(myDict, {key -> 'item: ' .. key})
-<		If you do not use "key" you can use a short name: >
+<		If you do not use "key" you can use a short name: >vim
 			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: >
-			:let tlist = map(copy(mylist), ' v:val .. "\t"')
+		The operation is done in-place for a |List| and |Dictionary|.
+		If you want it to remain unmodified make a copy first: >vim
+			let tlist = map(copy(mylist), ' v:val .. "\t"')
 
-<		Returns {expr1}, the |List|, |Blob| or |Dictionary| that was
-		filtered.  When an error is encountered while evaluating
-		{expr2} no further items in {expr1} are processed.  When
-		{expr2} is a Funcref errors inside a function are ignored,
+<		Returns {expr1}, the |List| or |Dictionary| that was filtered,
+		or a new |Blob| or |String|.
+		When an error is encountered while evaluating {expr2} no
+		further items in {expr1} are processed.
+		When {expr2} is a Funcref errors inside a function are ignored,
 		unless it was defined with the "abort" flag.
 
-		Can also be used as a |method|: >
-			mylist->map(expr2)
-
-
-maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
+maparg({name} [, {mode} [, {abbr} [, {dict}]]])                       *maparg()*
 		When {dict} is omitted or zero: Return the rhs of mapping
 		{name} in mode {mode}.  The returned String has special
 		characters translated like in the output of the ":map" command
-		listing.
+		listing. When {dict} is TRUE a dictionary is returned, see
+		below. To get a list of all mappings see |maplist()|.
 
 		When there is no mapping for {name}, an empty String is
 		returned if {dict} is FALSE, otherwise returns an empty Dict.
@@ -4841,11 +4162,11 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 
 		When {dict} is there and it is |TRUE| return a dictionary
 		containing all the information of the mapping with the
-		following items:
+		following items:			*mapping-dict*
 		  "lhs"	     The {lhs} of the mapping as it would be typed
 		  "lhsraw"   The {lhs} of the mapping as raw bytes
 		  "lhsrawalt" The {lhs} of the mapping as raw bytes, alternate
-		  	      form, only present when it differs from "lhsraw"
+			      form, only present when it differs from "lhsraw"
 		  "rhs"	     The {rhs} of the mapping as typed.
 		  "silent"   1 for a |:map-silent| mapping, else 0.
 		  "noremap"  1 if the {rhs} of the mapping is not remappable.
@@ -4859,10 +4180,17 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 			     "!"     Insert and Commandline mode
 				     (|mapmode-ic|)
 		  "sid"	     The script local ID, used for <sid> mappings
-			     (|<SID>|).
+			     (|<SID>|).  Negative for special contexts.
+		  "scriptversion"  The version of the script, always 1.
 		  "lnum"     The line number in "sid", zero if unknown.
 		  "nowait"   Do not wait for other, longer mappings.
 			     (|:map-<nowait>|).
+		  "abbr"     True if this is an |abbreviation|.
+		  "mode_bits" Nvim's internal binary representation of "mode".
+			     |mapset()| ignores this; only "mode" is used.
+			     See |maplist()| for usage examples. The values
+			     are from src/nvim/state_defs.h and may change in
+			     the future.
 
 		The dictionary can be used to restore a mapping with
 		|mapset()|.
@@ -4870,13 +4198,10 @@ maparg({name} [, {mode} [, {abbr} [, {dict}]]])			*maparg()*
 		The mappings local to the current buffer are checked first,
 		then the global mappings.
 		This function can be used to map a key even when it's already
-		mapped, and have it do the original mapping too.  Sketch: >
+		mapped, and have it do the original mapping too.  Sketch: >vim
 			exe 'nnoremap <Tab> ==' .. maparg('<Tab>', 'n')
 
-<		Can also be used as a |method|: >
-			GetKey()->maparg('n')
-
-mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
+mapcheck({name} [, {mode} [, {abbr}]])                              *mapcheck()*
 		Check if there is a mapping that matches with {name} in mode
 		{mode}.  See |maparg()| for {mode} and special names in
 		{name}.
@@ -4902,33 +4227,87 @@ mapcheck({name} [, {mode} [, {abbr}]])			*mapcheck()*
 		The mappings local to the current buffer are checked first,
 		then the global mappings.
 		This function can be used to check if a mapping can be added
-		without being ambiguous.  Example: >
-	:if mapcheck("_vv") == ""
-	:   map _vv :set guifont=7x13<CR>
-	:endif
+		without being ambiguous.  Example: >vim
+			if mapcheck("_vv") == ""
+			   map _vv :set guifont=7x13<CR>
+			endif
 <		This avoids adding the "_vv" mapping when there already is a
 		mapping for "_v" or for "_vvv".
 
-		Can also be used as a |method|: >
-			GetKey()->mapcheck('n')
-
-mapset({mode}, {abbr}, {dict})				*mapset()*
-		Restore a mapping from a dictionary returned by |maparg()|.
-		{mode} and {abbr} should be the same as for the call to
-		|maparg()|. *E460*
+maplist([{abbr}])                                                    *maplist()*
+		Returns a |List| of all mappings.  Each List item is a |Dict|,
+		the same as what is returned by |maparg()|, see
+		|mapping-dict|.  When {abbr} is there and it is |TRUE| use
+		abbreviations instead of mappings.
+
+		Example to show all mappings with "MultiMatch" in rhs: >vim
+			echo maplist()->filter({_, m ->
+				\ match(get(m, 'rhs', ''), 'MultiMatch') >= 0
+				\ })
+<		It can be tricky to find mappings for particular |:map-modes|.
+		|mapping-dict|'s "mode_bits" can simplify this. For example,
+		the mode_bits for Normal, Insert or Command-line modes are
+		0x19. To find all the mappings available in those modes you
+		can do: >vim
+			let saved_maps = []
+			for m in maplist()
+			    if and(m.mode_bits, 0x19) != 0
+				eval saved_maps->add(m)
+			    endif
+			endfor
+			echo saved_maps->mapnew({_, m -> m.lhs})
+<		The values of the mode_bits are defined in Nvim's
+		src/nvim/state_defs.h file and they can be discovered at
+		runtime using |:map-commands| and "maplist()". Example: >vim
+			omap xyzzy <Nop>
+			let op_bit = maplist()->filter(
+			    \ {_, m -> m.lhs == 'xyzzy'})[0].mode_bits
+			ounmap xyzzy
+			echo printf("Operator-pending mode bit: 0x%x", op_bit)
+
+mapnew({expr1}, {expr2})                                              *mapnew()*
+		Like |map()| but instead of replacing items in {expr1} a new
+		List or Dictionary is created and returned.  {expr1} remains
+		unchanged.  Items can still be changed by {expr2}, if you
+		don't want that use |deepcopy()| first.
+
+mapset({mode}, {abbr}, {dict})                                        *mapset()*
+		Restore a mapping from a dictionary, possibly returned by
+		|maparg()| or |maplist()|.  A buffer mapping, when dict.buffer
+		is true, is set on the current buffer; it is up to the caller
+		to ensure that the intended buffer is the current buffer. This
+		feature allows copying mappings from one buffer to another.
+		The dict.mode value may restore a single mapping that covers
+		more than one mode, like with mode values of '!', ' ', "nox",
+		or 'v'. *E1276*
+
+		In the first form, {mode} and {abbr} should be the same as
+		for the call to |maparg()|. *E460*
 		{mode} is used to define the mode in which the mapping is set,
 		not the "mode" entry in {dict}.
-		Example for saving and restoring a mapping: >
+		Example for saving and restoring a mapping: >vim
 			let save_map = maparg('K', 'n', 0, 1)
 			nnoremap K somethingelse
-			...
+			" ...
 			call mapset('n', 0, save_map)
 <		Note that if you are going to replace a map in several modes,
-		e.g. with `:map!`, you need to save the mapping for all of
-		them, since they can differ.
-
+		e.g. with `:map!`, you need to save/restore the mapping for
+		all of them, when they might differ.
+
+		In the second form, with {dict} as the only argument, mode
+		and abbr are taken from the dict.
+		Example: >vim
+			let save_maps = maplist()->filter(
+						\ {_, m -> m.lhs == 'K'})
+			nnoremap K somethingelse
+			cnoremap K somethingelse2
+			" ...
+			unmap K
+			for d in save_maps
+			    call mapset(d)
+			endfor
 
-match({expr}, {pat} [, {start} [, {count}]])			*match()*
+match({expr}, {pat} [, {start} [, {count}]])                           *match()*
 		When {expr} is a |List| then this returns the index of the
 		first item where {pat} matches.  Each item is used as a
 		String, |Lists| and |Dictionaries| are used as echoed.
@@ -4941,27 +4320,27 @@ match({expr}, {pat} [, {start} [, {count}]])			*match()*
 		If there is no match -1 is returned.
 
 		For getting submatches see |matchlist()|.
-		Example: >
-			:echo match("testing", "ing")	" results in 4
-			:echo match([1, 'x'], '\a')	" results in 1
+		Example: >vim
+			echo match("testing", "ing")	" results in 4
+			echo match([1, 'x'], '\a')	" results in 1
 <		See |string-match| for how {pat} is used.
 								*strpbrk()*
-		Vim doesn't have a strpbrk() function.  But you can do: >
-			:let sepidx = match(line, '[.,;: \t]')
+		Vim doesn't have a strpbrk() function.  But you can do: >vim
+			let sepidx = match(line, '[.,;: \t]')
 <								*strcasestr()*
 		Vim doesn't have a strcasestr() function.  But you can add
-		"\c" to the pattern to ignore case: >
-			:let idx = match(haystack, '\cneedle')
+		"\c" to the pattern to ignore case: >vim
+			let idx = match(haystack, '\cneedle')
 <
 		If {start} is given, the search starts from byte index
 		{start} in a String or item {start} in a |List|.
 		The result, however, is still the index counted from the
-		first character/item.  Example: >
-			:echo match("testing", "ing", 2)
-<		result is again "4". >
-			:echo match("testing", "ing", 4)
-<		result is again "4". >
-			:echo match("testing", "t", 2)
+		first character/item.  Example: >vim
+			echo match("testing", "ing", 2)
+<		result is again "4". >vim
+			echo match("testing", "ing", 4)
+<		result is again "4". >vim
+			echo match("testing", "t", 2)
 <		result is "3".
 		For a String, if {start} > 0 then it is like the string starts
 		{start} bytes later, thus "^" will match at {start}.  Except
@@ -4975,7 +4354,7 @@ match({expr}, {pat} [, {start} [, {count}]])			*match()*
 
 		When {count} is given use the {count}th match.  When a match
 		is found in a String the search for the next one starts one
-		character further.  Thus this example results in 1: >
+		character further.  Thus this example results in 1: >vim
 			echo match("testing", "..", 0, 2)
 <		In a |List| the search continues in the next item.
 		Note that when {count} is added the way {start} works changes,
@@ -4990,11 +4369,7 @@ match({expr}, {pat} [, {start} [, {count}]])			*match()*
 		zero matches at the start instead of a number of matches
 		further down in the text.
 
-		Can also be used as a |method|: >
-			GetText()->match('word')
-			GetList()->match('word')
-<
-			*matchadd()* *E798* *E799* *E801* *E957*
+                                                *matchadd()* *E798* *E799* *E801* *E957*
 matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 		Defines a pattern to be highlighted in the current window (a
 		"match").  It will be highlighted with {group}.  Returns an
@@ -5043,21 +4418,17 @@ matchadd({group}, {pattern} [, {priority} [, {id} [, {dict}]]])
 
 		Returns -1 on error.
 
-		Example: >
-			:highlight MyGroup ctermbg=green guibg=green
-			:let m = matchadd("MyGroup", "TODO")
-<		Deletion of the pattern: >
-			:call matchdelete(m)
+		Example: >vim
+			highlight MyGroup ctermbg=green guibg=green
+			let m = matchadd("MyGroup", "TODO")
+<		Deletion of the pattern: >vim
+			call matchdelete(m)
 
 <		A list of matches defined by |matchadd()| and |:match| are
 		available from |getmatches()|.  All matches can be deleted in
 		one operation by |clearmatches()|.
 
-		Can also be used as a |method|: >
-			GetGroup()->matchadd('TODO')
-<
-							*matchaddpos()*
-matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
+matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])   *matchaddpos()*
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
 		because it does not require to handle regular expressions and
@@ -5085,19 +4456,16 @@ matchaddpos({group}, {pos} [, {priority} [, {id} [, {dict}]]])
 
 		Returns -1 on error.
 
-		Example: >
-			:highlight MyGroup ctermbg=green guibg=green
-			:let m = matchaddpos("MyGroup", [[23, 24], 34])
-<		Deletion of the pattern: >
-			:call matchdelete(m)
+		Example: >vim
+			highlight MyGroup ctermbg=green guibg=green
+			let m = matchaddpos("MyGroup", [[23, 24], 34])
+<		Deletion of the pattern: >vim
+			call matchdelete(m)
 
 <		Matches added by |matchaddpos()| are returned by
 		|getmatches()|.
 
-		Can also be used as a |method|: >
-			GetGroup()->matchaddpos([23, 11])
-
-matcharg({nr})							*matcharg()*
+matcharg({nr})                                                      *matcharg()*
 		Selects the {nr} match item, as set with a |:match|,
 		|:2match| or |:3match| command.
 		Return a |List| with two elements:
@@ -5109,10 +4477,7 @@ matcharg({nr})							*matcharg()*
 		Highlighting matches using the |:match| commands are limited
 		to three matches. |matchadd()| does not have this limitation.
 
-		Can also be used as a |method|: >
-			GetMatch()->matcharg()
-
-matchdelete({id} [, {win}])		       *matchdelete()* *E802* *E803*
+matchdelete({id} [, {win}])                            *matchdelete()* *E802* *E803*
 		Deletes a match with ID {id} previously defined by |matchadd()|
 		or one of the |:match| commands.  Returns 0 if successful,
 		otherwise -1.  See example for |matchadd()|.  All matches can
@@ -5120,32 +4485,26 @@ matchdelete({id} [, {win}])		       *matchdelete()* *E802* *E803*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
-			GetMatch()->matchdelete()
-
-matchend({expr}, {pat} [, {start} [, {count}]])			*matchend()*
+matchend({expr}, {pat} [, {start} [, {count}]])                     *matchend()*
 		Same as |match()|, but return the index of first character
-		after the match.  Example: >
-			:echo matchend("testing", "ing")
+		after the match.  Example: >vim
+			echo matchend("testing", "ing")
 <		results in "7".
 							*strspn()* *strcspn()*
 		Vim doesn't have a strspn() or strcspn() function, but you can
-		do it with matchend(): >
-			:let span = matchend(line, '[a-zA-Z]')
-			:let span = matchend(line, '[^a-zA-Z]')
+		do it with matchend(): >vim
+			let span = matchend(line, '[a-zA-Z]')
+			let span = matchend(line, '[^a-zA-Z]')
 <		Except that -1 is returned when there are no matches.
 
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchend("testing", "ing", 2)
-<		results in "7". >
-			:echo matchend("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchend("testing", "ing", 2)
+<		results in "7". >vim
+			echo matchend("testing", "ing", 5)
 <		result is "-1".
 		When {expr} is a |List| the result is equal to |match()|.
 
-		Can also be used as a |method|: >
-			GetText()->matchend('word')
-
-matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
+matchfuzzy({list}, {str} [, {dict}])                              *matchfuzzy()*
 		If {list} is a list of strings, then returns a |List| with all
 		the strings in {list} that fuzzy match {str}. The strings in
 		the returned list are sorted based on the matching score.
@@ -5186,29 +4545,29 @@ matchfuzzy({list}, {str} [, {dict}])			*matchfuzzy()*
 		Refer to |fuzzy-matching| for more information about fuzzy
 		matching strings.
 
-		Example: >
-		   :echo matchfuzzy(["clay", "crow"], "cay")
-<		results in ["clay"]. >
-		   :echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
-<		results in a list of buffer names fuzzy matching "ndl". >
-		   :echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
+		Example: >vim
+		   echo matchfuzzy(["clay", "crow"], "cay")
+<		results in ["clay"]. >vim
+		   echo getbufinfo()->map({_, v -> v.name})->matchfuzzy("ndl")
+<		results in a list of buffer names fuzzy matching "ndl". >vim
+		   echo getbufinfo()->matchfuzzy("ndl", {'key' : 'name'})
 <		results in a list of buffer information dicts with buffer
-		names fuzzy matching "ndl". >
-		   :echo getbufinfo()->matchfuzzy("spl",
+		names fuzzy matching "ndl". >vim
+		   echo getbufinfo()->matchfuzzy("spl",
 						\ {'text_cb' : {v -> v.name}})
 <		results in a list of buffer information dicts with buffer
-		names fuzzy matching "spl". >
-		   :echo v:oldfiles->matchfuzzy("test")
-<		results in a list of file names fuzzy matching "test". >
-		   :let l = readfile("buffer.c")->matchfuzzy("str")
-<		results in a list of lines in "buffer.c" fuzzy matching "str". >
-		   :echo ['one two', 'two one']->matchfuzzy('two one')
-<		results in `['two one', 'one two']` . >
-		   :echo ['one two', 'two one']->matchfuzzy('two one',
+		names fuzzy matching "spl". >vim
+		   echo v:oldfiles->matchfuzzy("test")
+<		results in a list of file names fuzzy matching "test". >vim
+		   let l = readfile("buffer.c")->matchfuzzy("str")
+<		results in a list of lines in "buffer.c" fuzzy matching "str". >vim
+		   echo ['one two', 'two one']->matchfuzzy('two one')
+<		results in `['two one', 'one two']` . >vim
+		   echo ['one two', 'two one']->matchfuzzy('two one',
 						\ {'matchseq': 1})
-<		results in ['two one'].
+<		results in `['two one']`.
 
-matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
+matchfuzzypos({list}, {str} [, {dict}])                        *matchfuzzypos()*
 		Same as |matchfuzzy()|, but returns the list of matched
 		strings, the list of character positions where characters
 		in {str} matches and a list of matching scores.  You can
@@ -5221,95 +4580,81 @@ matchfuzzypos({list}, {str} [, {dict}])			*matchfuzzypos()*
 		If there are no matching strings or there is an error, then a
 		list with three empty list items is returned.
 
-		Example: >
-			:echo matchfuzzypos(['testing'], 'tsg')
-<		results in [["testing"], [[0, 2, 6]], [99]] >
-			:echo matchfuzzypos(['clay', 'lacy'], 'la')
-<		results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >
-			:echo [{'text': 'hello', 'id' : 10}]
+		Example: >vim
+			echo matchfuzzypos(['testing'], 'tsg')
+<		results in [["testing"], [[0, 2, 6]], [99]] >vim
+			echo matchfuzzypos(['clay', 'lacy'], 'la')
+<		results in [["lacy", "clay"], [[0, 1], [1, 2]], [153, 133]] >vim
+			echo [{'text': 'hello', 'id' : 10}]
 				\ ->matchfuzzypos('ll', {'key' : 'text'})
-<		results in [[{"id": 10, "text": "hello"}], [[2, 3]], [127]]
+<		results in `[[{"id": 10, "text": "hello"}], [[2, 3]], [127]]`
 
-matchlist({expr}, {pat} [, {start} [, {count}]])		*matchlist()*
+matchlist({expr}, {pat} [, {start} [, {count}]])                   *matchlist()*
 		Same as |match()|, but return a |List|.  The first item in the
 		list is the matched string, same as what matchstr() would
 		return.  Following items are submatches, like "\1", "\2", etc.
 		in |:substitute|.  When an optional submatch didn't match an
-		empty string is used.  Example: >
+		empty string is used.  Example: >vim
 			echo matchlist('acd', '\(a\)\?\(b\)\?\(c\)\?\(.*\)')
 <		Results in: ['acd', 'a', '', 'c', 'd', '', '', '', '', '']
 		When there is no match an empty list is returned.
 
 		You can pass in a List, but that is not very useful.
 
-		Can also be used as a |method|: >
-			GetText()->matchlist('word')
-
-matchstr({expr}, {pat} [, {start} [, {count}]])			*matchstr()*
-		Same as |match()|, but return the matched string.  Example: >
-			:echo matchstr("testing", "ing")
+matchstr({expr}, {pat} [, {start} [, {count}]])                     *matchstr()*
+		Same as |match()|, but return the matched string.  Example: >vim
+			echo matchstr("testing", "ing")
 <		results in "ing".
 		When there is no match "" is returned.
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchstr("testing", "ing", 2)
-<		results in "ing". >
-			:echo matchstr("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchstr("testing", "ing", 2)
+<		results in "ing". >vim
+			echo matchstr("testing", "ing", 5)
 <		result is "".
 		When {expr} is a |List| then the matching item is returned.
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >
-			GetText()->matchstr('word')
-
-matchstrpos({expr}, {pat} [, {start} [, {count}]])		*matchstrpos()*
+matchstrpos({expr}, {pat} [, {start} [, {count}]])               *matchstrpos()*
 		Same as |matchstr()|, but return the matched string, the start
-		position and the end position of the match.  Example: >
-			:echo matchstrpos("testing", "ing")
+		position and the end position of the match.  Example: >vim
+			echo matchstrpos("testing", "ing")
 <		results in ["ing", 4, 7].
 		When there is no match ["", -1, -1] is returned.
-		The {start}, if given, has the same meaning as for |match()|. >
-			:echo matchstrpos("testing", "ing", 2)
-<		results in ["ing", 4, 7]. >
-			:echo matchstrpos("testing", "ing", 5)
+		The {start}, if given, has the same meaning as for |match()|. >vim
+			echo matchstrpos("testing", "ing", 2)
+<		results in ["ing", 4, 7]. >vim
+			echo matchstrpos("testing", "ing", 5)
 <		result is ["", -1, -1].
 		When {expr} is a |List| then the matching item, the index
 		of first item where {pat} matches, the start position and the
-		end position of the match are returned. >
-			:echo matchstrpos([1, '__x'], '\a')
+		end position of the match are returned. >vim
+			echo matchstrpos([1, '__x'], '\a')
 <		result is ["x", 1, 2, 3].
 		The type isn't changed, it's not necessarily a String.
 
-		Can also be used as a |method|: >
-			GetText()->matchstrpos('word')
-<
-
-							*max()*
-max({expr})	Return the maximum value of all items in {expr}. Example: >
+max({expr})                                                              *max()*
+		Return the maximum value of all items in {expr}. Example: >vim
 			echo max([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
 		it returns the maximum of all values in the Dictionary.
 		If {expr} is neither a List nor a Dictionary, or one of the
 		items in {expr} cannot be used as a Number this results in
-                an error.  An empty |List| or |Dictionary| results in zero.
-
-		Can also be used as a |method|: >
-			mylist->max()
+		                an error.  An empty |List| or |Dictionary| results in zero.
 
-
-menu_get({path} [, {modes}])				*menu_get()*
+menu_get({path} [, {modes}])                                        *menu_get()*
 		Returns a |List| of |Dictionaries| describing |menus| (defined
 		by |:menu|, |:amenu|, …), including |hidden-menus|.
 
 		{path} matches a menu by name, or all menus if {path} is an
-		empty string.  Example: >
-			:echo menu_get('File','')
-			:echo menu_get('')
+		empty string.  Example: >vim
+			echo menu_get('File','')
+			echo menu_get('')
 <
 		{modes} is a string of zero or more modes (see |maparg()| or
 		|creating-menus| for the list of modes). "a" means "all".
 
-		Example: >
+		Example: >vim
 			nnoremenu &Test.Test inormal
 			inoremenu Test.Test insert
 			vnoremenu Test.Test x
@@ -5343,7 +4688,7 @@ menu_get({path} [, {modes}])				*menu_get()*
 			} ]
 <
 
-menu_info({name} [, {mode}])				*menu_info()*
+menu_info({name} [, {mode}])                                       *menu_info()*
 		Return information about the specified menu {name} in
 		mode {mode}. The menu name should be specified without the
 		shortcut character ('&'). If {name} is "", then the top-level
@@ -5395,9 +4740,9 @@ menu_info({name} [, {mode}])				*menu_info()*
 
 		Returns an empty dictionary if the menu item is not found.
 
-		Examples: >
-			:echo menu_info('Edit.Cut')
-			:echo menu_info('File.Save', 'n')
+		Examples: >vim
+			echo menu_info('Edit.Cut')
+			echo menu_info('File.Save', 'n')
 
 			" Display the entire menu hierarchy in a buffer
 			func ShowMenu(name, pfx)
@@ -5413,12 +4758,9 @@ menu_info({name} [, {mode}])				*menu_info()*
 			  call ShowMenu(topmenu, '')
 			endfor
 <
-		Can also be used as a |method|: >
-			GetMenuName()->menu_info('v')
-
 
-<							*min()*
-min({expr})	Return the minimum value of all items in {expr}. Example:  >
+min({expr})                                                              *min()*
+		Return the minimum value of all items in {expr}. Example: >vim
 			echo min([apples, pears, oranges])
 
 <		{expr} can be a |List| or a |Dictionary|.  For a Dictionary,
@@ -5427,42 +4769,55 @@ min({expr})	Return the minimum value of all items in {expr}. Example:  >
 		items in {expr} cannot be used as a Number this results in
 		an error.  An empty |List| or |Dictionary| results in zero.
 
-		Can also be used as a |method|: >
-			mylist->min()
-
-<							*mkdir()* *E739*
-mkdir({name} [, {path} [, {prot}]])
+mkdir({name} [, {flags} [, {prot}]])                              *mkdir()* *E739*
 		Create directory {name}.
 
-		If {path} is "p" then intermediate directories are created as
-		necessary.  Otherwise it must be "".
+		When {flags} is present it must be a string.  An empty string
+		has no effect.
+
+		If {flags} contains "p" then intermediate directories are
+		created as necessary.
 
+		If {flags} contains "D" then {name} is deleted at the end of
+		the current function, as with: >vim
+			defer delete({name}, 'd')
+<
+		If {flags} contains "R" then {name} is deleted recursively at
+		the end of the current function, as with: >vim
+			defer delete({name}, 'rf')
+<		Note that when {name} has more than one part and "p" is used
+		some directories may already exist.  Only the first one that
+		is created and what it contains is scheduled to be deleted.
+		E.g. when using: >vim
+			call mkdir('subdir/tmp/autoload', 'pR')
+<		and "subdir" already exists then "subdir/tmp" will be
+		scheduled for deletion, like with: >vim
+			defer delete('subdir/tmp', 'rf')
+<
 		If {prot} is given it is used to set the protection bits of
 		the new directory.  The default is 0o755 (rwxr-xr-x: r/w for
 		the user, readable for others).  Use 0o700 to make it
 		unreadable for others.
 
 		{prot} is applied for all parts of {name}.  Thus if you create
-		/tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >
-			:call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
+		/tmp/foo/bar then /tmp/foo will be created with 0o700. Example: >vim
+			call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
 
 <		This function is not available in the |sandbox|.
 
-		If you try to create an existing directory with {path} set to
+		If you try to create an existing directory with {flags} set to
 		"p" mkdir() will silently exit.
 
 		The function result is a Number, which is TRUE if the call was
 		successful or FALSE if the directory creation failed or partly
 		failed.
 
-		Can also be used as a |method|: >
-			GetName()->mkdir()
-<
-							*mode()*
-mode([expr])	Return a string that indicates the current mode.
+mode([expr])                                                            *mode()*
+		Return a string that indicates the current mode.
 		If [expr] is supplied and it evaluates to a non-zero Number or
 		a non-empty String (|non-zero-arg|), then the full mode is
 		returned, otherwise only the first letter is returned.
+		Also see |state()|.
 
 		   n	    Normal
 		   no	    Operator-pending
@@ -5495,7 +4850,9 @@ mode([expr])	Return a string that indicates the current mode.
 		   Rvc	    Virtual Replace mode completion |compl-generic|
 		   Rvx	    Virtual Replace mode |i_CTRL-X| completion
 		   c	    Command-line editing
+		   cr	    Command-line editing overstrike mode |c_<Insert>|
 		   cv	    Vim Ex mode |gQ|
+		   cvr	    Vim Ex mode while in overstrike mode |c_<Insert>|
 		   r	    Hit-enter prompt
 		   rm	    The -- more -- prompt
 		   r?	    A |:confirm| query of some sort
@@ -5509,15 +4866,12 @@ mode([expr])	Return a string that indicates the current mode.
 		the leading character(s).
 		Also see |visualmode()|.
 
-		Can also be used as a |method|: >
-			DoFull()->mode()
-
-msgpackdump({list} [, {type}])				*msgpackdump()*
-		Convert a list of VimL objects to msgpack. Returned value is a
+msgpackdump({list} [, {type}])                                   *msgpackdump()*
+		Convert a list of Vimscript objects to msgpack. Returned value is a
 		|readfile()|-style list. When {type} contains "B", a |Blob| is
-		returned instead. Example: >
+		returned instead. Example: >vim
 			call writefile(msgpackdump([{}]), 'fname.mpack', 'b')
-<		or, using a |Blob|: >
+<		or, using a |Blob|: >vim
 			call writefile(msgpackdump([{}], 'B'), 'fname.mpack')
 <
 		This will write the single 0x80 byte to a `fname.mpack` file
@@ -5531,10 +4885,10 @@ msgpackdump({list} [, {type}])				*msgpackdump()*
 		4. Other strings and |Blob|s are always dumped as BIN strings.
 		5. Points 3. and 4. do not apply to |msgpack-special-dict|s.
 
-msgpackparse({data})					*msgpackparse()*
+msgpackparse({data})                                            *msgpackparse()*
 		Convert a |readfile()|-style list or a |Blob| to a list of
-		VimL objects.
-		Example: >
+		Vimscript objects.
+		Example: >vim
 			let fname = expand('~/.config/nvim/shada/main.shada')
 			let mpack = readfile(fname, 'b')
 			let shada_objects = msgpackparse(mpack)
@@ -5605,36 +4959,31 @@ msgpackparse({data})					*msgpackparse()*
 			representing extension type. Second is
 			|readfile()|-style list of strings.
 
-nextnonblank({lnum})					*nextnonblank()*
+nextnonblank({lnum})                                            *nextnonblank()*
 		Return the line number of the first line at or below {lnum}
-		that is not blank.  Example: >
-			if getline(nextnonblank(1)) =~ "Java"
+		that is not blank.  Example: >vim
+			if getline(nextnonblank(1)) =~ "Java" | endif
 <		When {lnum} is invalid or there is no non-blank line at or
 		below it, zero is returned.
 		{lnum} is used like with |getline()|.
 		See also |prevnonblank()|.
 
-		Can also be used as a |method|: >
-			GetLnum()->nextnonblank()
-
-nr2char({expr} [, {utf8}])				*nr2char()*
+nr2char({expr} [, {utf8}])                                           *nr2char()*
 		Return a string with a single character, which has the number
-		value {expr}.  Examples: >
-			nr2char(64)		returns "@"
-			nr2char(32)		returns " "
-<		Example for "utf-8": >
-			nr2char(300)		returns I with bow character
-<		UTF-8 encoding is always used, {utf8} option has no effect,
+		value {expr}.  Examples: >vim
+			echo nr2char(64)		" returns '@'
+			echo nr2char(32)		" returns ' '
+<		Example for "utf-8": >vim
+			echo nr2char(300)		" returns I with bow character
+<
+		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
 		Note that a NUL character in the file is specified with
 		nr2char(10), because NULs are represented with newline
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
 
-		Can also be used as a |method|: >
-			GetNumber()->nr2char()
-
-nvim_...({...})					*E5555* *nvim_...()* *eval-api*
+nvim_...({...})                                      *nvim_...()* *E5555* *eval-api*
 		Call nvim |api| functions. The type checking of arguments will
 		be stricter than for most other builtins. For instance,
 		if Integer is expected, a |Number| must be passed in, a
@@ -5645,39 +4994,33 @@ nvim_...({...})					*E5555* *nvim_...()* *eval-api*
 		also take the numerical value 0 to indicate the current
 		(focused) object.
 
-or({expr}, {expr})					*or()*
+or({expr}, {expr})                                                        *or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `xor()`.
-		Example: >
-			:let bits = or(bits, 0x80)
-<		Can also be used as a |method|: >
-			:let bits = bits->or(0x80)
+		Example: >vim
+			let bits = or(bits, 0x80)
 
 <		Rationale: The reason this is a function and not using the "|"
 		character like many languages, is that Vi has always used "|"
 		to separate commands.  In many places it would not be clear if
 		"|" is an operator or a command separator.
 
-
-pathshorten({path} [, {len}])				*pathshorten()*
+pathshorten({path} [, {len}])                                    *pathshorten()*
 		Shorten directory names in the path {path} and return the
 		result.  The tail, the file name, is kept as-is.  The other
 		components in the path are reduced to {len} letters in length.
 		If {len} is omitted or smaller than 1 then 1 is used (single
-		letters).  Leading '~' and '.' characters are kept.  Examples: >
-			:echo pathshorten('~/.config/nvim/autoload/file1.vim')
+		letters).  Leading '~' and '.' characters are kept.  Examples: >vim
+			echo pathshorten('~/.config/nvim/autoload/file1.vim')
 <			~/.c/n/a/file1.vim ~
->
-			:echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
+>vim
+			echo pathshorten('~/.config/nvim/autoload/file2.vim', 2)
 <			~/.co/nv/au/file2.vim ~
 		It doesn't matter if the path exists or not.
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetDirectories()->pathshorten()
-
-perleval({expr})					*perleval()*
+perleval({expr})                                                    *perleval()*
 		Evaluate |perl| expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -5688,49 +5031,40 @@ perleval({expr})					*perleval()*
 
 		Note: If you want an array or hash, {expr} must return a
 		reference to it.
-		Example: >
-			:echo perleval('[1 .. 4]')
+		Example: >vim
+			echo perleval('[1 .. 4]')
 <			[1, 2, 3, 4]
 
-		Can also be used as a |method|: >
-			GetExpr()->perleval()
-
-pow({x}, {y})						*pow()*
+pow({x}, {y})                                                            *pow()*
 		Return the power of {x} to the exponent {y} as a |Float|.
 		{x} and {y} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {x} or {y} is not a |Float| or a |Number|.
-		Examples: >
-			:echo pow(3, 3)
-<			27.0 >
-			:echo pow(2, 16)
-<			65536.0 >
-			:echo pow(32, 0.20)
+		Examples: >vim
+			echo pow(3, 3)
+<			27.0 >vim
+			echo pow(2, 16)
+<			65536.0 >vim
+			echo pow(32, 0.20)
 <			2.0
 
-		Can also be used as a |method|: >
-			Compute()->pow(3)
-
-prevnonblank({lnum})					*prevnonblank()*
+prevnonblank({lnum})                                            *prevnonblank()*
 		Return the line number of the first line at or above {lnum}
-		that is not blank.  Example: >
+		that is not blank.  Example: >vim
 			let ind = indent(prevnonblank(v:lnum - 1))
 <		When {lnum} is invalid or there is no non-blank line at or
 		above it, zero is returned.
 		{lnum} is used like with |getline()|.
 		Also see |nextnonblank()|.
 
-		Can also be used as a |method|: >
-			GetLnum()->prevnonblank()
-
-printf({fmt}, {expr1} ...)				*printf()*
+printf({fmt}, {expr1} ...)                                            *printf()*
 		Return a String with {fmt}, where "%" items are replaced by
-		the formatted form of their respective arguments.  Example: >
-			printf("%4d: E%d %.30s", lnum, errno, msg)
+		the formatted form of their respective arguments.  Example: >vim
+			echo printf("%4d: E%d %.30s", lnum, errno, msg)
 <		May result in:
 			"  99: E42 asdfasdfasdfasdfasdfasdfasdfas" ~
 
 		When used as a |method| the base is passed as the second
-		argument: >
+		argument: >vim
 			Compute()->printf("result: %d")
 <
 		You can use `call()` to pass the items as a list.
@@ -5766,7 +5100,11 @@ printf({fmt}, {expr1} ...)				*printf()*
 		The "%" starts a conversion specification.  The following
 		arguments appear in sequence:
 
-			%  [flags]  [field-width]  [.precision]  type
+			% [pos-argument] [flags] [field-width] [.precision] type
+
+		pos-argument
+			At most one positional argument specifier. These
+			take the form {n$}, where n is >= 1.
 
 		flags
 			Zero or more of the following flags:
@@ -5826,15 +5164,21 @@ printf({fmt}, {expr1} ...)				*printf()*
 			be applied, see below.
 
 		A field width or precision, or both, may be indicated by an
-		asterisk '*' instead of a digit string.  In this case, a
+		asterisk "*" instead of a digit string.  In this case, a
 		Number argument supplies the field width or precision.  A
 		negative field width is treated as a left adjustment flag
 		followed by a positive field width; a negative precision is
-		treated as though it were missing.  Example: >
-			:echo printf("%d: %.*s", nr, width, line)
+		treated as though it were missing.  Example: >vim
+			echo printf("%d: %.*s", nr, width, line)
 <		This limits the length of the text used from "line" to
 		"width" bytes.
 
+		If the argument to be formatted is specified using a posional
+		argument specifier, and a '*' is used to indicate that a
+		number argument is to be used to specify the width or
+		precision, the argument(s) to be used must also be specified
+		using a {n$} positional argument specifier. See |printf-$|.
+
 		The conversion specifiers and their meanings are:
 
 				*printf-d* *printf-b* *printf-B* *printf-o* *printf-x* *printf-X*
@@ -5851,8 +5195,13 @@ printf({fmt}, {expr1} ...)				*printf()*
 			than the field width, the field is expanded to contain
 			the conversion result.
 			The 'h' modifier indicates the argument is 16 bits.
-			The 'l' modifier indicates the argument is 32 bits.
-			The 'L' modifier indicates the argument is 64 bits.
+			The 'l' modifier indicates the argument is a long
+			integer.  The size will be 32 bits or 64 bits
+			depending on your platform.
+			The "ll" modifier indicates the argument is 64 bits.
+			The b and B conversion specifiers never take a width
+			modifier and always assume their argument is a 64 bit
+			integer.
 			Generally, these modifiers are not useful. They are
 			ignored when type is known from the argument.
 
@@ -5886,7 +5235,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 			(out of range or dividing by zero) results in "inf"
 			 or "-inf" with %f (INF or -INF with %F).
 			 "0.0 / 0.0" results in "nan" with %f (NAN with %F).
-			Example: >
+			Example: >vim
 				echo printf("%.2f", 12.115)
 <				12.12
 			Note that roundoff depends on the system libraries.
@@ -5922,17 +5271,119 @@ printf({fmt}, {expr1} ...)				*printf()*
 		of "%" items.  If there are not sufficient or too many
 		arguments an error is given.  Up to 18 arguments can be used.
 
-prompt_getprompt({buf})					*prompt_getprompt()*
+							*printf-$*
+		In certain languages, error and informative messages are
+		more readable when the order of words is different from the
+		corresponding message in English. To accommodate translations
+		having a different word order, positional arguments may be
+		used to indicate this. For instance: >vim
+
+		    #, c-format
+		    msgid "%s returning %s"
+		    msgstr "waarde %2$s komt terug van %1$s"
+<
+		In this example, the sentence has its 2 string arguments
+		reversed in the output. >vim
+
+		    echo printf(
+			"In The Netherlands, vim's creator's name is: %1$s %2$s",
+			"Bram", "Moolenaar")
+<		    In The Netherlands, vim's creator's name is: Bram Moolenaar >vim
+
+		    echo printf(
+			"In Belgium, vim's creator's name is: %2$s %1$s",
+			"Bram", "Moolenaar")
+<		    In Belgium, vim's creator's name is: Moolenaar Bram
+
+		Width (and precision) can be specified using the '*' specifier.
+		In this case, you must specify the field width position in the
+		argument list. >vim
+
+		    echo printf("%1$*2$.*3$d", 1, 2, 3)
+<		    001 >vim
+		    echo printf("%2$*3$.*1$d", 1, 2, 3)
+<		      2 >vim
+		    echo printf("%3$*1$.*2$d", 1, 2, 3)
+<		    03 >vim
+		    echo printf("%1$*2$.*3$g", 1.4142, 2, 3)
+<		    1.414
+
+		You can mix specifying the width and/or precision directly
+		and via positional arguments: >vim
+
+		    echo printf("%1$4.*2$f", 1.4142135, 6)
+<		    1.414214 >vim
+		    echo printf("%1$*2$.4f", 1.4142135, 6)
+<		    1.4142 >vim
+		    echo printf("%1$*2$.*3$f", 1.4142135, 6, 2)
+<		      1.41
+
+							*E1500*
+		You cannot mix positional and non-positional arguments: >vim
+		    echo printf("%s%1$s", "One", "Two")
+<		    E1500: Cannot mix positional and non-positional arguments:
+		    %s%1$s
+
+							*E1501*
+		You cannot skip a positional argument in a format string: >vim
+		    echo printf("%3$s%1$s", "One", "Two", "Three")
+<		    E1501: format argument 2 unused in $-style format:
+		    %3$s%1$s
+
+							*E1502*
+		You can re-use a [field-width] (or [precision]) argument: >vim
+		    echo printf("%1$d at width %2$d is: %01$*2$d", 1, 2)
+<		    1 at width 2 is: 01
+
+		However, you can't use it as a different type: >vim
+		    echo printf("%1$d at width %2$ld is: %01$*2$d", 1, 2)
+<		    E1502: Positional argument 2 used as field width reused as
+		    different type: long int/int
+
+							*E1503*
+		When a positional argument is used, but not the correct number
+		or arguments is given, an error is raised: >vim
+		    echo printf("%1$d at width %2$d is: %01$*2$.*3$d", 1, 2)
+<		    E1503: Positional argument 3 out of bounds: %1$d at width
+		    %2$d is: %01$*2$.*3$d
+
+		Only the first error is reported: >vim
+		    echo printf("%01$*2$.*3$d %4$d", 1, 2)
+<		    E1503: Positional argument 3 out of bounds: %01$*2$.*3$d
+		    %4$d
+
+							*E1504*
+		A positional argument can be used more than once: >vim
+		    echo printf("%1$s %2$s %1$s", "One", "Two")
+<		    One Two One
+
+		However, you can't use a different type the second time: >vim
+		    echo printf("%1$s %2$s %1$d", "One", "Two")
+<		    E1504: Positional argument 1 type used inconsistently:
+		    int/string
+
+							*E1505*
+		Various other errors that lead to a format string being
+		wrongly formatted lead to: >vim
+		    echo printf("%1$d at width %2$d is: %01$*2$.3$d", 1, 2)
+<		    E1505: Invalid format specifier: %1$d at width %2$d is:
+		    %01$*2$.3$d
+
+							*E1507*
+		This internal error indicates that the logic to parse a
+		positional format argument ran into a problem that couldn't be
+		otherwise reported.  Please file a bug against Vim if you run
+		into this, copying the exact format string and parameters that
+		were used.
+
+prompt_getprompt({buf})                                     *prompt_getprompt()*
 		Returns the effective prompt text for buffer {buf}.  {buf} can
 		be a buffer name or number.  See |prompt-buffer|.
 
 		If the buffer doesn't exist or isn't a prompt buffer, an empty
 		string is returned.
 
-		Can also be used as a |method|: >
-			GetBuffer()->prompt_getprompt()
-
-prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
+prompt_setcallback({buf}, {expr})                         *prompt_setcallback()*
 		Set prompt callback for buffer {buf} to {expr}.  When {expr}
 		is an empty string the callback is removed.  This has only
 		effect if {buf} has 'buftype' set to "prompt".
@@ -5948,23 +5399,23 @@ prompt_setcallback({buf}, {expr})			*prompt_setcallback()*
 		The callback is invoked with one argument, which is the text
 		that was entered at the prompt.  This can be an empty string
 		if the user only typed Enter.
-		Example: >
-		   call prompt_setcallback(bufnr(''), function('s:TextEntered'))
+		Example: >vim
 		   func s:TextEntered(text)
 		     if a:text == 'exit' || a:text == 'quit'
 		       stopinsert
+		       " Reset 'modified' to allow the buffer to be closed.
+		       " We assume there is nothing useful to be saved.
+		       set nomodified
 		       close
 		     else
+		       " Do something useful with "a:text".  In this example
+		       " we just repeat it.
 		       call append(line('$') - 1, 'Entered: "' .. a:text .. '"')
-		       " Reset 'modified' to allow the buffer to be closed.
-		       set nomodified
 		     endif
 		   endfunc
+		   call prompt_setcallback(bufnr(), function('s:TextEntered'))
 
-<		Can also be used as a |method|: >
-			GetBuffer()->prompt_setcallback(callback)
-
-prompt_setinterrupt({buf}, {expr})			*prompt_setinterrupt()*
+prompt_setinterrupt({buf}, {expr})                       *prompt_setinterrupt()*
 		Set a callback for buffer {buf} to {expr}.  When {expr} is an
 		empty string the callback is removed.  This has only effect if
 		{buf} has 'buftype' set to "prompt".
@@ -5973,20 +5424,15 @@ prompt_setinterrupt({buf}, {expr})			*prompt_setinterrupt()*
 		mode.  Without setting a callback Vim will exit Insert mode,
 		as in any buffer.
 
-		Can also be used as a |method|: >
-			GetBuffer()->prompt_setinterrupt(callback)
-
-prompt_setprompt({buf}, {text})				*prompt_setprompt()*
+prompt_setprompt({buf}, {text})                             *prompt_setprompt()*
 		Set prompt for buffer {buf} to {text}.  You most likely want
 		{text} to end in a space.
 		The result is only visible if {buf} has 'buftype' set to
-		"prompt".  Example: >
+		"prompt".  Example: >vim
 			call prompt_setprompt(bufnr(''), 'command: ')
 <
-		Can also be used as a |method|: >
-			GetBuffer()->prompt_setprompt('command: ')
 
-pum_getpos()						*pum_getpos()*
+pum_getpos()                                                      *pum_getpos()*
 		If the popup menu (see |ins-completion-menu|) is not visible,
 		returns an empty |Dictionary|, otherwise, returns a
 		|Dictionary| with the following keys:
@@ -5999,13 +5445,13 @@ pum_getpos()						*pum_getpos()*
 
 		The values are the same as in |v:event| during |CompleteChanged|.
 
-pumvisible()						*pumvisible()*
+pumvisible()                                                      *pumvisible()*
 		Returns non-zero when the popup menu is visible, zero
 		otherwise.  See |ins-completion-menu|.
 		This can be used to avoid some things that would remove the
 		popup menu.
 
-py3eval({expr})						*py3eval()*
+py3eval({expr})                                                      *py3eval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -6015,11 +5461,7 @@ py3eval({expr})						*py3eval()*
 		Dictionaries are represented as Vim |Dictionary| type with
 		keys converted to strings.
 
-		Can also be used as a |method|: >
-			GetExpr()->py3eval()
-<
-							*E858* *E859*
-pyeval({expr})						*pyeval()*
+pyeval({expr})                                              *pyeval()* *E858* *E859*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are
@@ -6028,20 +5470,29 @@ pyeval({expr})						*pyeval()*
 		Dictionaries are represented as Vim |Dictionary| type,
 		non-string keys result in error.
 
-		Can also be used as a |method|: >
-			GetExpr()->pyeval()
-
-pyxeval({expr})						*pyxeval()*
+pyxeval({expr})                                                      *pyxeval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Uses Python 2 or 3, see |python_x| and 'pyxversion'.
 		See also: |pyeval()|, |py3eval()|
 
-		Can also be used as a |method|: >
-			GetExpr()->pyxeval()
+rand([{expr}])                                                          *rand()*
+		Return a pseudo-random Number generated with an xoshiro128**
+		algorithm using seed {expr}.  The returned number is 32 bits,
+		also on 64 bits systems, for consistency.
+		{expr} can be initialized by |srand()| and will be updated by
+		rand().  If {expr} is omitted, an internal seed value is used
+		and updated.
+		Returns -1 if {expr} is invalid.
+
+		Examples: >vim
+			echo rand()
+			let seed = srand()
+			echo rand(seed)
+			echo rand(seed) % 16  " random number 0 - 15
 <
-							*E726* *E727*
-range({expr} [, {max} [, {stride}]])				*range()*
+
+range({expr} [, {max} [, {stride}]])                         *range()* *E726* *E727*
 		Returns a |List| with Numbers:
 		- If only {expr} is specified: [0, 1, ..., {expr} - 1]
 		- If {max} is specified: [{expr}, {expr} + 1, ..., {max}]
@@ -6051,45 +5502,40 @@ range({expr} [, {max} [, {stride}]])				*range()*
 		When the maximum is one before the start the result is an
 		empty list.  When the maximum is more than one before the
 		start this is an error.
-		Examples: >
-			range(4)		" [0, 1, 2, 3]
-			range(2, 4)		" [2, 3, 4]
-			range(2, 9, 3)		" [2, 5, 8]
-			range(2, -2, -1)	" [2, 1, 0, -1, -2]
-			range(0)		" []
-			range(2, 0)		" error!
-<
-		Can also be used as a |method|: >
-			GetExpr()->range()
-<
-rand([{expr}])						*rand()*
-		Return a pseudo-random Number generated with an xoshiro128**
-		algorithm using seed {expr}.  The returned number is 32 bits,
-		also on 64 bits systems, for consistency.
-		{expr} can be initialized by |srand()| and will be updated by
-		rand().  If {expr} is omitted, an internal seed value is used
-		and updated.
-		Returns -1 if {expr} is invalid.
-
-		Examples: >
-			:echo rand()
-			:let seed = srand()
-			:echo rand(seed)
-			:echo rand(seed) % 16  " random number 0 - 15
-<
-		Can also be used as a |method|: >
-			seed->rand()
+		Examples: >vim
+			echo range(4)		" [0, 1, 2, 3]
+			echo range(2, 4)	" [2, 3, 4]
+			echo range(2, 9, 3)	" [2, 5, 8]
+			echo range(2, -2, -1)	" [2, 1, 0, -1, -2]
+			echo range(0)		" []
+			echo range(2, 0)	" error!
 <
 
-readblob({fname})					*readblob()*
+readblob({fname} [, {offset} [, {size}]])                           *readblob()*
 		Read file {fname} in binary mode and return a |Blob|.
-		When the file can't be opened an error message is given and
+		If {offset} is specified, read the file from the specified
+		offset.  If it is a negative value, it is used as an offset
+		from the end of the file.  E.g., to read the last 12 bytes: >vim
+			echo readblob('file.bin', -12)
+<		If {size} is specified, only the specified size will be read.
+		E.g. to read the first 100 bytes of a file: >vim
+			echo readblob('file.bin', 0, 100)
+<		If {size} is -1 or omitted, the whole data starting from
+		{offset} will be read.
+		This can be also used to read the data from a character device
+		on Unix when {size} is explicitly set.  Only if the device
+		supports seeking {offset} can be used.  Otherwise it should be
+		zero.  E.g. to read 10 bytes from a serial console: >vim
+			echo readblob('/dev/ttyS0', 0, 10)
+<		When the file can't be opened an error message is given and
 		the result is an empty |Blob|.
+		When the offset is beyond the end of the file the result is an
+		empty blob.
+		When trying to read more bytes than are available the result
+		is truncated.
 		Also see |readfile()| and |writefile()|.
 
-
-							*readdir()*
-readdir({directory} [, {expr}])
+readdir({directory} [, {expr}])                                      *readdir()*
 		Return a list with file and directory names in {directory}.
 		You can also use |glob()| if you don't need to do complicated
 		things, such as limiting the number of matches.
@@ -6104,27 +5550,22 @@ readdir({directory} [, {expr}])
 			to the list.
 		Each time {expr} is evaluated |v:val| is set to the entry name.
 		When {expr} is a function the name is passed as the argument.
-		For example, to get a list of files ending in ".txt": >
-		  readdir(dirname, {n -> n =~ '.txt$'})
-<		To skip hidden and backup files: >
-		  readdir(dirname, {n -> n !~ '^\.\|\~$'})
-
-<		If you want to get a directory tree: >
-                  function! s:tree(dir)
-                      return {a:dir : map(readdir(a:dir),
+		For example, to get a list of files ending in ".txt": >vim
+		  echo readdir(dirname, {n -> n =~ '.txt$'})
+<		To skip hidden and backup files: >vim
+		  echo readdir(dirname, {n -> n !~ '^\.\|\~$'})
+
+<		If you want to get a directory tree: >vim
+		  function! s:tree(dir)
+		      return {a:dir : map(readdir(a:dir),
 		      \ {_, x -> isdirectory(x) ?
 		      \          {x : s:tree(a:dir .. '/' .. x)} : x})}
-                  endfunction
-                  echo s:tree(".")
+		  endfunction
+		  echo s:tree(".")
 <
 		Returns an empty List on error.
 
-		Can also be used as a |method|: >
-			GetDirName()->readdir()
-<
-
-							*readfile()*
-readfile({fname} [, {type} [, {max}]])
+readfile({fname} [, {type} [, {max}]])                              *readfile()*
 		Read file {fname} and return a |List|, each line of the file
 		as an item.  Lines are broken at NL characters.  Macintosh
 		files separated with CR will result in a single long line
@@ -6140,10 +5581,10 @@ readfile({fname} [, {type} [, {max}]])
 		- Any UTF-8 byte order mark is removed from the text.
 		When {max} is given this specifies the maximum number of lines
 		to be read.  Useful if you only want to check the first ten
-		lines of a file: >
-			:for line in readfile(fname, '', 10)
-			:  if line =~ 'Date' | echo line | endif
-			:endfor
+		lines of a file: >vim
+			for line in readfile(fname, '', 10)
+			  if line =~ 'Date' | echo line | endif
+			endfor
 <		When {max} is negative -{max} lines from the end of the file
 		are returned, or as many as there are.
 		When {max} is zero the result is an empty list.
@@ -6157,45 +5598,41 @@ readfile({fname} [, {type} [, {max}]])
 		the result is an empty list.
 		Also see |writefile()|.
 
-		Can also be used as a |method|: >
-			GetFileName()->readfile()
-
-reduce({object}, {func} [, {initial}])			*reduce()* *E998*
+reduce({object}, {func} [, {initial}])                           *reduce()* *E998*
 		{func} is called for every item in {object}, which can be a
-		|List| or a |Blob|.  {func} is called with two arguments: the
-		result so far and current item.  After processing all items
-		the result is returned.
+		|String|, |List| or a |Blob|.  {func} is called with two
+		arguments: the result so far and current item.  After
+		processing all items the result is returned.
 
 		{initial} is the initial result.  When omitted, the first item
 		in {object} is used and {func} is first called for the second
 		item.  If {initial} is not given and {object} is empty no
 		result can be computed, an E998 error is given.
 
-		Examples: >
+		Examples: >vim
 			echo reduce([1, 3, 5], { acc, val -> acc + val })
 			echo reduce(['x', 'y'], { acc, val -> acc .. val }, 'a')
 			echo reduce(0z1122, { acc, val -> 2 * acc + val })
+			echo reduce('xyz', { acc, val -> acc .. ',' .. val })
 <
-		Can also be used as a |method|: >
-			echo mylist->reduce({ acc, val -> acc + val }, 0)
 
-reg_executing()						*reg_executing()*
+reg_executing()                                                *reg_executing()*
 		Returns the single letter name of the register being executed.
 		Returns an empty string when no register is being executed.
 		See |@|.
 
-reg_recorded()						*reg_recorded()*
+reg_recorded()                                                  *reg_recorded()*
 		Returns the single letter name of the last recorded register.
 		Returns an empty string when nothing was recorded yet.
 		See |q| and |Q|.
 
-reg_recording()						*reg_recording()*
+reg_recording()                                                *reg_recording()*
 		Returns the single letter name of the register being recorded.
 		Returns an empty string when not recording.  See |q|.
 
 reltime()
 reltime({start})
-reltime({start}, {end})					*reltime()*
+reltime({start}, {end})                                              *reltime()*
 		Return an item that represents a time value.  The item is a
 		list with items that depend on the system.
 		The item can be passed to |reltimestr()| to convert it to a
@@ -6213,12 +5650,9 @@ reltime({start}, {end})					*reltime()*
 		The {start} and {end} arguments must be values returned by
 		reltime().  Returns zero on error.
 
-		Can also be used as a |method|: >
-			GetStart()->reltime()
-<
 		Note: |localtime()| returns the current (non-relative) time.
 
-reltimefloat({time})				*reltimefloat()*
+reltimefloat({time})                                            *reltimefloat()*
 		Return a Float that represents the time value of {time}.
 		Unit of time is seconds.
 		Example:
@@ -6229,28 +5663,22 @@ reltimefloat({time})				*reltimefloat()*
 		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >
-			reltime(start)->reltimefloat()
-
-reltimestr({time})				*reltimestr()*
+reltimestr({time})                                                *reltimestr()*
 		Return a String that represents the time value of {time}.
 		This is the number of seconds, a dot and the number of
-		microseconds.  Example: >
+		microseconds.  Example: >vim
 			let start = reltime()
 			call MyFunction()
 			echo reltimestr(reltime(start))
 <		Note that overhead for the commands will be added to the time.
 		Leading spaces are used to make the string align nicely.  You
-		can use split() to remove it. >
+		can use split() to remove it. >vim
 			echo split(reltimestr(reltime(start)))[0]
 <		Also see |profiling|.
 		If there is an error an empty string is returned
 
-		Can also be used as a |method|: >
-			reltime(start)->reltimestr()
-<
 remove({list}, {idx})
-remove({list}, {idx}, {end})				*remove()*
+remove({list}, {idx}, {end})                                          *remove()*
 		Without {end}: Remove the item at {idx} from |List| {list} and
 		return the item.
 		With {end}: Remove items from {idx} to {end} (inclusive) and
@@ -6259,15 +5687,12 @@ remove({list}, {idx}, {end})				*remove()*
 		points to an item before {idx} this is an error.
 		See |list-index| for possible values of {idx} and {end}.
 		Returns zero on error.
-		Example: >
-			:echo "last item: " .. remove(mylist, -1)
-			:call remove(mylist, 0, 9)
+		Example: >vim
+			echo "last item: " .. remove(mylist, -1)
+			call remove(mylist, 0, 9)
 <
 		Use |delete()| to remove a file.
 
-		Can also be used as a |method|: >
-			mylist->remove(idx)
-
 remove({blob}, {idx})
 remove({blob}, {idx}, {end})
 		Without {end}: Remove the byte at {idx} from |Blob| {blob} and
@@ -6277,18 +5702,19 @@ remove({blob}, {idx}, {end})
 		byte as {end} a |Blob| with one byte is returned.  When {end}
 		points to a byte before {idx} this is an error.
 		Returns zero on error.
-		Example: >
-			:echo "last byte: " .. remove(myblob, -1)
-			:call remove(mylist, 0, 9)
+		Example: >vim
+			echo "last byte: " .. remove(myblob, -1)
+			call remove(mylist, 0, 9)
+<
 
 remove({dict}, {key})
 		Remove the entry from {dict} with key {key} and return it.
-		Example: >
-			:echo "removed " .. remove(dict, "one")
+		Example: >vim
+			echo "removed " .. remove(dict, "one")
 <		If there is no {key} in {dict} this is an error.
 		Returns zero on error.
 
-rename({from}, {to})					*rename()*
+rename({from}, {to})                                                  *rename()*
 		Rename the file by the name {from} to the name {to}.  This
 		should also work to move files across file systems.  The
 		result is a Number, which is 0 if the file was renamed
@@ -6296,23 +5722,17 @@ rename({from}, {to})					*rename()*
 		NOTE: If {to} exists it is overwritten without warning.
 		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|: >
-			GetOldName()->rename(newname)
-
-repeat({expr}, {count})					*repeat()*
+repeat({expr}, {count})                                               *repeat()*
 		Repeat {expr} {count} times and return the concatenated
-		result.  Example: >
-			:let separator = repeat('-', 80)
+		result.  Example: >vim
+			let separator = repeat('-', 80)
 <		When {count} is zero or negative the result is empty.
-		When {expr} is a |List| the result is {expr} concatenated
-		{count} times.  Example: >
-			:let longlist = repeat(['a', 'b'], 3)
+		When {expr} is a |List| or a |Blob| the result is {expr}
+		concatenated {count} times.  Example: >vim
+			let longlist = repeat(['a', 'b'], 3)
 <		Results in ['a', 'b', 'a', 'b', 'a', 'b'].
 
-		Can also be used as a |method|: >
-			mylist->repeat(count)
-
-resolve({filename})					*resolve()* *E655*
+resolve({filename})                                             *resolve()* *E655*
 		On MS-Windows, when {filename} is a shortcut (a .lnk file),
 		returns the path the shortcut points to in a simplified form.
 		On Unix, repeat resolving symbolic links in all path
@@ -6325,56 +5745,53 @@ resolve({filename})					*resolve()* *E655*
 		current directory (provided the result is still a relative
 		path name) and also keeps a trailing path separator.
 
-		Can also be used as a |method|: >
-			GetName()->resolve()
-<
-							*reverse()*
-reverse({object})
-		Reverse the order of items in {object} in-place.
-		{object} can be a |List| or a |Blob|.
-		Returns {object}.
-		Returns zero if {object} is not a List or a Blob.
-		If you want an object to remain unmodified make a copy first: >
-			:let revlist = reverse(copy(mylist))
-<		Can also be used as a |method|: >
-			mylist->reverse()
-
-round({expr})							*round()*
+reverse({object})                                                    *reverse()*
+		Reverse the order of items in {object}.  {object} can be a
+		|List|, a |Blob| or a |String|.  For a List and a Blob the
+		items are reversed in-place and {object} is returned.
+		For a String a new String is returned.
+		Returns zero if {object} is not a List, Blob or a String.
+		If you want a List or Blob to remain unmodified make a copy
+		first: >vim
+			let revlist = reverse(copy(mylist))
+<
+
+round({expr})                                                          *round()*
 		Round off {expr} to the nearest integral value and return it
 		as a |Float|.  If {expr} lies halfway between two integral
 		values, then use the larger one (away from zero).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo round(0.456)
-<			0.0  >
+<			0.0  >vim
 			echo round(4.5)
-<			5.0 >
+<			5.0 >vim
 			echo round(-4.5)
 <			-5.0
 
-		Can also be used as a |method|: >
-			Compute()->round()
-
-rpcnotify({channel}, {event} [, {args}...])			*rpcnotify()*
+rpcnotify({channel}, {event} [, {args}...])                        *rpcnotify()*
 		Sends {event} to {channel} via |RPC| and returns immediately.
 		If {channel} is 0, the event is broadcast to all channels.
-		Example: >
-			:au VimLeave call rpcnotify(0, "leaving")
+		Example: >vim
+			au VimLeave call rpcnotify(0, "leaving")
+<
 
-rpcrequest({channel}, {method} [, {args}...])			*rpcrequest()*
+rpcrequest({channel}, {method} [, {args}...])                     *rpcrequest()*
 		Sends a request to {channel} to invoke {method} via
 		|RPC| and blocks until a response is received.
-		Example: >
-			:let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+		Example: >vim
+			let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
+<
 
-rpcstart({prog} [, {argv}])					*rpcstart()*
-		Deprecated. Replace  >
-			:let id = rpcstart('prog', ['arg1', 'arg2'])
-<		with >
-			:let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+rpcstart({prog} [, {argv}])                                         *rpcstart()*
+		Deprecated. Replace  >vim
+			let id = rpcstart('prog', ['arg1', 'arg2'])
+<		with >vim
+			let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
+<
 
-rubyeval({expr})					*rubyeval()*
+rubyeval({expr})                                                    *rubyeval()*
 		Evaluate Ruby expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers, floats and strings are returned as they are (strings
@@ -6384,19 +5801,13 @@ rubyeval({expr})					*rubyeval()*
 		Other objects are represented as strings resulted from their
 		"Object#to_s" method.
 
-		Can also be used as a |method|: >
-			GetRubyExpr()->rubyeval()
-
-screenattr({row}, {col})					*screenattr()*
+screenattr({row}, {col})                                          *screenattr()*
 		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >
-			GetRow()->screenattr(col)
-
-screenchar({row}, {col})					*screenchar()*
+screenchar({row}, {col})                                          *screenchar()*
 		The result is a Number, which is the character at position
 		[row, col] on the screen.  This works for every possible
 		screen position, also status lines, window separators and the
@@ -6406,20 +5817,14 @@ screenchar({row}, {col})					*screenchar()*
 		This is mainly to be used for testing.
 		Returns -1 when row or col is out of range.
 
-		Can also be used as a |method|: >
-			GetRow()->screenchar(col)
-
-screenchars({row}, {col})					*screenchars()*
-		The result is a List of Numbers.  The first number is the same
+screenchars({row}, {col})                                        *screenchars()*
+		The result is a |List| of Numbers.  The first number is the same
 		as what |screenchar()| returns.  Further numbers are
 		composing characters on top of the base character.
 		This is mainly to be used for testing.
 		Returns an empty List when row or col is out of range.
 
-		Can also be used as a |method|: >
-			GetRow()->screenchars(col)
-
-screencol()							*screencol()*
+screencol()                                                        *screencol()*
 		The result is a Number, which is the current screen column of
 		the cursor. The leftmost column has number 1.
 		This function is mainly used for testing.
@@ -6428,12 +5833,13 @@ screencol()							*screencol()*
 		in a command (e.g. ":echo screencol()") it will return the
 		column inside the command line, which is 1 when the command is
 		executed. To get the cursor position in the file use one of
-		the following mappings: >
+		the following mappings: >vim
 			nnoremap <expr> GG ":echom " .. screencol() .. "\n"
 			nnoremap <silent> GG :echom screencol()<CR>
 			noremap GG <Cmd>echom screencol()<Cr>
 <
-screenpos({winid}, {lnum}, {col})				*screenpos()*
+
+screenpos({winid}, {lnum}, {col})                                  *screenpos()*
 		The result is a Dict with the screen position of the text
 		character in window {winid} at buffer line {lnum} and column
 		{col}.  {col} is a one-based byte index.
@@ -6453,12 +5859,11 @@ screenpos({winid}, {lnum}, {col})				*screenpos()*
 		as if 'conceallevel' is zero.  You can set the cursor to the
 		right position and use |screencol()| to get the value with
 		|conceal| taken into account.
+		If the position is in a closed fold the screen position of the
+		first character is returned, {col} is not used.
 		Returns an empty Dict if {winid} is invalid.
 
-		Can also be used as a |method|: >
-			GetWinid()->screenpos(lnum, col)
-
-screenrow()							*screenrow()*
+screenrow()                                                        *screenrow()*
 		The result is a Number, which is the current screen row of the
 		cursor.  The top line has number one.
 		This function is mainly used for testing.
@@ -6466,7 +5871,7 @@ screenrow()							*screenrow()*
 
 		Note: Same restrictions as with |screencol()|.
 
-screenstring({row}, {col})					*screenstring()*
+screenstring({row}, {col})                                      *screenstring()*
 		The result is a String that contains the base character and
 		any composing characters at position [row, col] on the screen.
 		This is like |screenchars()| but returning a String with the
@@ -6474,11 +5879,7 @@ screenstring({row}, {col})					*screenstring()*
 		This is mainly to be used for testing.
 		Returns an empty String when row or col is out of range.
 
-		Can also be used as a |method|: >
-			GetRow()->screenstring(col)
-<
-								*search()*
-search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
+search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]]) *search()*
 		Search for regexp pattern {pattern}.  The search starts at the
 		cursor position (you can use |cursor()| to set it).
 
@@ -6519,7 +5920,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 
 		When the {stopline} argument is given then the search stops
 		after searching this line.  This is useful to restrict the
-		search to a range of lines.  Examples: >
+		search to a range of lines.  Examples: >vim
 			let match = search('(', 'b', line("w0"))
 			let end = search('END', '', line("w$"))
 <		When {stopline} is used and it is not zero this also implies
@@ -6550,24 +5951,24 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		The cursor will be positioned at the match, unless the 'n'
 		flag is used.
 
-		Example (goes over all files in the argument list): >
-		    :let n = 1
-		    :while n <= argc()	    " loop over all files in arglist
-		    :  exe "argument " .. n
-		    :  " start at the last char in the file and wrap for the
-		    :  " first search to find match at start of file
-		    :  normal G$
-		    :  let flags = "w"
-		    :  while search("foo", flags) > 0
-		    :	 s/foo/bar/g
-		    :	 let flags = "W"
-		    :  endwhile
-		    :  update		    " write the file if modified
-		    :  let n = n + 1
-		    :endwhile
-<
-		Example for using some flags: >
-		    :echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
+		Example (goes over all files in the argument list): >vim
+		    let n = 1
+		    while n <= argc()	    " loop over all files in arglist
+		      exe "argument " .. n
+		      " start at the last char in the file and wrap for the
+		      " first search to find match at start of file
+		      normal G$
+		      let flags = "w"
+		      while search("foo", flags) > 0
+		        s/foo/bar/g
+		        let flags = "W"
+		      endwhile
+		      update		    " write the file if modified
+		      let n = n + 1
+		    endwhile
+<
+		Example for using some flags: >vim
+		    echo search('\<if\|\(else\)\|\(endif\)', 'ncpe')
 <		This will search for the keywords "if", "else", and "endif"
 		under or after the cursor.  Because of the 'p' flag, it
 		returns 1, 2, or 3 depending on which keyword is found, or 0
@@ -6579,15 +5980,12 @@ search({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		without the 'e' flag if the cursor is on the "f" of "if".
 		The 'n' flag tells the function not to move the cursor.
 
-		Can also be used as a |method|: >
-			GetPattern()->search()
-
-searchcount([{options}])					*searchcount()*
+searchcount([{options}])                                         *searchcount()*
 		Get or update the last search count, like what is displayed
 		without the "S" flag in 'shortmess'.  This works even if
 		'shortmess' does contain the "S" flag.
 
-		This returns a Dictionary. The dictionary is empty if the
+		This returns a |Dictionary|. The dictionary is empty if the
 		previous pattern was not set and "pattern" was not specified.
 
 		  key		type		meaning ~
@@ -6607,7 +6005,7 @@ searchcount([{options}])					*searchcount()*
 		this function with `recompute: 0` . This sometimes returns
 		wrong information because |n| and |N|'s maximum count is 99.
 		If it exceeded 99 the result must be max count + 1 (100). If
-		you want to get correct information, specify `recompute: 1`: >
+		you want to get correct information, specify `recompute: 1`: >vim
 
 			" result == maxcount + 1 (100) when many matches
 			let result = searchcount(#{recompute: 0})
@@ -6616,7 +6014,7 @@ searchcount([{options}])					*searchcount()*
 			" to 1)
 			let result = searchcount()
 <
-		The function is useful to add the count to 'statusline': >
+		The function is useful to add the count to 'statusline': >vim
 			function! LastSearchCount() abort
 			  let result = searchcount(#{recompute: 0})
 			  if empty(result)
@@ -6645,7 +6043,7 @@ searchcount([{options}])					*searchcount()*
 			" \   '%{v:hlsearch ? LastSearchCount() : ""}'
 <
 		You can also update the search count, which can be useful in a
-		|CursorMoved| or |CursorMovedI| autocommand: >
+		|CursorMoved| or |CursorMovedI| autocommand: >vim
 
 			autocmd CursorMoved,CursorMovedI *
 			  \ let s:searchcount_timer = timer_start(
@@ -6659,7 +6057,7 @@ searchcount([{options}])					*searchcount()*
 			endfunction
 <
 		This can also be used to count matched texts with specified
-		pattern in the current buffer using "pattern":  >
+		pattern in the current buffer using "pattern":  >vim
 
 			" Count '\<foo\>' in this buffer
 			" (Note that it also updates search count)
@@ -6669,7 +6067,7 @@ searchcount([{options}])					*searchcount()*
 			" search again
 			call searchcount()
 <
-		{options} must be a Dictionary. It can contain:
+		{options} must be a |Dictionary|. It can contain:
 		  key		type		meaning ~
 		  recompute	|Boolean|	if |TRUE|, recompute the count
 						like |n| or |N| was executed.
@@ -6683,7 +6081,7 @@ searchcount([{options}])					*searchcount()*
 						and different with |@/|.
 						this works as same as the
 						below command is executed
-						before calling this function >
+						before calling this function >vim
 						  let @/ = pattern
 <						(default: |@/|)
 		  timeout	|Number|	0 or negative number is no
@@ -6703,10 +6101,7 @@ searchcount([{options}])					*searchcount()*
 						value. see |cursor()|, |getpos()|
 						(default: cursor's position)
 
-		Can also be used as a |method|: >
-			GetSearchOpts()->searchcount()
-<
-searchdecl({name} [, {global} [, {thisblock}]])			*searchdecl()*
+searchdecl({name} [, {global} [, {thisblock}]])                   *searchdecl()*
 		Search for the declaration of {name}.
 
 		With a non-zero {global} argument it works like |gD|, find
@@ -6719,17 +6114,14 @@ searchdecl({name} [, {global} [, {thisblock}]])			*searchdecl()*
 
 		Moves the cursor to the found match.
 		Returns zero for success, non-zero for failure.
-		Example: >
+		Example: >vim
 			if searchdecl('myvar') == 0
 			   echo getline('.')
 			endif
 <
-		Can also be used as a |method|: >
-			GetName()->searchdecl()
-<
-							*searchpair()*
-searchpair({start}, {middle}, {end} [, {flags} [, {skip}
-				[, {stopline} [, {timeout}]]]])
+
+                                                                  *searchpair()*
+searchpair({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Search for the match of a nested start-end pair.  This can be
 		used to find the "endif" that matches an "if", while other
 		if/endif pairs in between are ignored.
@@ -6744,8 +6136,8 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		must not contain \( \) pairs.  Use of \%( \) is allowed.  When
 		{middle} is not empty, it is found when searching from either
 		direction, but only when not in a nested start-end pair.  A
-		typical use is: >
-			searchpair('\<if\>', '\<else\>', '\<endif\>')
+		typical use is: >vim
+			echo searchpair('\<if\>', '\<else\>', '\<endif\>')
 <		By leaving {middle} empty the "else" is skipped.
 
 		{flags} 'b', 'c', 'n', 's', 'w' and 'W' are used like with
@@ -6775,7 +6167,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 
 		The search starts exactly at the cursor.  A match with
 		{start}, {middle} or {end} at the next character, in the
-		direction of searching, is the first one found.  Example: >
+		direction of searching, is the first one found.  Example: >vim
 			if 1
 			  if 2
 			  endif 2
@@ -6791,9 +6183,9 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		that when the cursor is inside a match with the end it finds
 		the matching start.
 
-		Example, to find the "endif" command in a Vim script: >
+		Example, to find the "endif" command in a Vim script: >vim
 
-	:echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
+			echo searchpair('\<if\>', '\<el\%[seif]\>', '\<en\%[dif]\>', 'W',
 			\ 'getline(".") =~ "^\\s*\""')
 
 <		The cursor must be at or after the "if" for which a match is
@@ -6802,56 +6194,54 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		catches comments at the start of a line, not after a command.
 		Also, a word "en" or "if" halfway through a line is considered
 		a match.
-		Another example, to search for the matching "{" of a "}": >
+		Another example, to search for the matching "{" of a "}": >vim
 
-	:echo searchpair('{', '', '}', 'bW')
+			echo searchpair('{', '', '}', 'bW')
 
 <		This works when the cursor is at or before the "}" for which a
 		match is to be found.  To reject matches that syntax
-		highlighting recognized as strings: >
+		highlighting recognized as strings: >vim
 
-	:echo searchpair('{', '', '}', 'bW',
-	     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
+			echo searchpair('{', '', '}', 'bW',
+			     \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')
 <
-							*searchpairpos()*
-searchpairpos({start}, {middle}, {end} [, {flags} [, {skip}
-				[, {stopline} [, {timeout}]]]])
+
+                                                               *searchpairpos()*
+searchpairpos({start}, {middle}, {end} [, {flags} [, {skip} [, {stopline} [, {timeout}]]]])
 		Same as |searchpair()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
 		is the line number and the second element is the byte index of
 		the column position of the match.  If no match is found,
-		returns [0, 0]. >
+		returns [0, 0]. >vim
 
-			:let [lnum,col] = searchpairpos('{', '', '}', 'n')
+			let [lnum,col] = searchpairpos('{', '', '}', 'n')
 <
 		See |match-parens| for a bigger and more useful example.
 
-							*searchpos()*
+                                                                   *searchpos()*
 searchpos({pattern} [, {flags} [, {stopline} [, {timeout} [, {skip}]]]])
 		Same as |search()|, but returns a |List| with the line and
 		column position of the match. The first element of the |List|
 		is the line number and the second element is the byte index of
 		the column position of the match. If no match is found,
 		returns [0, 0].
-		Example: >
-	:let [lnum, col] = searchpos('mypattern', 'n')
+		Example: >vim
+			let [lnum, col] = searchpos('mypattern', 'n')
 
 <		When the 'p' flag is given then there is an extra item with
-		the sub-pattern match number |search()-sub-match|.  Example: >
-	:let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
+		the sub-pattern match number |search()-sub-match|.  Example: >vim
+			let [lnum, col, submatch] = searchpos('\(\l\)\|\(\u\)', 'np')
 <		In this example "submatch" is 2 when a lowercase letter is
 		found |/\l|, 3 when an uppercase letter is found |/\u|.
 
-		Can also be used as a |method|: >
-			GetPattern()->searchpos()
-
-serverlist()						*serverlist()*
+serverlist()                                                      *serverlist()*
 		Returns a list of server addresses, or empty if all servers
 		were stopped. |serverstart()| |serverstop()|
-		Example: >
-			:echo serverlist()
+		Example: >vim
+			echo serverlist()
+<
 
-serverstart([{address}])				*serverstart()*
+serverstart([{address}])                                         *serverstart()*
 		Opens a socket or named pipe at {address} and listens for
 		|RPC| messages. Clients can send |API| commands to the
 		returned address to control Nvim.
@@ -6864,32 +6254,34 @@ serverstart([{address}])				*serverstart()*
 		  assigns a random port).
 		- Else {address} is the path to a named pipe (except on Windows).
 		  - If {address} has no slashes ("/") it is treated as the
-		    "name" part of a generated path in this format: >
+		    "name" part of a generated path in this format: >vim
 			stdpath("run").."/{name}.{pid}.{counter}"
-<		  - If {address} is omitted the name is "nvim". >
-			:echo serverstart()
+<		  - If {address} is omitted the name is "nvim". >vim
+			echo serverstart()
+<		 >
 			=> /tmp/nvim.bram/oknANW/nvim.15430.5
-
-<		Example bash command to list all Nvim servers: >
+<
+		Example bash command to list all Nvim servers: >bash
 			ls ${XDG_RUNTIME_DIR:-${TMPDIR}nvim.${USER}}/*/nvim.*.0
 
-<		Example named pipe: >
+<		Example named pipe: >vim
 			if has('win32')
 			  echo serverstart('\\.\pipe\nvim-pipe-1234')
 			else
 			  echo serverstart('nvim.sock')
 			endif
 <
-		Example TCP/IP address: >
+		Example TCP/IP address: >vim
 			echo serverstart('::1:12345')
+<
 
-serverstop({address})					*serverstop()*
+serverstop({address})                                             *serverstop()*
 		Closes the pipe or socket at {address}.
 		Returns TRUE if {address} is valid, else FALSE.
 		If |v:servername| is stopped it is set to the next available
 		address in |serverlist()|.
 
-setbufline({buf}, {lnum}, {text})			*setbufline()*
+setbufline({buf}, {lnum}, {text})                                 *setbufline()*
 		Set line {lnum} to {text} in buffer {buf}.  This works like
 		|setline()| for the specified buffer.
 
@@ -6898,9 +6290,10 @@ setbufline({buf}, {lnum}, {text})			*setbufline()*
 
 		To insert lines use |appendbufline()|.
 
-		{text} can be a string to set one line, or a list of strings
-		to set multiple lines.  If the list extends below the last
-		line then those lines are added.
+		{text} can be a string to set one line, or a List of strings
+		to set multiple lines.  If the List extends below the last
+		line then those lines are added.  If the List is empty then
+		nothing is changed and zero is returned.
 
 		For the use of {buf}, see |bufname()| above.
 
@@ -6913,11 +6306,7 @@ setbufline({buf}, {lnum}, {text})			*setbufline()*
 		If {buf} is not a valid buffer or {lnum} is not valid, an
 		error message is given.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetText()->setbufline(buf, lnum)
-
-setbufvar({buf}, {varname}, {val})			*setbufvar()*
+setbufvar({buf}, {varname}, {val})                                 *setbufvar()*
 		Set option or local variable {varname} in buffer {buf} to
 		{val}.
 		This also works for a global or local window option, but it
@@ -6926,21 +6315,16 @@ setbufvar({buf}, {varname}, {val})			*setbufvar()*
 		For the use of {buf}, see |bufname()| above.
 		The {varname} argument is a string.
 		Note that the variable name without "b:" must be used.
-		Examples: >
-			:call setbufvar(1, "&mod", 1)
-			:call setbufvar("todo", "myvar", "foobar")
+		Examples: >vim
+			call setbufvar(1, "&mod", 1)
+			call setbufvar("todo", "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetValue()->setbufvar(buf, varname)
-
-
-setcellwidths({list})					*setcellwidths()*
+setcellwidths({list})                                          *setcellwidths()*
 		Specify overrides for cell widths of character ranges.  This
 		tells Vim how wide characters are when displayed in the
 		terminal, counted in screen cells.  The values override
-		'ambiwidth'.  Example: >
+		'ambiwidth'.  Example: >vim
 		   call setcellwidths([
 				\ [0x111, 0x111, 1],
 				\ [0x2194, 0x2199, 2],
@@ -6956,12 +6340,12 @@ setcellwidths({list})					*setcellwidths()*
 		{width} must be either 1 or 2, indicating the character width
 		in screen cells.			*E1112*
 		An error is given if the argument is invalid, also when a
-		range overlaps with another. 		*E1113*
+		range overlaps with another.		*E1113*
 
 		If the new value causes 'fillchars' or 'listchars' to become
 		invalid it is rejected and an error is given.
 
-		To clear the overrides pass an empty {list}: >
+		To clear the overrides pass an empty {list}: >vim
 		   call setcellwidths([])
 
 <		You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
@@ -6970,22 +6354,18 @@ setcellwidths({list})					*setcellwidths()*
 		match with what Vim knows about each emoji.  If it doesn't
 		look right you need to adjust the {list} argument.
 
-
-setcharpos({expr}, {list})				*setcharpos()*
+setcharpos({expr}, {list})                                        *setcharpos()*
 		Same as |setpos()| but uses the specified column number as the
 		character index instead of the byte index in the line.
 
 		Example:
-		With the text "여보세요" in line 8: >
+		With the text "여보세요" in line 8: >vim
 			call setcharpos('.', [0, 8, 4, 0])
-<		positions the cursor on the fourth character '요'. >
+<		positions the cursor on the fourth character '요'. >vim
 			call setpos('.', [0, 8, 4, 0])
 <		positions the cursor on the second character '보'.
 
-		Can also be used as a |method|: >
-			GetPosition()->setcharpos('.')
-
-setcharsearch({dict})					*setcharsearch()*
+setcharsearch({dict})                                          *setcharsearch()*
 		Set the current character search information to {dict},
 		which contains one or more of the following entries:
 
@@ -6999,26 +6379,20 @@ setcharsearch({dict})					*setcharsearch()*
 				character search
 
 		This can be useful to save/restore a user's character search
-		from a script: >
-			:let prevsearch = getcharsearch()
-			:" Perform a command which clobbers user's search
-			:call setcharsearch(prevsearch)
+		from a script: >vim
+			let prevsearch = getcharsearch()
+			" Perform a command which clobbers user's search
+			call setcharsearch(prevsearch)
 <		Also see |getcharsearch()|.
 
-		Can also be used as a |method|: >
-			SavedSearch()->setcharsearch()
-
-setcmdline({str} [, {pos}])					*setcmdline()*
+setcmdline({str} [, {pos}])                                       *setcmdline()*
 		Set the command line to {str} and set the cursor position to
 		{pos}.
 		If {pos} is omitted, the cursor is positioned after the text.
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >
-			GetText()->setcmdline()
-
-setcmdpos({pos})					*setcmdpos()*
+setcmdpos({pos})                                                   *setcmdpos()*
 		Set the cursor position in the command line to byte position
 		{pos}.  The first position is 1.
 		Use |getcmdpos()| to obtain the current position.
@@ -7033,36 +6407,26 @@ setcmdpos({pos})					*setcmdpos()*
 		Returns 0 when successful, 1 when not editing the command
 		line.
 
-		Can also be used as a |method|: >
-			GetPos()->setcmdpos()
-
-setcursorcharpos({lnum}, {col} [, {off}])		*setcursorcharpos()*
-setcursorcharpos({list})
+setcursorcharpos({lnum}, {col} [, {off}])
+setcursorcharpos({list})                                    *setcursorcharpos()*
 		Same as |cursor()| but uses the specified column number as the
 		character index instead of the byte index in the line.
 
 		Example:
-		With the text "여보세요" in line 4: >
+		With the text "여보세요" in line 4: >vim
 			call setcursorcharpos(4, 3)
-<		positions the cursor on the third character '세'. >
+<		positions the cursor on the third character '세'. >vim
 			call cursor(4, 3)
 <		positions the cursor on the first character '여'.
 
-		Can also be used as a |method|: >
-			GetCursorPos()->setcursorcharpos()
-
-setenv({name}, {val})						*setenv()*
-		Set environment variable {name} to {val}.  Example: >
+setenv({name}, {val})                                                 *setenv()*
+		Set environment variable {name} to {val}.  Example: >vim
 			call setenv('HOME', '/home/myhome')
 
 <		When {val} is |v:null| the environment variable is deleted.
 		See also |expr-env|.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetPath()->setenv('PATH')
-
-setfperm({fname}, {mode})				*setfperm()* *chmod*
+setfperm({fname}, {mode})                                     *setfperm()* *chmod*
 		Set the file permissions for {fname} to {mode}.
 		{mode} must be a string with 9 characters.  It is of the form
 		"rwxrwxrwx", where each group of "rwx" flags represent, in
@@ -7077,12 +6441,9 @@ setfperm({fname}, {mode})				*setfperm()* *chmod*
 
 		Returns non-zero for success, zero for failure.
 
-		Can also be used as a |method|: >
-			GetFilename()->setfperm(mode)
-<
 		To read permissions see |getfperm()|.
 
-setline({lnum}, {text})					*setline()*
+setline({lnum}, {text})                                              *setline()*
 		Set line {lnum} of the current buffer to {text}.  To insert
 		lines use |append()|. To set lines in another buffer use
 		|setbufline()|.
@@ -7091,29 +6452,26 @@ setline({lnum}, {text})					*setline()*
 		When {lnum} is just below the last line the {text} will be
 		added below the last line.
 		{text} can be any type or a List of any type, each item is
-		converted to a String.
+		converted to a String.  When {text} is an empty List then
+		nothing is changed and FALSE is returned.
 
 		If this succeeds, FALSE is returned.  If this fails (most likely
 		because {lnum} is invalid) TRUE is returned.
 
-		Example: >
-			:call setline(5, strftime("%c"))
+		Example: >vim
+			call setline(5, strftime("%c"))
 
 <		When {text} is a |List| then line {lnum} and following lines
-		will be set to the items in the list.  Example: >
-			:call setline(5, ['aaa', 'bbb', 'ccc'])
-<		This is equivalent to: >
-			:for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
-			:  call setline(n, l)
-			:endfor
+		will be set to the items in the list.  Example: >vim
+			call setline(5, ['aaa', 'bbb', 'ccc'])
+<		This is equivalent to: >vim
+			for [n, l] in [[5, 'aaa'], [6, 'bbb'], [7, 'ccc']]
+			  call setline(n, l)
+			endfor
 
 <		Note: The '[ and '] marks are not set.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetText()->setline(lnum)
-
-setloclist({nr}, {list} [, {action} [, {what}]])		*setloclist()*
+setloclist({nr}, {list} [, {action} [, {what}]])                  *setloclist()*
 		Create or replace or add to the location list for window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
@@ -7129,11 +6487,7 @@ setloclist({nr}, {list} [, {action} [, {what}]])		*setloclist()*
 		only the items listed in {what} are set. Refer to |setqflist()|
 		for the list of supported keys in {what}.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetLoclist()->setloclist(winnr)
-
-setmatches({list} [, {win}])				*setmatches()*
+setmatches({list} [, {win}])                                      *setmatches()*
 		Restores a list of matches saved by |getmatches()| for the
 		current window.  Returns 0 if successful, otherwise -1.  All
 		current matches are cleared before the list is restored.  See
@@ -7141,11 +6495,7 @@ setmatches({list} [, {win}])				*setmatches()*
 		If {win} is specified, use the window with this number or
 		window ID instead of the current window.
 
-		Can also be used as a |method|: >
-			GetMatches()->setmatches()
-<
-							*setpos()*
-setpos({expr}, {list})
+setpos({expr}, {list})                                                *setpos()*
 		Set the position for String {expr}.  Possible values:
 			.	the cursor
 			'x	mark x
@@ -7194,10 +6544,7 @@ setpos({expr}, {list})
 		also set the preferred column.  Also see the "curswant" key in
 		|winrestview()|.
 
-		Can also be used as a |method|: >
-			GetPosition()->setpos('.')
-
-setqflist({list} [, {action} [, {what}]])		*setqflist()*
+setqflist({list} [, {action} [, {what}]])                          *setqflist()*
 		Create or replace or add to the quickfix list.
 
 		If the optional {what} dictionary argument is supplied, then
@@ -7227,6 +6574,9 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		    text	description of the error
 		    type	single-character error type, 'E', 'W', etc.
 		    valid	recognized error message
+		    user_data
+				custom data associated with the item, can be
+				any type.
 
 		The "col", "vcol", "nr", "type" and "text" entries are
 		optional.  Either "lnum" or "pattern" entry can be used to
@@ -7250,8 +6600,8 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 
 		'r'	The items from the current quickfix list are replaced
 			with the items from {list}.  This can also be used to
-			clear the list: >
-				:call setqflist([], 'r')
+			clear the list: >vim
+				call setqflist([], 'r')
 <
 		'f'	All the quickfix lists in the quickfix stack are
 			freed.
@@ -7297,10 +6647,10 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		list is modified, "id" should be used instead of "nr" to
 		specify the list.
 
-		Examples (See also |setqflist-examples|): >
-		   :call setqflist([], 'r', {'title': 'My search'})
-		   :call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
-		   :call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
+		Examples (See also |setqflist-examples|): >vim
+		   call setqflist([], 'r', {'title': 'My search'})
+		   call setqflist([], 'r', {'nr': 2, 'title': 'Errors'})
+		   call setqflist([], 'a', {'id':qfid, 'lines':["F1:10:L10"]})
 <
 		Returns zero for success, -1 for failure.
 
@@ -7308,12 +6658,7 @@ setqflist({list} [, {action} [, {what}]])		*setqflist()*
 		independent of the 'errorformat' setting.  Use a command like
 		`:cc 1` to jump to the first position.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetErrorlist()->setqflist()
-<
-							*setreg()*
-setreg({regname}, {value} [, {options}])
+setreg({regname}, {value} [, {options}])                              *setreg()*
 		Set the register {regname} to {value}.
 		If {regname} is "" or "@", the unnamed register '"' is used.
 		The {regname} argument is a string.
@@ -7345,35 +6690,31 @@ setreg({regname}, {value} [, {options}])
 		      set search and expression registers. Lists containing no
 		      items act like empty strings.
 
-		Examples: >
-			:call setreg(v:register, @*)
-			:call setreg('*', @%, 'ac')
-			:call setreg('a', "1\n2\n3", 'b5')
-			:call setreg('"', { 'points_to': 'a'})
+		Examples: >vim
+			call setreg(v:register, @*)
+			call setreg('*', @%, 'ac')
+			call setreg('a', "1\n2\n3", 'b5')
+			call setreg('"', { 'points_to': 'a'})
 
 <		This example shows using the functions to save and restore a
-		register: >
-			:let var_a = getreginfo()
-			:call setreg('a', var_a)
-<		or: >
-			:let var_a = getreg('a', 1, 1)
-			:let var_amode = getregtype('a')
-			    ....
-			:call setreg('a', var_a, var_amode)
+		register: >vim
+			let var_a = getreginfo()
+			call setreg('a', var_a)
+<		or: >vim
+			let var_a = getreg('a', 1, 1)
+			let var_amode = getregtype('a')
+			" ....
+			call setreg('a', var_a, var_amode)
 <		Note: you may not reliably restore register value
 		without using the third argument to |getreg()| as without it
 		newlines are represented as newlines AND Nul bytes are
 		represented as newlines as well, see |NL-used-for-Nul|.
 
 		You can also change the type of a register by appending
-		nothing: >
-			:call setreg('a', '', 'al')
-
-<		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetText()->setreg('a')
+		nothing: >vim
+			call setreg('a', '', 'al')
 
-settabvar({tabnr}, {varname}, {val})			*settabvar()*
+settabvar({tabnr}, {varname}, {val})                               *settabvar()*
 		Set tab-local variable {varname} to {val} in tab page {tabnr}.
 		|t:var|
 		The {varname} argument is a string.
@@ -7381,11 +6722,7 @@ settabvar({tabnr}, {varname}, {val})			*settabvar()*
 		Tabs are numbered starting with one.
 		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetValue()->settabvar(tab, name)
-
-settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
+settabwinvar({tabnr}, {winnr}, {varname}, {val})                *settabwinvar()*
 		Set option or local variable {varname} in window {winnr} to
 		{val}.
 		Tabs are numbered starting with one.  For the current tabpage
@@ -7396,16 +6733,12 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		doesn't work for a global or local buffer variable.
 		For a local buffer option the global value is unchanged.
 		Note that the variable name without "w:" must be used.
-		Examples: >
-			:call settabwinvar(1, 1, "&list", 0)
-			:call settabwinvar(3, 2, "myvar", "foobar")
+		Examples: >vim
+			call settabwinvar(1, 1, "&list", 0)
+			call settabwinvar(3, 2, "myvar", "foobar")
 <		This function is not available in the |sandbox|.
 
-		Can also be used as a |method|, the base is passed as the
-		fourth argument: >
-			GetValue()->settabwinvar(tab, winnr, name)
-
-settagstack({nr}, {dict} [, {action}])			*settagstack()*
+settagstack({nr}, {dict} [, {action}])                           *settagstack()*
 		Modify the tag stack of the window {nr} using {dict}.
 		{nr} can be the window number or the |window-ID|.
 
@@ -7429,37 +6762,27 @@ settagstack({nr}, {dict} [, {action}])			*settagstack()*
 		Returns zero for success, -1 for failure.
 
 		Examples (for more examples see |tagstack-examples|):
-		    Empty the tag stack of window 3: >
+		    Empty the tag stack of window 3: >vim
 			call settagstack(3, {'items' : []})
 
-<		    Save and restore the tag stack: >
+<		    Save and restore the tag stack: >vim
 			let stack = gettagstack(1003)
 			" do something else
 			call settagstack(1003, stack)
 			unlet stack
 <
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetStack()->settagstack(winnr)
 
-setwinvar({nr}, {varname}, {val})			*setwinvar()*
+setwinvar({nr}, {varname}, {val})                                  *setwinvar()*
 		Like |settabwinvar()| for the current tab page.
-		Examples: >
-			:call setwinvar(1, "&list", 0)
-			:call setwinvar(2, "myvar", "foobar")
+		Examples: >vim
+			call setwinvar(1, "&list", 0)
+			call setwinvar(2, "myvar", "foobar")
 
-<		Can also be used as a |method|, the base is passed as the
-		third argument: >
-			GetValue()->setwinvar(winnr, name)
-
-sha256({string})						*sha256()*
+sha256({string})                                                      *sha256()*
 		Returns a String with 64 hex characters, which is the SHA256
 		checksum of {string}.
 
-		Can also be used as a |method|: >
-			GetText()->sha256()
-
-shellescape({string} [, {special}])			*shellescape()*
+shellescape({string} [, {special}])                              *shellescape()*
 		Escape {string} for use as a shell command argument.
 
 		On Windows when 'shellslash' is not set, encloses {string} in
@@ -7483,21 +6806,18 @@ shellescape({string} [, {special}])			*shellescape()*
 		be escaped because in fish it is used as an escape character
 		inside single quotes.
 
-		Example of use with a |:!| command: >
-		    :exe '!dir ' .. shellescape(expand('<cfile>'), 1)
+		Example of use with a |:!| command: >vim
+		    exe '!dir ' .. shellescape(expand('<cfile>'), 1)
 <		This results in a directory listing for the file under the
-		cursor.  Example of use with |system()|: >
-		    :call system("chmod +w -- " .. shellescape(expand("%")))
+		cursor.  Example of use with |system()|: >vim
+		    call system("chmod +w -- " .. shellescape(expand("%")))
 <		See also |::S|.
 
-		Can also be used as a |method|: >
-			GetCommand()->shellescape()
-
-shiftwidth([{col}])						*shiftwidth()*
+shiftwidth([{col}])                                               *shiftwidth()*
 		Returns the effective value of 'shiftwidth'. This is the
 		'shiftwidth' value unless it is zero, in which case it is the
 		'tabstop' value.  To be backwards compatible in indent
-		plugins, use this: >
+		plugins, use this: >vim
 			if exists('*shiftwidth')
 			  func s:sw()
 			    return shiftwidth()
@@ -7514,12 +6834,370 @@ shiftwidth([{col}])						*shiftwidth()*
 		'vartabstop' feature. If no {col} argument is given, column 1
 		will be assumed.
 
-		Can also be used as a |method|: >
-			GetColumn()->shiftwidth()
+sign_define({name} [, {dict}])
+sign_define({list})                                              *sign_define()*
+		Define a new sign named {name} or modify the attributes of an
+		existing sign.  This is similar to the |:sign-define| command.
+
+		Prefix {name} with a unique text to avoid name collisions.
+		There is no {group} like with placing signs.
+
+		The {name} can be a String or a Number.  The optional {dict}
+		argument specifies the sign attributes.  The following values
+		are supported:
+		   icon		full path to the bitmap file for the sign.
+		   linehl	highlight group used for the whole line the
+				sign is placed in.
+		   numhl	highlight group used for the line number where
+				the sign is placed.
+		   text		text that is displayed when there is no icon
+				or the GUI is not being used.
+		   texthl	highlight group used for the text item
+		   culhl	highlight group used for the text item when
+				the cursor is on the same line as the sign and
+				'cursorline' is enabled.
+
+		If the sign named {name} already exists, then the attributes
+		of the sign are updated.
+
+		The one argument {list} can be used to define a list of signs.
+		Each list item is a dictionary with the above items in {dict}
+		and a "name" item for the sign name.
+
+		Returns 0 on success and -1 on failure.  When the one argument
+		{list} is used, then returns a List of values one for each
+		defined sign.
+
+		Examples: >vim
+			call sign_define("mySign", {
+				\ "text" : "=>",
+				\ "texthl" : "Error",
+				\ "linehl" : "Search"})
+			call sign_define([
+				\ {'name' : 'sign1',
+				\  'text' : '=>'},
+				\ {'name' : 'sign2',
+				\  'text' : '!!'}
+				\ ])
+<
+
+sign_getdefined([{name}])                                    *sign_getdefined()*
+		Get a list of defined signs and their attributes.
+		This is similar to the |:sign-list| command.
+
+		If the {name} is not supplied, then a list of all the defined
+		signs is returned. Otherwise the attribute of the specified
+		sign is returned.
+
+		Each list item in the returned value is a dictionary with the
+		following entries:
+		   icon		full path to the bitmap file of the sign
+		   linehl	highlight group used for the whole line the
+				sign is placed in; not present if not set.
+		   name		name of the sign
+		   numhl	highlight group used for the line number where
+				the sign is placed; not present if not set.
+		   text		text that is displayed when there is no icon
+				or the GUI is not being used.
+		   texthl	highlight group used for the text item; not
+				present if not set.
+		   culhl	highlight group used for the text item when
+				the cursor is on the same line as the sign and
+				'cursorline' is enabled; not present if not
+				set.
+
+		Returns an empty List if there are no signs and when {name} is
+		not found.
+
+		Examples: >vim
+			" Get a list of all the defined signs
+			echo sign_getdefined()
+
+			" Get the attribute of the sign named mySign
+			echo sign_getdefined("mySign")
+<
+
+sign_getplaced([{buf} [, {dict}]])                            *sign_getplaced()*
+		Return a list of signs placed in a buffer or all the buffers.
+		This is similar to the |:sign-place-list| command.
+
+		If the optional buffer name {buf} is specified, then only the
+		list of signs placed in that buffer is returned.  For the use
+		of {buf}, see |bufname()|. The optional {dict} can contain
+		the following entries:
+		   group	select only signs in this group
+		   id		select sign with this identifier
+		   lnum		select signs placed in this line. For the use
+				of {lnum}, see |line()|.
+		If {group} is "*", then signs in all the groups including the
+		global group are returned. If {group} is not supplied or is an
+		empty string, then only signs in the global group are
+		returned.  If no arguments are supplied, then signs in the
+		global group placed in all the buffers are returned.
+		See |sign-group|.
+
+		Each list item in the returned value is a dictionary with the
+		following entries:
+			bufnr	number of the buffer with the sign
+			signs	list of signs placed in {bufnr}. Each list
+				item is a dictionary with the below listed
+				entries
+
+		The dictionary for each sign contains the following entries:
+			group	 sign group. Set to '' for the global group.
+			id	 identifier of the sign
+			lnum	 line number where the sign is placed
+			name	 name of the defined sign
+			priority sign priority
+
+		The returned signs in a buffer are ordered by their line
+		number and priority.
+
+		Returns an empty list on failure or if there are no placed
+		signs.
+
+		Examples: >vim
+			" Get a List of signs placed in eval.c in the
+			" global group
+			echo sign_getplaced("eval.c")
+
+			" Get a List of signs in group 'g1' placed in eval.c
+			echo sign_getplaced("eval.c", {'group' : 'g1'})
+
+			" Get a List of signs placed at line 10 in eval.c
+			echo sign_getplaced("eval.c", {'lnum' : 10})
+
+			" Get sign with identifier 10 placed in a.py
+			echo sign_getplaced("a.py", {'id' : 10})
+
+			" Get sign with id 20 in group 'g1' placed in a.py
+			echo sign_getplaced("a.py", {'group' : 'g1',
+							\  'id' : 20})
+
+			" Get a List of all the placed signs
+			echo sign_getplaced()
+<
+
+sign_jump({id}, {group}, {buf})                                    *sign_jump()*
+		Open the buffer {buf} or jump to the window that contains
+		{buf} and position the cursor at sign {id} in group {group}.
+		This is similar to the |:sign-jump| command.
+
+		If {group} is an empty string, then the global group is used.
+		For the use of {buf}, see |bufname()|.
+
+		Returns the line number of the sign. Returns -1 if the
+		arguments are invalid.
+
+		Example: >vim
+			" Jump to sign 10 in the current buffer
+			call sign_jump(10, '', '')
+<
+
+sign_place({id}, {group}, {name}, {buf} [, {dict}])               *sign_place()*
+		Place the sign defined as {name} at line {lnum} in file or
+		buffer {buf} and assign {id} and {group} to sign.  This is
+		similar to the |:sign-place| command.
+
+		If the sign identifier {id} is zero, then a new identifier is
+		allocated.  Otherwise the specified number is used. {group} is
+		the sign group name. To use the global sign group, use an
+		empty string.  {group} functions as a namespace for {id}, thus
+		two groups can use the same IDs. Refer to |sign-identifier|
+		and |sign-group| for more information.
+
+		{name} refers to a defined sign.
+		{buf} refers to a buffer name or number. For the accepted
+		values, see |bufname()|.
 
-sign_ functions are documented here: |sign-functions-details|
+		The optional {dict} argument supports the following entries:
+			lnum		line number in the file or buffer
+					{buf} where the sign is to be placed.
+					For the accepted values, see |line()|.
+			priority	priority of the sign. See
+					|sign-priority| for more information.
 
-simplify({filename})					*simplify()*
+		If the optional {dict} is not specified, then it modifies the
+		placed sign {id} in group {group} to use the defined sign
+		{name}.
+
+		Returns the sign identifier on success and -1 on failure.
+
+		Examples: >vim
+			" Place a sign named sign1 with id 5 at line 20 in
+			" buffer json.c
+			call sign_place(5, '', 'sign1', 'json.c',
+							\ {'lnum' : 20})
+
+			" Updates sign 5 in buffer json.c to use sign2
+			call sign_place(5, '', 'sign2', 'json.c')
+
+			" Place a sign named sign3 at line 30 in
+			" buffer json.c with a new identifier
+			let id = sign_place(0, '', 'sign3', 'json.c',
+							\ {'lnum' : 30})
+
+			" Place a sign named sign4 with id 10 in group 'g3'
+			" at line 40 in buffer json.c with priority 90
+			call sign_place(10, 'g3', 'sign4', 'json.c',
+					\ {'lnum' : 40, 'priority' : 90})
+<
+
+sign_placelist({list})                                        *sign_placelist()*
+		Place one or more signs.  This is similar to the
+		|sign_place()| function.  The {list} argument specifies the
+		List of signs to place. Each list item is a dict with the
+		following sign attributes:
+		    buffer	Buffer name or number. For the accepted
+				values, see |bufname()|.
+		    group	Sign group. {group} functions as a namespace
+				for {id}, thus two groups can use the same
+				IDs. If not specified or set to an empty
+				string, then the global group is used.   See
+				|sign-group| for more information.
+		    id		Sign identifier. If not specified or zero,
+				then a new unique identifier is allocated.
+				Otherwise the specified number is used. See
+				|sign-identifier| for more information.
+		    lnum	Line number in the buffer where the sign is to
+				be placed. For the accepted values, see
+				|line()|.
+		    name	Name of the sign to place. See |sign_define()|
+				for more information.
+		    priority	Priority of the sign. When multiple signs are
+				placed on a line, the sign with the highest
+				priority is used. If not specified, the
+				default value of 10 is used. See
+				|sign-priority| for more information.
+
+		If {id} refers to an existing sign, then the existing sign is
+		modified to use the specified {name} and/or {priority}.
+
+		Returns a List of sign identifiers. If failed to place a
+		sign, the corresponding list item is set to -1.
+
+		Examples: >vim
+			" Place sign s1 with id 5 at line 20 and id 10 at line
+			" 30 in buffer a.c
+			let [n1, n2] = sign_placelist([
+				\ {'id' : 5,
+				\  'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 20},
+				\ {'id' : 10,
+				\  'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 30}
+				\ ])
+
+			" Place sign s1 in buffer a.c at line 40 and 50
+			" with auto-generated identifiers
+			let [n1, n2] = sign_placelist([
+				\ {'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 40},
+				\ {'name' : 's1',
+				\  'buffer' : 'a.c',
+				\  'lnum' : 50}
+				\ ])
+<
+
+sign_undefine([{name}])
+sign_undefine({list})                                          *sign_undefine()*
+		Deletes a previously defined sign {name}. This is similar to
+		the |:sign-undefine| command. If {name} is not supplied, then
+		deletes all the defined signs.
+
+		The one argument {list} can be used to undefine a list of
+		signs. Each list item is the name of a sign.
+
+		Returns 0 on success and -1 on failure.  For the one argument
+		{list} call, returns a list of values one for each undefined
+		sign.
+
+		Examples: >vim
+			" Delete a sign named mySign
+			call sign_undefine("mySign")
+
+			" Delete signs 'sign1' and 'sign2'
+			call sign_undefine(["sign1", "sign2"])
+
+			" Delete all the signs
+			call sign_undefine()
+<
+
+sign_unplace({group} [, {dict}])                                *sign_unplace()*
+		Remove a previously placed sign in one or more buffers.  This
+		is similar to the |:sign-unplace| command.
+
+		{group} is the sign group name. To use the global sign group,
+		use an empty string.  If {group} is set to "*", then all the
+		groups including the global group are used.
+		The signs in {group} are selected based on the entries in
+		{dict}.  The following optional entries in {dict} are
+		supported:
+			buffer	buffer name or number. See |bufname()|.
+			id	sign identifier
+		If {dict} is not supplied, then all the signs in {group} are
+		removed.
+
+		Returns 0 on success and -1 on failure.
+
+		Examples: >vim
+			" Remove sign 10 from buffer a.vim
+			call sign_unplace('', {'buffer' : "a.vim", 'id' : 10})
+
+			" Remove sign 20 in group 'g1' from buffer 3
+			call sign_unplace('g1', {'buffer' : 3, 'id' : 20})
+
+			" Remove all the signs in group 'g2' from buffer 10
+			call sign_unplace('g2', {'buffer' : 10})
+
+			" Remove sign 30 in group 'g3' from all the buffers
+			call sign_unplace('g3', {'id' : 30})
+
+			" Remove all the signs placed in buffer 5
+			call sign_unplace('*', {'buffer' : 5})
+
+			" Remove the signs in group 'g4' from all the buffers
+			call sign_unplace('g4')
+
+			" Remove sign 40 from all the buffers
+			call sign_unplace('*', {'id' : 40})
+
+			" Remove all the placed signs from all the buffers
+			call sign_unplace('*')
+
+sign_unplacelist({list})                                    *sign_unplacelist()*
+		Remove previously placed signs from one or more buffers.  This
+		is similar to the |sign_unplace()| function.
+
+		The {list} argument specifies the List of signs to remove.
+		Each list item is a dict with the following sign attributes:
+		    buffer	buffer name or number. For the accepted
+				values, see |bufname()|. If not specified,
+				then the specified sign is removed from all
+				the buffers.
+		    group	sign group name. If not specified or set to an
+				empty string, then the global sign group is
+				used. If set to "*", then all the groups
+				including the global group are used.
+		    id		sign identifier. If not specified, then all
+				the signs in the specified group are removed.
+
+		Returns a List where an entry is set to 0 if the corresponding
+		sign was successfully removed or -1 on failure.
+
+		Example: >vim
+			" Remove sign with id 10 from buffer a.vim and sign
+			" with id 20 from buffer b.vim
+			call sign_unplacelist([
+				\ {'id' : 10, 'buffer' : "a.vim"},
+				\ {'id' : 20, 'buffer' : 'b.vim'},
+				\ ])
+<
+
+simplify({filename})                                                *simplify()*
 		Simplify the file name as much as possible without changing
 		the meaning.  Shortcuts (on MS-Windows) or symbolic links (on
 		Unix) are not resolved.  If the first path component in
@@ -7528,7 +7206,7 @@ simplify({filename})					*simplify()*
 		not removed either. On Unix "//path" is unchanged, but
 		"///path" is simplified to "/path" (this follows the Posix
 		standard).
-		Example: >
+		Example: >vim
 			simplify("./dir/.././/file/") == "./file/"
 <		Note: The combination "dir/.." is only removed if "dir" is
 		a searchable directory or does not exist.  On Unix, it is also
@@ -7536,42 +7214,46 @@ simplify({filename})					*simplify()*
 		directory.  In order to resolve all the involved symbolic
 		links before simplifying the path name, use |resolve()|.
 
-		Can also be used as a |method|: >
-			GetName()->simplify()
-
-sin({expr})						*sin()*
+sin({expr})                                                              *sin()*
 		Return the sine of {expr}, measured in radians, as a |Float|.
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sin(100)
-<			-0.506366 >
-			:echo sin(-4.01)
+		Examples: >vim
+			echo sin(100)
+<			-0.506366 >vim
+			echo sin(-4.01)
 <			0.763301
 
-		Can also be used as a |method|: >
-			Compute()->sin()
-
-sinh({expr})						*sinh()*
+sinh({expr})                                                            *sinh()*
 		Return the hyperbolic sine of {expr} as a |Float| in the range
 		[-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sinh(0.5)
-<			0.521095 >
-			:echo sinh(-0.9)
+		Examples: >vim
+			echo sinh(0.5)
+<			0.521095 >vim
+			echo sinh(-0.9)
 <			-1.026517
 
-		Can also be used as a |method|: >
-			Compute()->sinh()
+slice({expr}, {start} [, {end}])                                       *slice()*
+		Similar to using a |slice| "expr[start : end]", but "end" is
+		used exclusive.  And for a string the indexes are used as
+		character indexes instead of byte indexes.
+		Also, composing characters are not counted.
+		When {end} is omitted the slice continues to the last item.
+		When {end} is -1 the last item is omitted.
+		Returns an empty value if {start} or {end} are invalid.
 
-sockconnect({mode}, {address} [, {opts}])		 *sockconnect()*
+sockconnect({mode}, {address} [, {opts}])                        *sockconnect()*
 		Connect a socket to an address. If {mode} is "pipe" then
-		{address} should be the path of a named pipe. If {mode} is
-		"tcp" then {address} should be of the form "host:port" where
-		the host should be an ip adderess or host name, and port the
-		port number.
+		{address} should be the path of a local domain socket (on
+		unix) or named pipe (on Windows). If {mode} is "tcp" then
+		{address} should be of the form "host:port" where the host
+		should be an ip address or host name, and port the port
+		number.
+
+		For "pipe" mode, see |luv-pipe-handle|. For "tcp" mode, see
+		|luv-tcp-handle|.
 
 		Returns a |channel| ID. Close the socket with |chanclose()|.
 		Use |chansend()| to send data over a bytes socket, and
@@ -7587,50 +7269,51 @@ sockconnect({mode}, {address} [, {opts}])		 *sockconnect()*
 		  - The channel ID on success (greater than zero)
 		  - 0 on invalid arguments or connection failure.
 
-sort({list} [, {func} [, {dict}]])			*sort()* *E702*
+sort({list} [, {how} [, {dict}]])                                  *sort()* *E702*
 		Sort the items in {list} in-place.  Returns {list}.
 
-		If you want a list to remain unmodified make a copy first: >
-			:let sortedlist = sort(copy(mylist))
+		If you want a list to remain unmodified make a copy first: >vim
+			let sortedlist = sort(copy(mylist))
 
-<		When {func} is omitted, is empty or zero, then sort() uses the
+<		When {how} is omitted or is a string, then sort() uses the
 		string representation of each item to sort on.  Numbers sort
 		after Strings, |Lists| after Numbers.  For sorting text in the
 		current buffer use |:sort|.
 
-		When {func} is given and it is '1' or 'i' then case is
-		ignored.
+		When {how} is given and it is 'i' then case is ignored.
+		For backwards compatibility, the value one can be used to
+		ignore case.  Zero means to not ignore case.
 
-		When {func} is given and it is 'l' then the current collation
+		When {how} is given and it is 'l' then the current collation
 		locale is used for ordering. Implementation details: strcoll()
 		is used to compare strings. See |:language| check or set the
 		collation locale. |v:collate| can also be used to check the
 		current locale. Sorting using the locale typically ignores
-		case. Example: >
+		case. Example: >vim
 			" ö is sorted similarly to o with English locale.
-			:language collate en_US.UTF8
-			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+			language collate en_US.UTF8
+			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'ö', 'p', 'z'] ~
->
+>vim
 			" ö is sorted after z with Swedish locale.
-			:language collate sv_SE.UTF8
-			:echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
+			language collate sv_SE.UTF8
+			echo sort(['n', 'o', 'O', 'ö', 'p', 'z'], 'l')
 <			['n', 'o', 'O', 'p', 'z', 'ö'] ~
 		This does not work properly on Mac.
 
-		When {func} is given and it is 'n' then all items will be
+		When {how} is given and it is 'n' then all items will be
 		sorted numerical (Implementation detail: this uses the
 		strtod() function to parse numbers, Strings, Lists, Dicts and
 		Funcrefs will be considered as being 0).
 
-		When {func} is given and it is 'N' then all items will be
+		When {how} is given and it is 'N' then all items will be
 		sorted numerical. This is like 'n' but a string containing
 		digits will be used as the number they represent.
 
-		When {func} is given and it is 'f' then all items will be
+		When {how} is given and it is 'f' then all items will be
 		sorted numerical. All values must be a Number or a Float.
 
-		When {func} is a |Funcref| or a function name, this function
+		When {how} is a |Funcref| or a function name, this function
 		is called to compare items.  The function is invoked with two
 		items as argument and must return zero if they are equal, 1 or
 		bigger if the first one sorts after the second one, -1 or
@@ -7644,26 +7327,22 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		on numbers, text strings will sort next to each other, in the
 		same order as they were originally.
 
-		Can also be used as a |method|: >
-			mylist->sort()
-
-<		Also see |uniq()|.
 
-		Example: >
+		Example: >vim
 			func MyCompare(i1, i2)
 			   return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
 			endfunc
 			eval mylist->sort("MyCompare")
 <		A shorter compare version for this specific simple case, which
-		ignores overflow: >
+		ignores overflow: >vim
 			func MyCompare(i1, i2)
 			   return a:i1 - a:i2
 			endfunc
-<		For a simple expression you can use a lambda: >
+<		For a simple expression you can use a lambda: >vim
 			eval mylist->sort({i1, i2 -> i1 - i2})
 <
-							*soundfold()*
-soundfold({word})
+
+soundfold({word})                                                  *soundfold()*
 		Return the sound-folded equivalent of {word}.  Uses the first
 		language in 'spelllang' for the current window that supports
 		soundfolding.  'spell' must be set.  When no sound folding is
@@ -7671,11 +7350,7 @@ soundfold({word})
 		This can be used for making spelling suggestions.  Note that
 		the method can be quite slow.
 
-		Can also be used as a |method|: >
-			GetWord()->soundfold()
-<
-							*spellbadword()*
-spellbadword([{sentence}])
+spellbadword([{sentence}])                                      *spellbadword()*
 		Without argument: The result is the badly spelled word under
 		or after the cursor.  The cursor is moved to the start of the
 		bad word.  When no bad word is found in the cursor line the
@@ -7692,18 +7367,14 @@ spellbadword([{sentence}])
 			"rare"		rare word
 			"local"		word only valid in another region
 			"caps"		word should start with Capital
-		Example: >
+		Example: >vim
 			echo spellbadword("the quik brown fox")
 <			['quik', 'bad'] ~
 
 		The spelling information for the current window and the value
 		of 'spelllang' are used.
 
-		Can also be used as a |method|: >
-			GetText()->spellbadword()
-<
-							*spellsuggest()*
-spellsuggest({word} [, {max} [, {capital}]])
+spellsuggest({word} [, {max} [, {capital}]])                    *spellsuggest()*
 		Return a |List| with spelling suggestions to replace {word}.
 		When {max} is given up to this number of suggestions are
 		returned.  Otherwise up to 25 suggestions are returned.
@@ -7724,10 +7395,7 @@ spellsuggest({word} [, {max} [, {capital}]])
 		The spelling information for the current window is used.  The
 		values of 'spelllang' and 'spellsuggest' are used.
 
-		Can also be used as a |method|: >
-			GetWord()->spellsuggest()
-
-split({string} [, {pattern} [, {keepempty}]])			*split()*
+split({string} [, {pattern} [, {keepempty}]])                          *split()*
 		Make a |List| out of {string}.  When {pattern} is omitted or
 		empty each white-separated sequence of characters becomes an
 		item.
@@ -7738,38 +7406,34 @@ split({string} [, {pattern} [, {keepempty}]])			*split()*
 		{keepempty} argument is given and it's non-zero.
 		Other empty items are kept when {pattern} matches at least one
 		character or when {keepempty} is non-zero.
-		Example: >
-			:let words = split(getline('.'), '\W\+')
-<		To split a string in individual characters: >
-			:for c in split(mystring, '\zs')
+		Example: >vim
+			let words = split(getline('.'), '\W\+')
+<		To split a string in individual characters: >vim
+			for c in split(mystring, '\zs') | endfor
 <		If you want to keep the separator you can also use '\zs' at
-		the end of the pattern: >
-			:echo split('abc:def:ghi', ':\zs')
-<			['abc:', 'def:', 'ghi'] ~
-		Splitting a table where the first element can be empty: >
-			:let items = split(line, ':', 1)
+		the end of the pattern: >vim
+			echo split('abc:def:ghi', ':\zs')
+<		 >
+			['abc:', 'def:', 'ghi']
+<
+		Splitting a table where the first element can be empty: >vim
+			let items = split(line, ':', 1)
 <		The opposite function is |join()|.
 
-		Can also be used as a |method|: >
-			GetString()->split()
-
-sqrt({expr})						*sqrt()*
+sqrt({expr})                                                            *sqrt()*
 		Return the non-negative square root of Float {expr} as a
 		|Float|.
 		{expr} must evaluate to a |Float| or a |Number|.  When {expr}
 		is negative the result is NaN (Not a Number).  Returns 0.0 if
 		{expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo sqrt(100)
-<			10.0 >
-			:echo sqrt(-4.01)
+		Examples: >vim
+			echo sqrt(100)
+<			10.0 >vim
+			echo sqrt(-4.01)
 <			str2float("nan")
 		NaN may be different, it depends on system libraries.
 
-		Can also be used as a |method|: >
-			Compute()->sqrt()
-
-srand([{expr}])						*srand()*
+srand([{expr}])                                                        *srand()*
 		Initialize seed used by |rand()|:
 		- If {expr} is not given, seed values are initialized by
 		  reading from /dev/urandom, if possible, or using time(NULL)
@@ -7778,15 +7442,43 @@ srand([{expr}])						*srand()*
 		  initialize the seed values.  This is useful for testing or
 		  when a predictable sequence is intended.
 
-		Examples: >
-			:let seed = srand()
-			:let seed = srand(userinput)
-			:echo rand(seed)
-<
-		Can also be used as a |method|: >
-			userinput->srand()
-
-stdioopen({opts})			 *stdioopen()*
+		Examples: >vim
+			let seed = srand()
+			let seed = srand(userinput)
+			echo rand(seed)
+<
+
+state([{what}])                                                        *state()*
+		Return a string which contains characters indicating the
+		current state.  Mostly useful in callbacks that want to do
+		work that may not always be safe.  Roughly this works like:
+		- callback uses state() to check if work is safe to do.
+		  Yes: then do it right away.
+		  No:  add to work queue and add a |SafeState| autocommand.
+		- When SafeState is triggered and executes your autocommand,
+		  check with `state()` if the work can be done now, and if yes
+		  remove it from the queue and execute.
+		  Remove the autocommand if the queue is now empty.
+		Also see |mode()|.
+
+		When {what} is given only characters in this string will be
+		added.  E.g, this checks if the screen has scrolled: >vim
+			if state('s') == ''
+			   " screen has not scrolled
+<
+		These characters indicate the state, generally indicating that
+		something is busy:
+		    m	halfway a mapping, :normal command, feedkeys() or
+			stuffed command
+		    o	operator pending, e.g. after |d|
+		    a	Insert mode autocomplete active
+		    x	executing an autocommand
+		    S	not triggering SafeState, e.g. after |f| or a count
+		    c	callback invoked, including timer (repeats for
+			recursiveness up to "ccc")
+		    s	screen has scrolled for messages
+
+stdioopen({opts})                                                  *stdioopen()*
 		With |--headless| this opens stdin and stdout as a |channel|.
 		May be called only once. See |channel-stdio|. stderr is not
 		handled by this function, see |v:stderr|.
@@ -7807,8 +7499,7 @@ stdioopen({opts})			 *stdioopen()*
 		  - |channel-id| on success (value is always 1)
 		  - 0 on invalid arguments
 
-
-stdpath({what})					*stdpath()* *E6100*
+stdpath({what})                                                *stdpath()* *E6100*
 		Returns |standard-path| locations of various default files and
 		directories.
 
@@ -7826,11 +7517,11 @@ stdpath({what})					*stdpath()* *E6100*
 		state        String  Session state directory: storage for file
 				     drafts, swap, undo, |shada|.
 
-		Example: >
-			:echo stdpath("config")
-
+		Example: >vim
+			echo stdpath("config")
+<
 
-str2float({string} [, {quoted}])				*str2float()*
+str2float({string} [, {quoted}])                                   *str2float()*
 		Convert String {string} to a Float.  This mostly works the
 		same as when using a floating point number in an expression,
 		see |floating-point-format|.  But it's a bit more permissive.
@@ -7844,30 +7535,24 @@ str2float({string} [, {quoted}])				*str2float()*
 		The decimal point is always '.', no matter what the locale is
 		set to.  A comma ends the number: "12,345.67" is converted to
 		12.0.  You can strip out thousands separators with
-		|substitute()|: >
+		|substitute()|: >vim
 			let f = str2float(substitute(text, ',', '', 'g'))
 <
 		Returns 0.0 if the conversion fails.
 
-		Can also be used as a |method|: >
-			let f = text->substitute(',', '', 'g')->str2float()
-
-str2list({string} [, {utf8}])				*str2list()*
+str2list({string} [, {utf8}])                                       *str2list()*
 		Return a list containing the number values which represent
-		each character in String {string}.  Examples: >
-			str2list(" ")		returns [32]
-			str2list("ABC")		returns [65, 66, 67]
+		each character in String {string}.  Examples: >vim
+			echo str2list(" ")		" returns [32]
+			echo str2list("ABC")		" returns [65, 66, 67]
 <		|list2str()| does the opposite.
 
 		UTF-8 encoding is always used, {utf8} option has no effect,
 		and exists only for backwards-compatibility.
-		With UTF-8 composing characters are handled properly: >
-			str2list("á")		returns [97, 769]
-
-<		Can also be used as a |method|: >
-			GetString()->str2list()
+		With UTF-8 composing characters are handled properly: >vim
+			echo str2list("á")		" returns [97, 769]
 
-str2nr({string} [, {base}])			*str2nr()*
+str2nr({string} [, {base}])                                           *str2nr()*
 		Convert string {string} to a number.
 		{base} is the conversion base, it can be 2, 8, 10 or 16.
 		When {quoted} is present and non-zero then embedded single
@@ -7875,7 +7560,7 @@ str2nr({string} [, {base}])			*str2nr()*
 
 		When {base} is omitted base 10 is used.  This also means that
 		a leading zero doesn't cause octal conversion to be used, as
-		with the default String to Number conversion.  Example: >
+		with the default String to Number conversion.  Example: >vim
 			let nr = str2nr('0123')
 <
 		When {base} is 16 a leading "0x" or "0X" is ignored.  With a
@@ -7886,11 +7571,7 @@ str2nr({string} [, {base}])			*str2nr()*
 
 		Returns 0 if {string} is empty or on error.
 
-		Can also be used as a |method|: >
-			GetText()->str2nr()
-
-
-strcharlen({string})					*strcharlen()*
+strcharlen({string})                                              *strcharlen()*
 		The result is a Number, which is the number of characters
 		in String {string}.  Composing characters are ignored.
 		|strchars()| can count the number of characters, counting
@@ -7900,26 +7581,22 @@ strcharlen({string})					*strcharlen()*
 
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >
-			GetText()->strcharlen()
-
-
-strcharpart({src}, {start} [, {len}])			*strcharpart()*
+strcharpart({src}, {start} [, {len} [, {skipcc}]])               *strcharpart()*
 		Like |strpart()| but using character index and length instead
-		of byte index and length.  Composing characters are counted
-		separately.
+		of byte index and length.
+		When {skipcc} is omitted or zero, composing characters are
+		counted separately.
+		When {skipcc} set to 1, Composing characters are ignored,
+		similar to  |slice()|.
 		When a character index is used where a character does not
-		exist it is assumed to be one character.  For example: >
-			strcharpart('abc', -1, 2)
+		exist it is omitted and counted as one character.  For
+		example: >vim
+			echo strcharpart('abc', -1, 2)
 <		results in 'a'.
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetText()->strcharpart(5)
-
-
-strchars({string} [, {skipcc}])					*strchars()*
+strchars({string} [, {skipcc}])                                     *strchars()*
 		The result is a Number, which is the number of characters
 		in String {string}.
 		When {skipcc} is omitted or zero, composing characters are
@@ -7932,7 +7609,7 @@ strchars({string} [, {skipcc}])					*strchars()*
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
 
 		{skipcc} is only available after 7.4.755.  For backward
-		compatibility, you can define a wrapper function: >
+		compatibility, you can define a wrapper function: >vim
 		    if has("patch-7.4.755")
 		      function s:strchars(str, skipcc)
 			return strchars(a:str, a:skipcc)
@@ -7947,10 +7624,8 @@ strchars({string} [, {skipcc}])					*strchars()*
 		      endfunction
 		    endif
 <
-		Can also be used as a |method|: >
-			GetText()->strchars()
 
-strdisplaywidth({string} [, {col}])			*strdisplaywidth()*
+strdisplaywidth({string} [, {col}])                          *strdisplaywidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies on the screen when it starts at {col}
 		(first column is zero).  When {col} is omitted zero is used.
@@ -7964,10 +7639,7 @@ strdisplaywidth({string} [, {col}])			*strdisplaywidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strwidth()| and |strchars()|.
 
-		Can also be used as a |method|: >
-			GetText()->strdisplaywidth()
-
-strftime({format} [, {time}])				*strftime()*
+strftime({format} [, {time}])                                       *strftime()*
 		The result is a String, which is a formatted date and time, as
 		specified by the {format} string.  The given {time} is used,
 		or the current time if no time is given.  The accepted
@@ -7976,18 +7648,15 @@ strftime({format} [, {time}])				*strftime()*
 		format.  The maximum length of the result is 80 characters.
 		See also |localtime()|, |getftime()| and |strptime()|.
 		The language can be changed with the |:language| command.
-		Examples: >
-		  :echo strftime("%c")		   Sun Apr 27 11:49:23 1997
-		  :echo strftime("%Y %b %d %X")	   1997 Apr 27 11:53:25
-		  :echo strftime("%y%m%d %T")	   970427 11:53:55
-		  :echo strftime("%H:%M")	   11:55
-		  :echo strftime("%c", getftime("file.c"))
-						   Show mod time of file.c.
-
-<		Can also be used as a |method|: >
-			GetFormat()->strftime()
-
-strgetchar({str}, {index})				*strgetchar()*
+		Examples: >vim
+		  echo strftime("%c")		   " Sun Apr 27 11:49:23 1997
+		  echo strftime("%Y %b %d %X")	   " 1997 Apr 27 11:53:25
+		  echo strftime("%y%m%d %T")	   " 970427 11:53:55
+		  echo strftime("%H:%M")		   " 11:55
+		  echo strftime("%c", getftime("file.c"))
+						   " Show mod time of file.c.
+
+strgetchar({str}, {index})                                        *strgetchar()*
 		Get a Number corresponding to the character at {index} in
 		{str}.  This uses a zero-based character index, not a byte
 		index.  Composing characters are considered separate
@@ -7996,33 +7665,27 @@ strgetchar({str}, {index})				*strgetchar()*
 		Returns -1 if {index} is invalid.
 		Also see |strcharpart()| and |strchars()|.
 
-		Can also be used as a |method|: >
-			GetText()->strgetchar(5)
-
-stridx({haystack}, {needle} [, {start}])		*stridx()*
+stridx({haystack}, {needle} [, {start}])                              *stridx()*
 		The result is a Number, which gives the byte index in
 		{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 colon1 = stridx(line, ":")
-			:let colon2 = stridx(line, ":", colon1 + 1)
+		This can be used to find a second match: >vim
+			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}.
 		See also |strridx()|.
-		Examples: >
-		  :echo stridx("An Example", "Example")	     3
-		  :echo stridx("Starting point", "Start")    0
-		  :echo stridx("Starting point", "start")   -1
+		Examples: >vim
+		  echo stridx("An Example", "Example")     " 3
+		  echo stridx("Starting point", "Start")   " 0
+		  echo stridx("Starting point", "start")   " -1
 <						*strstr()* *strchr()*
 		stridx() works similar to the C function strstr().  When used
 		with a single character it works similar to strchr().
 
-		Can also be used as a |method|: >
-			GetHaystack()->stridx(needle)
-<
-							*string()*
-string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
+string({expr})                                                        *string()*
+		Return {expr} converted to a String.  If {expr} is a Number,
 		Float, String, Blob or a composition of them, then the result
 		can be parsed back with |eval()|.
 			{expr} type	result ~
@@ -8033,7 +7696,7 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 			Funcref		`function('name')`
 			Blob		0z00112233.44556677.8899
 			List		[item, item]
-			Dictionary	{key: value, key: value}
+			Dictionary	`{key: value, key: value}`
 		Note that in String values the ' character is doubled.
 		Also see |strtrans()|.
 		Note 2: Output format is mostly compatible with YAML, except
@@ -8045,10 +7708,7 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 		method, use |msgpackdump()| or |json_encode()| if you need to
 		share data with other application.
 
-		Can also be used as a |method|: >
-			mylist->string()
-
-strlen({string})						*strlen()*
+strlen({string})                                                      *strlen()*
 		The result is a Number, which is the length of the String
 		{string} in bytes.
 		If the argument is a Number it is first converted to a String.
@@ -8057,10 +7717,7 @@ strlen({string})						*strlen()*
 		|strchars()|.
 		Also see |len()|, |strdisplaywidth()| and |strwidth()|.
 
-		Can also be used as a |method|: >
-			GetString()->strlen()
-
-strpart({src}, {start} [, {len} [, {chars}]])			*strpart()*
+strpart({src}, {start} [, {len} [, {chars}]])                        *strpart()*
 		The result is a String, which is part of {src}, starting from
 		byte {start}, with the byte length {len}.
 		When {chars} is present and TRUE then {len} is the number of
@@ -8073,22 +7730,19 @@ strpart({src}, {start} [, {len} [, {chars}]])			*strpart()*
 		When bytes are selected which do not exist, this doesn't
 		result in an error, the bytes are simply omitted.
 		If {len} is missing, the copy continues from {start} till the
-		end of the {src}. >
-			strpart("abcdefg", 3, 2)    == "de"
-			strpart("abcdefg", -2, 4)   == "ab"
-			strpart("abcdefg", 5, 4)    == "fg"
-			strpart("abcdefg", 3)	    == "defg"
+		end of the {src}. >vim
+			echo strpart("abcdefg", 3, 2)    " returns 'de'
+			echo strpart("abcdefg", -2, 4)   " returns 'ab'
+			echo strpart("abcdefg", 5, 4)    " returns 'fg'
+			echo strpart("abcdefg", 3)	 " returns 'defg'
 
 <		Note: To get the first character, {start} must be 0.  For
-		example, to get the character under the cursor: >
+		example, to get the character under the cursor: >vim
 			strpart(getline("."), col(".") - 1, 1, v:true)
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetText()->strpart(5)
-
-strptime({format}, {timestring})				*strptime()*
+strptime({format}, {timestring})                                    *strptime()*
 		The result is a Number, which is a unix timestamp representing
 		the date and time in {timestring}, which is expected to match
 		the format specified in {format}.
@@ -8104,52 +7758,63 @@ strptime({format}, {timestring})				*strptime()*
 		result.
 
 		See also |strftime()|.
-		Examples: >
-		  :echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
-<		  862156163 >
-		  :echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
-<		  Sun Apr 27 11:53:55 1997 >
-		  :echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
+		Examples: >vim
+		  echo strptime("%Y %b %d %X", "1997 Apr 27 11:49:23")
+<		  862156163 >vim
+		  echo strftime("%c", strptime("%y%m%d %T", "970427 11:53:55"))
+<		  Sun Apr 27 11:53:55 1997 >vim
+		  echo strftime("%c", strptime("%Y%m%d%H%M%S", "19970427115355") + 3600)
 <		  Sun Apr 27 12:53:55 1997
 
-		Can also be used as a |method|: >
-			GetFormat()->strptime(timestring)
-<
-strridx({haystack}, {needle} [, {start}])			*strridx()*
+strridx({haystack}, {needle} [, {start}])                            *strridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the last occurrence of the String {needle}.
 		When {start} is specified, matches beyond this index are
 		ignored.  This can be used to find a match before a previous
-		match: >
-			:let lastcomma = strridx(line, ",")
-			:let comma2 = strridx(line, ",", lastcomma - 1)
+		match: >vim
+			let lastcomma = strridx(line, ",")
+			let comma2 = strridx(line, ",", lastcomma - 1)
 <		The search is done case-sensitive.
 		For pattern searches use |match()|.
 		-1 is returned if the {needle} does not occur in {haystack}.
 		If the {needle} is empty the length of {haystack} is returned.
-		See also |stridx()|.  Examples: >
-		  :echo strridx("an angry armadillo", "an")	     3
+		See also |stridx()|.  Examples: >vim
+		  echo strridx("an angry armadillo", "an")	     3
 <							*strrchr()*
 		When used with a single character it works similar to the C
 		function strrchr().
 
-		Can also be used as a |method|: >
-			GetHaystack()->strridx(needle)
-
-strtrans({string})					*strtrans()*
+strtrans({string})                                                  *strtrans()*
 		The result is a String, which is {string} with all unprintable
 		characters translated into printable characters |'isprint'|.
-		Like they are shown in a window.  Example: >
+		Like they are shown in a window.  Example: >vim
 			echo strtrans(@a)
 <		This displays a newline in register a as "^@" instead of
 		starting a new line.
 
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetString()->strtrans()
+strutf16len({string} [, {countcc}])                              *strutf16len()*
+		The result is a Number, which is the number of UTF-16 code
+		units in String {string} (after converting it to UTF-16).
 
-strwidth({string})					*strwidth()*
+		When {countcc} is TRUE, composing characters are counted
+		separately.
+		When {countcc} is omitted or FALSE, composing characters are
+		ignored.
+
+		Returns zero on error.
+
+		Also see |strlen()| and |strcharlen()|.
+		Examples: >vim
+		    echo strutf16len('a')		" returns 1
+		    echo strutf16len('©')		" returns 1
+		    echo strutf16len('😊')		" returns 2
+		    echo strutf16len('ą́')		" returns 1
+		    echo strutf16len('ą́', v:true)	" returns 3
+<
+
+strwidth({string})                                                  *strwidth()*
 		The result is a Number, which is the number of display cells
 		String {string} occupies.  A Tab character is counted as one
 		cell, alternatively use |strdisplaywidth()|.
@@ -8158,10 +7823,7 @@ strwidth({string})					*strwidth()*
 		Returns zero on error.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 
-		Can also be used as a |method|: >
-			GetString()->strwidth()
-
-submatch({nr} [, {list}])			*submatch()* *E935*
+submatch({nr} [, {list}])                                      *submatch()* *E935*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
 		Returns the {nr}th submatch of the matched text.  When {nr}
@@ -8183,16 +7845,13 @@ submatch({nr} [, {list}])			*submatch()* *E935*
 
 		Returns an empty string or list on error.
 
-		Examples: >
-			:s/\d\+/\=submatch(0) + 1/
-			:echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
+		Examples: >vim
+			s/\d\+/\=submatch(0) + 1/
+			echo substitute(text, '\d\+', '\=submatch(0) + 1', '')
 <		This finds the first number in the line and adds one to it.
 		A line break is included as a newline character.
 
-		Can also be used as a |method|: >
-			GetNr()->submatch()
-
-substitute({string}, {pat}, {sub}, {flags})		*substitute()*
+substitute({string}, {pat}, {sub}, {flags})                       *substitute()*
 		The result is a String, which is a copy of {string}, in which
 		the first match of {pat} is replaced with {sub}.
 		When {flags} is "g", all matches of {pat} in {string} are
@@ -8214,39 +7873,47 @@ substitute({string}, {pat}, {sub}, {flags})		*substitute()*
 		When {pat} does not match in {string}, {string} is returned
 		unmodified.
 
-		Example: >
-			:let &path = substitute(&path, ",\\=[^,]*$", "", "")
-<		This removes the last component of the 'path' option. >
-			:echo substitute("testing", ".*", "\\U\\0", "")
+		Example: >vim
+			let &path = substitute(&path, ",\\=[^,]*$", "", "")
+<		This removes the last component of the 'path' option. >vim
+			echo substitute("testing", ".*", "\\U\\0", "")
 <		results in "TESTING".
 
 		When {sub} starts with "\=", the remainder is interpreted as
-		an expression. See |sub-replace-expression|.  Example: >
-			:echo substitute(s, '%\(\x\x\)',
+		an expression. See |sub-replace-expression|.  Example: >vim
+			echo substitute(s, '%\(\x\x\)',
 			   \ '\=nr2char("0x" .. submatch(1))', 'g')
 
 <		When {sub} is a Funcref that function is called, with one
-		optional argument.  Example: >
-		   :echo substitute(s, '%\(\x\x\)', SubNr, 'g')
+		optional argument.  Example: >vim
+		   echo substitute(s, '%\(\x\x\)', SubNr, 'g')
 <		The optional argument is a list which contains the whole
 		matched string and up to nine submatches, like what
-		|submatch()| returns.  Example: >
-		   :echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
+		|submatch()| returns.  Example: >vim
+		   echo substitute(s, '%\(\x\x\)', {m -> '0x' .. m[1]}, 'g')
 
 <		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetString()->substitute(pat, sub, flags)
-
-swapinfo({fname})					*swapinfo()*
+swapfilelist()                                                  *swapfilelist()*
+		Returns a list of swap file names, like what "vim -r" shows.
+		See the |-r| command argument.  The 'directory' option is used
+		for the directories to inspect.  If you only want to get a
+		list of swap files in the current directory then temporarily
+		set 'directory' to a dot: >vim
+			let save_dir = &directory
+			let &directory = '.'
+			let swapfiles = swapfilelist()
+			let &directory = save_dir
+
+swapinfo({fname})                                                   *swapinfo()*
 		The result is a dictionary, which holds information about the
 		swapfile {fname}. The available fields are:
 			version Vim version
 			user	user name
 			host	host name
 			fname	original file name
-			pid	PID of the Vim process that created the swap
-				file
+			pid	PID of the Nvim process that created the swap
+				file, or zero if not running.
 			mtime	last modification time in seconds
 			inode	Optional: INODE number of the file
 			dirty	1 if file was modified, 0 if not
@@ -8256,20 +7923,14 @@ swapinfo({fname})					*swapinfo()*
 			Not a swap file: does not contain correct block ID
 			Magic number mismatch: Info in first block is invalid
 
-		Can also be used as a |method|: >
-			GetFilename()->swapinfo()
-
-swapname({buf})						*swapname()*
+swapname({buf})                                                     *swapname()*
 		The result is the swap file path of the buffer {buf}.
 		For the use of {buf}, see |bufname()| above.
 		If buffer {buf} is the current buffer, the result is equal to
 		|:swapname| (unless there is no swap file).
 		If buffer {buf} has no swap file, returns an empty string.
 
-		Can also be used as a |method|: >
-			GetBufname()->swapname()
-
-synID({lnum}, {col}, {trans})				*synID()*
+synID({lnum}, {col}, {trans})                                          *synID()*
 		The result is a Number, which is the syntax ID at the position
 		{lnum} and {col} in the current window.
 		The syntax ID can be used with |synIDattr()| and
@@ -8291,11 +7952,11 @@ synID({lnum}, {col}, {trans})				*synID()*
 
 		Returns zero on error.
 
-		Example (echoes the name of the syntax item under the cursor): >
-			:echo synIDattr(synID(line("."), col("."), 1), "name")
+		Example (echoes the name of the syntax item under the cursor): >vim
+			echo synIDattr(synID(line("."), col("."), 1), "name")
 <
 
-synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
+synIDattr({synID}, {what} [, {mode}])                              *synIDattr()*
 		The result is a String, which is the {what} attribute of
 		syntax ID {synID}.  This can be used to obtain information
 		about a syntax item.
@@ -8334,13 +7995,14 @@ synIDattr({synID}, {what} [, {mode}])			*synIDattr()*
 		Returns an empty string on error.
 
 		Example (echoes the color of the syntax item under the
-		cursor): >
-	:echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+		cursor): >vim
+			echo synIDattr(synIDtrans(synID(line("."), col("."), 1)), "fg")
+<
+		Can also be used as a |method|: >vim
+			echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 <
-		Can also be used as a |method|: >
-	:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
 
-synIDtrans({synID})					*synIDtrans()*
+synIDtrans({synID})                                               *synIDtrans()*
 		The result is a Number, which is the translated syntax ID of
 		{synID}.  This is the syntax group ID of what is being used to
 		highlight the character.  Highlight links given with
@@ -8348,10 +8010,7 @@ synIDtrans({synID})					*synIDtrans()*
 
 		Returns zero on error.
 
-		Can also be used as a |method|: >
-	:echo synID(line("."), col("."), 1)->synIDtrans()->synIDattr("fg")
-
-synconcealed({lnum}, {col})				*synconcealed()*
+synconcealed({lnum}, {col})                                     *synconcealed()*
 		The result is a |List| with currently three items:
 		1. The first item in the list is 0 if the character at the
 		   position {lnum} and {col} is not part of a concealable
@@ -8376,8 +8035,7 @@ synconcealed({lnum}, {col})				*synconcealed()*
 			synconcealed(lnum, 5)   [1, 'X', 2]
 			synconcealed(lnum, 6)   [0, '', 0]
 
-
-synstack({lnum}, {col})					*synstack()*
+synstack({lnum}, {col})                                             *synstack()*
 		Return a |List|, which is the stack of syntax items at the
 		position {lnum} and {col} in the current window.  {lnum} is
 		used like with |getline()|.  Each item in the List is an ID
@@ -8387,7 +8045,7 @@ synstack({lnum}, {col})					*synstack()*
 		returns, unless not the whole item is highlighted or it is a
 		transparent item.
 		This function is useful for debugging a syntax file.
-		Example that shows the syntax stack under the cursor: >
+		Example that shows the syntax stack under the cursor: >vim
 			for id in synstack(line("."), col("."))
 			   echo synIDattr(id, "name")
 			endfor
@@ -8396,13 +8054,15 @@ synstack({lnum}, {col})					*synstack()*
 		character in a line and the first column in an empty line are
 		valid positions.
 
-system({cmd} [, {input}])				*system()* *E677*
+system({cmd} [, {input}])                                        *system()* *E677*
+		Note: Prefer |vim.system()| in Lua.
+
 		Gets the output of {cmd} as a |string| (|systemlist()| returns
 		a |List|) and sets |v:shell_error| to the error code.
 		{cmd} is treated as in |jobstart()|:
 		If {cmd} is a List it runs directly (no 'shell').
-		If {cmd} is a String it runs in the 'shell', like this: >
-		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+		If {cmd} is a String it runs in the 'shell', like this: >vim
+		  call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
 
 <		Not to be used for interactive commands.
 
@@ -8410,8 +8070,8 @@ system({cmd} [, {input}])				*system()* *E677*
 		- <CR><NL> is replaced with <NL>
 		- NUL characters are replaced with SOH (0x01)
 
-		Example: >
-		    :echo system(['ls', expand('%:h')])
+		Example: >vim
+		    echo system(['ls', expand('%:h')])
 
 <		If {input} is a string it is written to a pipe and passed as
 		stdin to the command.  The string is written as-is, line
@@ -8425,8 +8085,8 @@ system({cmd} [, {input}])				*system()* *E677*
 		terminated by NL (and NUL where the text has NL).
 								*E5677*
 		Note: system() cannot write to or read from backgrounded ("&")
-		shell commands, e.g.: >
-		    :echo system("cat - &", "foo")
+		shell commands, e.g.: >vim
+		    echo system("cat - &", "foo")
 <		which is equivalent to: >
 		    $ echo foo | bash -c 'cat - &'
 <		The pipes are disconnected (unless overridden by shell
@@ -8436,17 +8096,14 @@ system({cmd} [, {input}])				*system()* *E677*
 		Note: Use |shellescape()| or |::S| with |expand()| or
 		|fnamemodify()| to escape special characters in a command
 		argument. 'shellquote' and 'shellxquote' must be properly
-		configured. Example: >
-		    :echo system('ls '..shellescape(expand('%:h')))
-		    :echo system('ls '..expand('%:h:S'))
+		configured. Example: >vim
+		    echo system('ls '..shellescape(expand('%:h')))
+		    echo system('ls '..expand('%:h:S'))
 
 <		Unlike ":!cmd" there is no automatic check for changed files.
 		Use |:checktime| to force a check.
 
-		Can also be used as a |method|: >
-			:echo GetCmd()->system()
-
-systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
+systemlist({cmd} [, {input} [, {keepempty}]])                     *systemlist()*
 		Same as |system()|, but returns a |List| with lines (parts of
 		output separated by NL) with NULs transformed into NLs. Output
 		is the same as |readfile()| will output with {binary} argument
@@ -8455,31 +8112,25 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		Note that on MS-Windows you may get trailing CR characters.
 
 		To see the difference between "echo hello" and "echo -n hello"
-		use |system()| and |split()|: >
+		use |system()| and |split()|: >vim
 			echo split(system('echo hello'), '\n', 1)
 <
 		Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			:echo GetCmd()->systemlist()
-
-tabpagebuflist([{arg}])					*tabpagebuflist()*
+tabpagebuflist([{arg}])                                       *tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
 		{arg} specifies the number of the tab page to be used. When
 		omitted the current tab page is used.
 		When {arg} is invalid the number zero is returned.
-		To get a list of all buffers in all tabs use this: >
+		To get a list of all buffers in all tabs use this: >vim
 			let buflist = []
 			for i in range(tabpagenr('$'))
 			   call extend(buflist, tabpagebuflist(i + 1))
 			endfor
 <		Note that a buffer may appear in more than one window.
 
-		Can also be used as a |method|: >
-			GetTabpage()->tabpagebuflist()
-
-tabpagenr([{arg}])					*tabpagenr()*
+tabpagenr([{arg}])                                                 *tabpagenr()*
 		The result is a Number, which is the number of the current
 		tab page.  The first tab page has number 1.
 
@@ -8493,7 +8144,7 @@ tabpagenr([{arg}])					*tabpagenr()*
 
 		Returns zero on error.
 
-tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
+tabpagewinnr({tabarg} [, {arg}])                                *tabpagewinnr()*
 		Like |winnr()| but for tab page {tabarg}.
 		{tabarg} specifies the number of tab page to be used.
 		{arg} is used like with |winnr()|:
@@ -8501,20 +8152,16 @@ tabpagewinnr({tabarg} [, {arg}])			*tabpagewinnr()*
 		  the window which will be used when going to this tab page.
 		- When "$" the number of windows is returned.
 		- When "#" the previous window nr is returned.
-		Useful examples: >
+		Useful examples: >vim
 		    tabpagewinnr(1)	    " current window of tab page 1
 		    tabpagewinnr(4, '$')    " number of windows in tab page 4
 <		When {tabarg} is invalid zero is returned.
 
-		Can also be used as a |method|: >
-			GetTabpage()->tabpagewinnr()
-<
-							*tagfiles()*
-tagfiles()	Returns a |List| with the file names used to search for tags
+tagfiles()                                                          *tagfiles()*
+		Returns a |List| with the file names used to search for tags
 		for the current buffer.  This is the 'tags' option expanded.
 
-
-taglist({expr} [, {filename}])				*taglist()*
+taglist({expr} [, {filename}])                                       *taglist()*
 		Returns a |List| of tags matching the regular expression {expr}.
 
 		If {filename} is passed it is used to prioritize the results
@@ -8557,60 +8204,59 @@ taglist({expr} [, {filename}])				*taglist()*
 		located by Vim. Refer to |tags-file-format| for the format of
 		the tags file generated by the different ctags tools.
 
-		Can also be used as a |method|: >
-			GetTagpattern()->taglist()
-
-tempname()					*tempname()* *temp-file-name*
-		The result is a String, which is the name of a file that
-		doesn't exist.  It can be used for a temporary file.  Example: >
-			:let tmpfile = tempname()
-			:exe "redir > " .. tmpfile
-<		For Unix, the file will be in a private directory |tempfile|.
-		For MS-Windows forward slashes are used when the 'shellslash'
-		option is set or when 'shellcmdflag' starts with '-'.
-
-termopen({cmd} [, {opts}])			*termopen()*
-		Spawns {cmd} in a new pseudo-terminal session connected
-		to the current (unmodified) buffer. Parameters and behavior
-		are the same as |jobstart()| except "pty", "width", "height",
-		and "TERM" are ignored: "height" and "width" are taken from
-		the current window.
-		Returns the same values as |jobstart()|.
-
-		Terminal environment is initialized as in ||jobstart-env|,
-		except $TERM is set to "xterm-256color". Full behavior is
-		described in |terminal|.
-
-tan({expr})						*tan()*
+tan({expr})                                                              *tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
 		in the range [-inf, inf].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo tan(10)
-<			0.648361 >
-			:echo tan(-4.01)
+		Examples: >vim
+			echo tan(10)
+<			0.648361 >vim
+			echo tan(-4.01)
 <			-1.181502
 
-		Can also be used as a |method|: >
-			Compute()->tan()
-
-tanh({expr})						*tanh()*
+tanh({expr})                                                            *tanh()*
 		Return the hyperbolic tangent of {expr} as a |Float| in the
 		range [-1, 1].
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
-			:echo tanh(0.5)
-<			0.462117 >
-			:echo tanh(-1)
+		Examples: >vim
+			echo tanh(0.5)
+<			0.462117 >vim
+			echo tanh(-1)
 <			-0.761594
 
-		Can also be used as a |method|: >
-			Compute()->tanh()
+tempname()                                                          *tempname()*
+		Generates a (non-existent) filename located in the Nvim root
+		|tempdir|. Scripts can use the filename as a temporary file.
+		Example: >vim
+			let tmpfile = tempname()
+			exe "redir > " .. tmpfile
 <
-							*timer_info()*
-timer_info([{id}])
+
+termopen({cmd} [, {opts}])                                          *termopen()*
+		Spawns {cmd} in a new pseudo-terminal session connected
+		to the current (unmodified) buffer. Parameters and behavior
+		are the same as |jobstart()| except "pty", "width", "height",
+		and "TERM" are ignored: "height" and "width" are taken from
+		the current window. Note that termopen() implies a "pty" arg
+		to jobstart(), and thus has the implications documented at
+		|jobstart()|.
+
+		Returns the same values as jobstart().
+
+		Terminal environment is initialized as in |jobstart-env|,
+		except $TERM is set to "xterm-256color". Full behavior is
+		described in |terminal|.
+
+test_garbagecollect_now()                            *test_garbagecollect_now()*
+		Like |garbagecollect()|, but executed right away.  This must
+		only be called directly to avoid any structure to exist
+		internally, and |v:testing| must have been set before calling
+		any function.
+
+
+timer_info([{id}])                                                *timer_info()*
 		Return a list with information about timers.
 		When {id} is given only information about this timer is
 		returned.  When timer {id} does not exist an empty list is
@@ -8625,10 +8271,7 @@ timer_info([{id}])
 				    -1 means forever
 		    "callback"	    the callback
 
-		Can also be used as a |method|: >
-			GetTimer()->timer_info()
-<
-timer_pause({timer}, {paused})				*timer_pause()*
+timer_pause({timer}, {paused})                                   *timer_pause()*
 		Pause or unpause a timer.  A paused timer does not invoke its
 		callback when its time expires.  Unpausing a timer may cause
 		the callback to be invoked almost immediately if enough time
@@ -8641,16 +8284,14 @@ timer_pause({timer}, {paused})				*timer_pause()*
 		String, then the timer is paused, otherwise it is unpaused.
 		See |non-zero-arg|.
 
-		Can also be used as a |method|: >
-			GetTimer()->timer_pause(1)
-<
-						*timer_start()* *timer* *timers*
-timer_start({time}, {callback} [, {options}])
+timer_start({time}, {callback} [, {options}])              *timer_start()* *timer*
 		Create a timer and return the timer ID.
 
 		{time} is the waiting time in milliseconds. This is the
 		minimum time before invoking the callback.  When the system is
 		busy or Vim is not waiting for input the time will be longer.
+		Zero can be used to execute the callback when Vim is back in
+		the main loop.
 
 		{callback} is the function to call.  It can be the name of a
 		function or a |Funcref|.  It is called with one argument, which
@@ -8665,7 +8306,7 @@ timer_start({time}, {callback} [, {options}])
 
 		Returns -1 on error.
 
-		Example: >
+		Example: >vim
 			func MyHandler(timer)
 			  echo 'Handler called'
 			endfunc
@@ -8673,41 +8314,27 @@ timer_start({time}, {callback} [, {options}])
 				\ {'repeat': 3})
 <		This invokes MyHandler() three times at 500 msec intervals.
 
-		Can also be used as a |method|: >
-			GetMsec()->timer_start(callback)
-
-<		Not available in the |sandbox|.
-
-timer_stop({timer})					*timer_stop()*
+timer_stop({timer})                                               *timer_stop()*
 		Stop a timer.  The timer callback will no longer be invoked.
 		{timer} is an ID returned by timer_start(), thus it must be a
 		Number.  If {timer} does not exist there is no error.
 
-		Can also be used as a |method|: >
-			GetTimer()->timer_stop()
-<
-timer_stopall()						*timer_stopall()*
+timer_stopall()                                                *timer_stopall()*
 		Stop all timers.  The timer callbacks will no longer be
 		invoked.  Useful if some timers is misbehaving.  If there are
 		no timers there is no error.
 
-tolower({expr})						*tolower()*
+tolower({expr})                                                      *tolower()*
 		The result is a copy of the String given, with all uppercase
 		characters turned into lowercase (just like applying |gu| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetText()->tolower()
-
-toupper({expr})						*toupper()*
+toupper({expr})                                                      *toupper()*
 		The result is a copy of the String given, with all lowercase
 		characters turned into uppercase (just like applying |gU| to
 		the string).  Returns an empty string on error.
 
-		Can also be used as a |method|: >
-			GetText()->toupper()
-
-tr({src}, {fromstr}, {tostr})				*tr()*
+tr({src}, {fromstr}, {tostr})                                             *tr()*
 		The result is a copy of the {src} string with all characters
 		which appear in {fromstr} replaced by the character in that
 		position in the {tostr} string.  Thus the first character in
@@ -8717,90 +8344,81 @@ tr({src}, {fromstr}, {tostr})				*tr()*
 
 		Returns an empty string on error.
 
-		Examples: >
+		Examples: >vim
 			echo tr("hello there", "ht", "HT")
-<		returns "Hello THere" >
+<		returns "Hello THere" >vim
 			echo tr("<blob>", "<>", "{}")
 <		returns "{blob}"
 
-		Can also be used as a |method|: >
-			GetText()->tr(from, to)
-
-trim({text} [, {mask} [, {dir}]])				*trim()*
+trim({text} [, {mask} [, {dir}]])                                       *trim()*
 		Return {text} as a String where any character in {mask} is
 		removed from the beginning and/or end of {text}.
-		If {mask} is not given, {mask} is all characters up to 0x20,
-		which includes Tab, space, NL and CR, plus the non-breaking
-		space character 0xa0.
+
+		If {mask} is not given, or is an empty string, {mask} is all
+		characters up to 0x20, which includes Tab, space, NL and CR,
+		plus the non-breaking space character 0xa0.
+
 		The optional {dir} argument specifies where to remove the
 		characters:
 			0	remove from the beginning and end of {text}
 			1	remove only at the beginning of {text}
 			2	remove only at the end of {text}
 		When omitted both ends are trimmed.
+
 		This function deals with multibyte characters properly.
 		Returns an empty string on error.
 
-		Examples: >
+		Examples: >vim
 			echo trim("   some text ")
-<		returns "some text" >
+<		returns "some text" >vim
 			echo trim("  \r\t\t\r RESERVE \t\n\x0B\xA0") .. "_TAIL"
-<		returns "RESERVE_TAIL" >
+<		returns "RESERVE_TAIL" >vim
 			echo trim("rm<Xrm<>X>rrm", "rm<>")
-<		returns "Xrm<>X" (characters in the middle are not removed) >
+<		returns "Xrm<>X" (characters in the middle are not removed) >vim
 			echo trim("  vim  ", " ", 2)
 <		returns "  vim"
 
-		Can also be used as a |method|: >
-			GetText()->trim()
-
-trunc({expr})							*trunc()*
+trunc({expr})                                                          *trunc()*
 		Return the largest integral value with magnitude less than or
 		equal to {expr} as a |Float| (truncate towards zero).
 		{expr} must evaluate to a |Float| or a |Number|.
 		Returns 0.0 if {expr} is not a |Float| or a |Number|.
-		Examples: >
+		Examples: >vim
 			echo trunc(1.456)
-<			1.0  >
+<			1.0  >vim
 			echo trunc(-5.456)
-<			-5.0  >
+<			-5.0  >vim
 			echo trunc(4.0)
 <			4.0
 
-		Can also be used as a |method|: >
-			Compute()->trunc()
-
-type({expr})							*type()*
+type({expr})                                                            *type()*
 		The result is a Number representing the type of {expr}.
 		Instead of using the number directly, it is better to use the
 		v:t_ variable that has the value:
-		        Number:     0 (|v:t_number|)
-			String:     1 (|v:t_string|)
-			Funcref:    2 (|v:t_func|)
-			List:       3 (|v:t_list|)
-			Dictionary: 4 (|v:t_dict|)
-			Float:      5 (|v:t_float|)
-			Boolean:    6 (|v:true| and |v:false|)
-			Null:       7 (|v:null|)
-			Blob:      10 (|v:t_blob|)
-		For backward compatibility, this method can be used: >
-			:if type(myvar) == type(0)
-			:if type(myvar) == type("")
-			:if type(myvar) == type(function("tr"))
-			:if type(myvar) == type([])
-			:if type(myvar) == type({})
-			:if type(myvar) == type(0.0)
-			:if type(myvar) == type(v:true)
+			Number:	    0  |v:t_number|
+			String:	    1  |v:t_string|
+			Funcref:    2  |v:t_func|
+			List:	    3  |v:t_list|
+			Dictionary: 4  |v:t_dict|
+			Float:	    5  |v:t_float|
+			Boolean:    6  |v:t_bool| (|v:false| and |v:true|)
+			Null:	    7  (|v:null|)
+			Blob:	   10  |v:t_blob|
+		For backward compatibility, this method can be used: >vim
+			if type(myvar) == type(0) | endif
+			if type(myvar) == type("") | endif
+			if type(myvar) == type(function("tr")) | endif
+			if type(myvar) == type([]) | endif
+			if type(myvar) == type({}) | endif
+			if type(myvar) == type(0.0) | endif
+			if type(myvar) == type(v:true) | endif
 <		In place of checking for |v:null| type it is better to check
-		for |v:null| directly as it is the only value of this type: >
-			:if myvar is v:null
-<               To check if the v:t_ variables exist use this: >
-                        :if exists('v:t_number')
+		for |v:null| directly as it is the only value of this type: >vim
+			if myvar is v:null | endif
+<		To check if the v:t_ variables exist use this: >vim
+			if exists('v:t_number') | endif
 
-<		Can also be used as a |method|: >
-			mylist->type()
-
-undofile({name})					*undofile()*
+undofile({name})                                                    *undofile()*
 		Return the name of the undo file that would be used for a file
 		with name {name} when writing.  This uses the 'undodir'
 		option, finding directories that exist.  It does not check if
@@ -8811,12 +8429,10 @@ undofile({name})					*undofile()*
 		buffer without a file name will not write an undo file.
 		Useful in combination with |:wundo| and |:rundo|.
 
-		Can also be used as a |method|: >
-			GetFilename()->undofile()
-
-undotree()						*undotree()*
-		Return the current state of the undo tree in a dictionary with
-		the following items:
+undotree([{buf}])                                                   *undotree()*
+		Return the current state of the undo tree for the current
+		buffer, or for a specific buffer if {buf} is given.  The
+		result is a dictionary with the following items:
 		  "seq_last"	The highest undo sequence number used.
 		  "seq_cur"	The sequence number of the current position in
 				the undo tree.  This differs from "seq_last"
@@ -8857,28 +8473,50 @@ undotree()						*undotree()*
 				blocks.  Each item may again have an "alt"
 				item.
 
-uniq({list} [, {func} [, {dict}]])			*uniq()* *E882*
+uniq({list} [, {func} [, {dict}]])                                 *uniq()* *E882*
 		Remove second and succeeding copies of repeated adjacent
 		{list} items in-place.  Returns {list}.  If you want a list
-		to remain unmodified make a copy first: >
-			:let newlist = uniq(copy(mylist))
+		to remain unmodified make a copy first: >vim
+			let newlist = uniq(copy(mylist))
 <		The default compare function uses the string representation of
 		each item.  For the use of {func} and {dict} see |sort()|.
 
 		Returns zero if {list} is not a |List|.
 
-		Can also be used as a |method|: >
-			mylist->uniq()
+utf16idx({string}, {idx} [, {countcc} [, {charidx}]])               *utf16idx()*
+		Same as |charidx()| but returns the UTF-16 code unit index of
+		the byte at {idx} in {string} (after converting it to UTF-16).
+
+		When {charidx} is present and TRUE, {idx} is used as the
+		character index in the String {string} instead of as the byte
+		index.
+		An {idx} in the middle of a UTF-8 sequence is rounded
+		downwards to the beginning of that sequence.
 
-values({dict})						*values()*
+		Returns -1 if the arguments are invalid or if there are less
+		than {idx} bytes in {string}. If there are exactly {idx} bytes
+		the length of the string in UTF-16 code units is returned.
+
+		See |byteidx()| and |byteidxcomp()| for getting the byte index
+		from the UTF-16 index and |charidx()| for getting the
+		character index from the UTF-16 index.
+		Refer to |string-offset-encoding| for more information.
+		Examples: >vim
+			echo utf16idx('a😊😊', 3)	" returns 2
+			echo utf16idx('a😊😊', 7)	" returns 4
+			echo utf16idx('a😊😊', 1, 0, 1)	" returns 2
+			echo utf16idx('a😊😊', 2, 0, 1)	" returns 4
+			echo utf16idx('aą́c', 6)		" returns 2
+			echo utf16idx('aą́c', 6, 1)	" returns 4
+			echo utf16idx('a😊😊', 9)	" returns -1
+<
+
+values({dict})                                                        *values()*
 		Return a |List| with all the values of {dict}.  The |List| is
 		in arbitrary order.  Also see |items()| and |keys()|.
 		Returns zero if {dict} is not a |Dict|.
 
-		Can also be used as a |method|: >
-			mydict->values()
-
-virtcol({expr})						*virtcol()*
+virtcol({expr} [, {list} [, {winid}]])                               *virtcol()*
 		The result is a Number, which is the screen column of the file
 		position given with {expr}.  That is, the last screen position
 		occupied by the character at that position, when the screen
@@ -8887,13 +8525,17 @@ virtcol({expr})						*virtcol()*
 		the <Tab>.  For example, for a <Tab> in column 1, with 'ts'
 		set to 8, it returns 8. |conceal| is ignored.
 		For the byte position use |col()|.
+
 		For the use of {expr} see |col()|.
-		When 'virtualedit' is used {expr} can be [lnum, col, off], where
-		"off" is the offset in screen columns from the start of the
-		character.  E.g., a position within a <Tab> or after the last
-		character.  When "off" is omitted zero is used.
-		When Virtual editing is active in the current mode, a position
-		beyond the end of the line can be returned. |'virtualedit'|
+
+		When 'virtualedit' is used {expr} can be [lnum, col, off],
+		where "off" is the offset in screen columns from the start of
+		the character.  E.g., a position within a <Tab> or after the
+		last character.  When "off" is omitted zero is used.  When
+		Virtual editing is active in the current mode, a position
+		beyond the end of the line can be returned.  Also see
+		|'virtualedit'|
+
 		The accepted positions are:
 		    .	    the cursor position
 		    $	    the end of the cursor line (the result is the
@@ -8905,28 +8547,44 @@ virtcol({expr})						*virtcol()*
 			    cursor is the end).  When not in Visual mode
 			    returns the cursor position.  Differs from |'<| in
 			    that it's updated right away.
+
+		If {list} is present and non-zero then virtcol() returns a
+		List with the first and last screen position occupied by the
+		character.
+
+		With the optional {winid} argument the values are obtained for
+		that window instead of the current window.
+
 		Note that only marks in the current file can be used.
-		Examples: >
-  virtcol(".")	   with text "foo^Lbar", with cursor on the "^L", returns 5
-  virtcol("$")	   with text "foo^Lbar", returns 9
-  virtcol("'t")    with text "	  there", with 't at 'h', returns 6
-<		The first column is 1.  0 is returned for an error.
+		Examples: >vim
+			" With text "foo^Lbar" and cursor on the "^L":
+
+			echo virtcol(".")	" returns 5
+			echo virtcol(".", 1)	" returns [4, 5]
+			echo virtcol("$")	" returns 9
+
+			" With text "	  there", with 't at 'h':
+
+			echo virtcol("'t")	" returns 6
+<		The first column is 1.  0 or [0, 0] is returned for an error.
 		A more advanced example that echoes the maximum length of
-		all lines: >
+		all lines: >vim
 		    echo max(map(range(1, line('$')), "virtcol([v:val, '$'])"))
 
-<		Can also be used as a |method|: >
-			GetPos()->virtcol()
-
-virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
+virtcol2col({winid}, {lnum}, {col})                              *virtcol2col()*
 		The result is a Number, which is the byte index of the
 		character in window {winid} at buffer line {lnum} and virtual
 		column {col}.
 
+		If buffer line {lnum} is an empty line, 0 is returned.
+
 		If {col} is greater than the last virtual column in line
 		{lnum}, then the byte index of the character at the last
 		virtual column is returned.
 
+		For a multi-byte character, the column number of the first
+		byte in the character is returned.
+
 		The {winid} argument can be the window number or the
 		|window-ID|. If this is zero, then the current window is used.
 
@@ -8935,18 +8593,15 @@ virtcol2col({winid}, {lnum}, {col})			*virtcol2col()*
 
 		See also |screenpos()|, |virtcol()| and |col()|.
 
-		Can also be used as a |method|: >
-			GetWinid()->virtcol2col(lnum, col)
-
-visualmode([{expr}])						*visualmode()*
+visualmode([{expr}])                                              *visualmode()*
 		The result is a String, which describes the last Visual mode
 		used in the current buffer.  Initially it returns an empty
 		string, but once Visual mode has been used, it returns "v",
 		"V", or "<CTRL-V>" (a single CTRL-V character) for
 		character-wise, line-wise, or block-wise Visual mode
 		respectively.
-		Example: >
-			:exe "normal " .. visualmode()
+		Example: >vim
+			exe "normal " .. visualmode()
 <		This enters the same Visual mode as before.  It is also useful
 		in scripts if you wish to act differently depending on the
 		Visual mode that was used.
@@ -8956,7 +8611,7 @@ visualmode([{expr}])						*visualmode()*
 		a non-empty String, then the Visual mode will be cleared and
 		the old value is returned.  See |non-zero-arg|.
 
-wait({timeout}, {condition} [, {interval}])			*wait()*
+wait({timeout}, {condition} [, {interval}])                             *wait()*
 		Waits until {condition} evaluates to |TRUE|, where {condition}
 		is a |Funcref| or |string| containing an expression.
 
@@ -8972,24 +8627,24 @@ wait({timeout}, {condition} [, {interval}])			*wait()*
 			-2 if the function was interrupted (by |CTRL-C|)
 			-3 if an error occurred
 
-wildmenumode()					*wildmenumode()*
+wildmenumode()                                                  *wildmenumode()*
 		Returns |TRUE| when the wildmenu is active and |FALSE|
 		otherwise.  See 'wildmenu' and 'wildmode'.
 		This can be used in mappings to handle the 'wildcharm' option
 		gracefully. (Makes only sense with |mapmode-c| mappings).
 
-		For example to make <c-j> work like <down> in wildmode, use: >
-    :cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
+		For example to make <c-j> work like <down> in wildmode, use: >vim
+		    cnoremap <expr> <C-j> wildmenumode() ? "\<Down>\<Tab>" : "\<c-j>"
 <
 		(Note, this needs the 'wildcharm' option set appropriately).
 
-win_execute({id}, {command} [, {silent}])		*win_execute()*
+win_execute({id}, {command} [, {silent}])                        *win_execute()*
 		Like `execute()` but in the context of window {id}.
 		The window will temporarily be made the current window,
 		without triggering autocommands or changing directory.  When
 		executing {command} autocommands will be triggered, this may
-		have unexpected side effects.  Use |:noautocmd| if needed.
-		Example: >
+		have unexpected side effects.  Use `:noautocmd` if needed.
+		Example: >vim
 			call win_execute(winid, 'syntax enable')
 <		Doing the same with `setwinvar()` would not trigger
 		autocommands and not actually show syntax highlighting.
@@ -8997,18 +8652,11 @@ win_execute({id}, {command} [, {silent}])		*win_execute()*
 		When window {id} does not exist then no error is given and
 		an empty string is returned.
 
-		Can also be used as a |method|, the base is passed as the
-		second argument: >
-			GetCommand()->win_execute(winid)
-
-win_findbuf({bufnr})					*win_findbuf()*
+win_findbuf({bufnr})                                             *win_findbuf()*
 		Returns a |List| with |window-ID|s for windows that contain
 		buffer {bufnr}.  When there is none the list is empty.
 
-		Can also be used as a |method|: >
-			GetBufnr()->win_findbuf()
-
-win_getid([{win} [, {tab}]])				*win_getid()*
+win_getid([{win} [, {tab}]])                                       *win_getid()*
 		Get the |window-ID| for the specified window.
 		When {win} is missing use the current window.
 		With {win} this is the window number.  The top window has
@@ -9017,10 +8665,7 @@ win_getid([{win} [, {tab}]])				*win_getid()*
 		number {tab}.  The first tab has number one.
 		Return zero if the window cannot be found.
 
-		Can also be used as a |method|: >
-			GetWinnr()->win_getid()
-
-win_gettype([{nr}])					*win_gettype()*
+win_gettype([{nr}])                                              *win_gettype()*
 		Return the type of the window:
 			"autocmd"	autocommand window. Temporary window
 					used to execute autocommands.
@@ -9038,33 +8683,21 @@ win_gettype([{nr}])					*win_gettype()*
 
 		Also see the 'buftype' option.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_gettype()
-<
-win_gotoid({expr})					*win_gotoid()*
+win_gotoid({expr})                                                *win_gotoid()*
 		Go to window with ID {expr}.  This may also change the current
 		tabpage.
 		Return TRUE if successful, FALSE if the window cannot be found.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_gotoid()
-
-win_id2tabwin({expr})					*win_id2tabwin()*
+win_id2tabwin({expr})                                          *win_id2tabwin()*
 		Return a list with the tab number and window number of window
 		with ID {expr}: [tabnr, winnr].
 		Return [0, 0] if the window cannot be found.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_id2tabwin()
-
-win_id2win({expr})					*win_id2win()*
+win_id2win({expr})                                                *win_id2win()*
 		Return the window number of window with ID {expr}.
 		Return 0 if the window cannot be found in the current tabpage.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_id2win()
-
-win_move_separator({nr}, {offset})			*win_move_separator()*
+win_move_separator({nr}, {offset})                        *win_move_separator()*
 		Move window {nr}'s vertical separator (i.e., the right border)
 		by {offset} columns, as if being dragged by the mouse. {nr}
 		can be a window number or |window-ID|. A positive {offset}
@@ -9079,10 +8712,7 @@ win_move_separator({nr}, {offset})			*win_move_separator()*
 		window, since it has no separator on the right.
 		Only works for the current tab page. *E1308*
 
-		Can also be used as a |method|: >
-			GetWinnr()->win_move_separator(offset)
-
-win_move_statusline({nr}, {offset})			*win_move_statusline()*
+win_move_statusline({nr}, {offset})                      *win_move_statusline()*
 		Move window {nr}'s status line (i.e., the bottom border) by
 		{offset} rows, as if being dragged by the mouse. {nr} can be a
 		window number or |window-ID|. A positive {offset} moves down
@@ -9094,10 +8724,7 @@ win_move_statusline({nr}, {offset})			*win_move_statusline()*
 		be found and FALSE otherwise.
 		Only works for the current tab page.
 
-		Can also be used as a |method|: >
-			GetWinnr()->win_move_statusline(offset)
-
-win_screenpos({nr})					*win_screenpos()*
+win_screenpos({nr})                                            *win_screenpos()*
 		Return the screen position of window {nr} as a list with two
 		numbers: [row, col].  The first window always has position
 		[1, 1], unless there is a tabline, then it is [2, 1].
@@ -9106,10 +8733,7 @@ win_screenpos({nr})					*win_screenpos()*
 		Returns [0, 0] if the window cannot be found in the current
 		tabpage.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_screenpos()
-<
-win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
+win_splitmove({nr}, {target} [, {options}])                    *win_splitmove()*
 		Move the window {nr} to a new split of the window {target}.
 		This is similar to moving to {target}, creating a new window
 		using |:split| but having the same contents as window {nr}, and
@@ -9129,48 +8753,39 @@ win_splitmove({nr}, {target} [, {options}])		*win_splitmove()*
 				present, the values of 'splitbelow' and
 				'splitright' are used.
 
-		Can also be used as a |method|: >
-			GetWinid()->win_splitmove(target)
-<
-							*winbufnr()*
-winbufnr({nr})	The result is a Number, which is the number of the buffer
+winbufnr({nr})                                                      *winbufnr()*
+		The result is a Number, which is the number of the buffer
 		associated with window {nr}.  {nr} can be the window number or
 		the |window-ID|.
 		When {nr} is zero, the number of the buffer in the current
 		window is returned.
 		When window {nr} doesn't exist, -1 is returned.
-		Example: >
-  :echo "The file in the current window is " .. bufname(winbufnr(0))
-<
-		Can also be used as a |method|: >
-			FindWindow()->winbufnr()->bufname()
+		Example: >vim
+		  echo "The file in the current window is " .. bufname(winbufnr(0))
 <
-							*wincol()*
-wincol()	The result is a Number, which is the virtual column of the
+
+wincol()                                                              *wincol()*
+		The result is a Number, which is the virtual column of the
 		cursor in the window.  This is counting screen cells from the
 		left side of the window.  The leftmost column is one.
 
-							*windowsversion()*
-windowsversion()
+windowsversion()                                              *windowsversion()*
 		The result is a String.  For MS-Windows it indicates the OS
 		version.  E.g, Windows 10 is "10.0", Windows 8 is "6.2",
 		Windows XP is "5.1".  For non-MS-Windows systems the result is
 		an empty string.
 
-winheight({nr})						*winheight()*
+winheight({nr})                                                    *winheight()*
 		The result is a Number, which is the height of window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the height of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a height of zero or more.
 		This excludes any window toolbar line.
-		Examples: >
-  :echo "The current window has " .. winheight(0) .. " lines."
+		Examples: >vim
+		  echo "The current window has " .. winheight(0) .. " lines."
 
-<		Can also be used as a |method|: >
-			GetWinid()->winheight()
-<
-winlayout([{tabnr}])					*winlayout()*
+winlayout([{tabnr}])                                               *winlayout()*
 		The result is a nested List containing the layout of windows
 		in a tabpage.
 
@@ -9178,40 +8793,44 @@ winlayout([{tabnr}])					*winlayout()*
 		with number {tabnr}. If the tabpage {tabnr} is not found,
 		returns an empty list.
 
-		For a leaf window, it returns:
+		For a leaf window, it returns: >
 			["leaf", {winid}]
+<
 		For horizontally split windows, which form a column, it
-		returns:
+		returns: >
 			["col", [{nested list of windows}]]
-		For vertically split windows, which form a row, it returns:
+<		For vertically split windows, which form a row, it returns: >
 			["row", [{nested list of windows}]]
-
-		Example: >
+<
+		Example: >vim
 			" Only one window in the tab page
-			:echo winlayout()
+			echo winlayout()
+<		 >
 			['leaf', 1000]
+<		 >vim
 			" Two horizontally split windows
-			:echo winlayout()
+			echo winlayout()
+<		 >
 			['col', [['leaf', 1000], ['leaf', 1001]]]
+<		 >vim
 			" The second tab page, with three horizontally split
 			" windows, with two vertically split windows in the
 			" middle window
-			:echo winlayout(2)
+			echo winlayout(2)
+<		 >
 			['col', [['leaf', 1002], ['row', [['leaf', 1003],
 					    ['leaf', 1001]]], ['leaf', 1000]]]
 <
-		Can also be used as a |method|: >
-			GetTabnr()->winlayout()
-<
-							*winline()*
-winline()	The result is a Number, which is the screen line of the cursor
+
+winline()                                                            *winline()*
+		The result is a Number, which is the screen line of the cursor
 		in the window.  This is counting screen lines from the top of
 		the window.  The first line is one.
 		If the cursor was moved the view on the file will be updated
 		first, this may cause a scroll.
 
-							*winnr()*
-winnr([{arg}])	The result is a Number, which is the number of the current
+winnr([{arg}])                                                         *winnr()*
+		The result is a Number, which is the number of the current
 		window.  The top window has number 1.
 		Returns zero for a popup window.
 
@@ -9234,32 +8853,29 @@ winnr([{arg}])	The result is a Number, which is the number of the current
 		|:wincmd|.
 		When {arg} is invalid an error is given and zero is returned.
 		Also see |tabpagewinnr()| and |win_getid()|.
-		Examples: >
+		Examples: >vim
 			let window_count = winnr('$')
 			let prev_window = winnr('#')
 			let wnum = winnr('3k')
 
-<		Can also be used as a |method|: >
-			GetWinval()->winnr()
-<
-							*winrestcmd()*
-winrestcmd()	Returns a sequence of |:resize| commands that should restore
+winrestcmd()                                                      *winrestcmd()*
+		Returns a sequence of |:resize| commands that should restore
 		the current window sizes.  Only works properly when no windows
 		are opened or closed and the current window and tab page is
 		unchanged.
-		Example: >
-			:let cmd = winrestcmd()
-			:call MessWithWindowSizes()
-			:exe cmd
+		Example: >vim
+			let cmd = winrestcmd()
+			call MessWithWindowSizes()
+			exe cmd
 <
-							*winrestview()*
-winrestview({dict})
+
+winrestview({dict})                                              *winrestview()*
 		Uses the |Dictionary| returned by |winsaveview()| to restore
 		the view of the current window.
 		Note: The {dict} does not have to contain all values, that are
 		returned by |winsaveview()|. If values are missing, those
-		settings won't be restored. So you can use: >
-		    :call winrestview({'curswant': 4})
+		settings won't be restored. So you can use: >vim
+		    call winrestview({'curswant': 4})
 <
 		This will only set the curswant value (the column the cursor
 		wants to move on vertical movements) of the cursor to column 5
@@ -9269,11 +8885,8 @@ winrestview({dict})
 		If you have changed the values the result is unpredictable.
 		If the window size changed the result won't be the same.
 
-		Can also be used as a |method|: >
-			GetView()->winrestview()
-<
-							*winsaveview()*
-winsaveview()	Returns a |Dictionary| that contains information to restore
+winsaveview()                                                    *winsaveview()*
+		Returns a |Dictionary| that contains information to restore
 		the view of the current window.  Use |winrestview()| to
 		restore the view.
 		This is useful if you have a mapping that jumps around in the
@@ -9284,10 +8897,14 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 		The return value includes:
 			lnum		cursor line number
 			col		cursor column (Note: the first column
-					zero, as opposed to what getpos()
+					zero, as opposed to what |getcurpos()|
 					returns)
 			coladd		cursor column offset for 'virtualedit'
-			curswant	column for vertical movement
+			curswant	column for vertical movement (Note:
+					the first column is zero, as opposed
+					to what |getcurpos()| returns).  After
+					|$| command it will be a very large
+					number equal to |v:maxcol|.
 			topline		first line in the window
 			topfill		filler lines, only in diff mode
 			leftcol		first column displayed; only used when
@@ -9295,25 +8912,21 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 			skipcol		columns skipped
 		Note that no option values are saved.
 
-
-winwidth({nr})						*winwidth()*
+winwidth({nr})                                                      *winwidth()*
 		The result is a Number, which is the width of window {nr}.
 		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the width of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
-		Examples: >
-  :echo "The current window has " .. winwidth(0) .. " columns."
-  :if winwidth(0) <= 50
-  :  50 wincmd |
-  :endif
+		Examples: >vim
+		  echo "The current window has " .. winwidth(0) .. " columns."
+		  if winwidth(0) <= 50
+		    50 wincmd |
+		  endif
 <		For getting the terminal or screen size, see the 'columns'
 		option.
 
-		Can also be used as a |method|: >
-			GetWinid()->winwidth()
-
-wordcount()						*wordcount()*
+wordcount()                                                        *wordcount()*
 		The result is a dictionary of byte/chars/word statistics for
 		the current buffer.  This is the same info as provided by
 		|g_CTRL-G|
@@ -9334,57 +8947,62 @@ wordcount()						*wordcount()*
 			visual_words    Number of words visually selected
 					(only in Visual mode)
 
-
-							*writefile()*
-writefile({object}, {fname} [, {flags}])
+writefile({object}, {fname} [, {flags}])                           *writefile()*
 		When {object} is a |List| write it to file {fname}.  Each list
 		item is separated with a NL.  Each list item must be a String
 		or Number.
-		When {flags} contains "b" then binary mode is used: There will
-		not be a NL after the last list item.  An empty item at the
-		end does cause the last line in the file to end in a NL.
+		All NL characters are replaced with a NUL character.
+		Inserting CR characters needs to be done before passing {list}
+		to writefile().
 
 		When {object} is a |Blob| write the bytes to file {fname}
-		unmodified.
+		unmodified, also when binary mode is not specified.
+
+		{flags} must be a String.  These characters are recognized:
+
+		'b'  Binary mode is used: There will not be a NL after the
+		     last list item.  An empty item at the end does cause the
+		     last line in the file to end in a NL.
 
-		When {flags} contains "a" then append mode is used, lines are
-		appended to the file: >
-			:call writefile(["foo"], "event.log", "a")
-			:call writefile(["bar"], "event.log", "a")
+		'a'  Append mode is used, lines are appended to the file: >vim
+			call writefile(["foo"], "event.log", "a")
+			call writefile(["bar"], "event.log", "a")
 <
-		When {flags} contains "S" fsync() call is not used, with "s"
-		it is used, 'fsync' option applies by default. No fsync()
-		means that writefile() will finish faster, but writes may be
-		left in OS buffers and not yet written to disk. Such changes
-		will disappear if system crashes before OS does writing.
+		'D'  Delete the file when the current function ends.  This
+		     works like: >vim
+			defer delete({fname})
+<		     Fails when not in a function.  Also see |:defer|.
+
+		's'  fsync() is called after writing the file.  This flushes
+		     the file to disk, if possible.  This takes more time but
+		     avoids losing the file if the system crashes.
+
+		'S'  fsync() is not called, even when 'fsync' is set.
+
+		     When {flags} does not contain "S" or "s" then fsync() is
+		     called if the 'fsync' option is set.
 
-		All NL characters are replaced with a NUL character.
-		Inserting CR characters needs to be done before passing {list}
-		to writefile().
 		An existing file is overwritten, if possible.
+
 		When the write fails -1 is returned, otherwise 0.  There is an
 		error message if the file can't be created or when writing
 		fails.
-		Also see |readfile()|.
-		To copy a file byte for byte: >
-			:let fl = readfile("foo", "b")
-			:call writefile(fl, "foocopy", "b")
 
-<		Can also be used as a |method|: >
-			GetText()->writefile("thefile")
+		Also see |readfile()|.
+		To copy a file byte for byte: >vim
+			let fl = readfile("foo", "b")
+			call writefile(fl, "foocopy", "b")
 
-xor({expr}, {expr})					*xor()*
+xor({expr}, {expr})                                                      *xor()*
 		Bitwise XOR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
 		Also see `and()` and `or()`.
-		Example: >
-			:let bits = xor(bits, 0x80)
-<
-		Can also be used as a |method|: >
-			:let bits = bits->xor(0x80)
+		Example: >vim
+			let bits = xor(bits, 0x80)
 <
+
 ==============================================================================
-3. Matching a pattern in a String			*string-match*
+2. Matching a pattern in a String			*string-match*
 
 This is common between several functions. A regexp pattern as explained at
 |pattern| is normally used to find a match in the buffer lines.  When a
@@ -9392,14 +9010,14 @@ pattern is used to find a match in a String, almost everything works in the
 same way.  The difference is that a String is handled like it is one line.
 When it contains a "\n" character, this is not seen as a line break for the
 pattern.  It can be matched with a "\n" in the pattern, or with ".".  Example:
->
-	:let a = "aaaa\nxxxx"
-	:echo matchstr(a, "..\n..")
-	aa
-	xx
-	:echo matchstr(a, "a.x")
-	a
-	x
+>vim
+	let a = "aaaa\nxxxx"
+	echo matchstr(a, "..\n..")
+	" aa
+	" xx
+	echo matchstr(a, "a.x")
+	" a
+	" x
 
 Don't forget that "^" will only match at the first character of the String and
 "$" at the last character of the string.  They don't match after or before a