Merge remote-tracking branch 'vim/master'

Author: splhack

runtime/doc/channel.txt

@@ -1,4 +1,4 @@
-*channel.txt*      For Vim version 7.4.  Last change: 2016 Aug 26
+*channel.txt*      For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -395,6 +395,9 @@ This {string} can also be JSON, use |json_encode()| to create it and
 
 It is not possible to use |ch_evalexpr()| or |ch_sendexpr()| on a raw channel.
 
+A String in Vim cannot contain NUL bytes.  To send or receive NUL bytes read
+or write from a buffer.  See |in_io-buffer| and |out_io-buffer|.
+
 ==============================================================================
 7. More channel functions				*channel-more*
 
@@ -480,7 +483,7 @@ For example, to start a job and write its output in buffer "dummy": >
 
 
 Job input from a buffer ~
-
+							*in_io-buffer*
 To run a job that reads from a buffer: >
 	let job = job_start({command},
 	    \ {'in_io': 'buffer', 'in_name': 'mybuffer'})
@@ -654,7 +657,7 @@ See |job_setoptions()| and |ch_setoptions()|.
 
 
 Writing to a buffer ~
-
+							*out_io-buffer*
 When the out_io or err_io mode is "buffer" and there is a callback, the text
 is appended to the buffer before invoking the callback.
 

runtime/doc/cmdline.txt

@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.4.  Last change: 2015 Dec 17
+*cmdline.txt*   For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -409,19 +409,11 @@ CTRL-D		List names that match the pattern in front of the cursor.
 							*c_CTRL-N*
 CTRL-N		After using 'wildchar' which got multiple matches, go to next
 		match.  Otherwise recall more recent command-line from history.
-		                                            */_CTRL-N*
-		When 'incsearch' is set, entering a search pattern for "/" or
-		"?" and the current match is displayed then CTRL-N will move
-		to the next match (does not take |search-offset| into account)
 <S-Tab>							*c_CTRL-P* *c_<S-Tab>*
 CTRL-P		After using 'wildchar' which got multiple matches, go to
 		previous match.  Otherwise recall older command-line from
 		history.  <S-Tab> only works with the GUI, on the Amiga and
 		with MS-DOS.
-		                                            */_CTRL-P*
-		When 'incsearch' is set, entering a search pattern for "/" or
-		"?" and the current match is displayed then CTRL-P will move
-		to the previous match (does not take |search-offset| into account).
 							*c_CTRL-A*
 CTRL-A		All names that match the pattern in front of the cursor are
 		inserted.
@@ -438,6 +430,19 @@ CTRL-L		A match is done on the pattern in front of the cursor.  If
 		'ignorecase' and 'smartcase' are set and the command line has
 		no uppercase characters, the added character is converted to
 		lowercase.
+	                                            *c_CTRL-G* */_CTRL-G*
+CTRL-G		When 'incsearch' is set, entering a search pattern for "/" or
+		"?" and the current match is displayed then CTRL-G will move
+		to the next match (does not take |search-offset| into account)
+		Use CTRL-T to move to the previous match.  Hint: on a regular
+		keyboard T is above G.
+	                                            *c_CTRL-T* */_CTRL-T*
+CTRL-T		When 'incsearch' is set, entering a search pattern for "/" or
+		"?" and the current match is displayed then CTRL-T will move
+		to the previous match (does not take |search-offset| into
+		account).
+		Use CTRL-G to move to the next match.  Hint: on a regular
+		keyboard T is above G.
 
 The 'wildchar' option defaults to <Tab> (CTRL-E when in Vi compatible mode; in
 a previous version <Esc> was used).  In the pattern standard wildcards '*' and

runtime/doc/eval.txt

@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4.  Last change: 2016 Aug 21
+*eval.txt*	For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3272,6 +3272,7 @@ delete({fname} [, {flags}])					*delete()*
 
 		When {flags} is "rf": Deletes the directory by the name
 		{fname} and everything in it, recursively.  BE CAREFUL!
+
 		A symbolic link itself is deleted, not what it points to.
 
 		The result is a Number, which is 0 if the delete operation was
@@ -4014,25 +4015,30 @@ getbufinfo([{dict}])
 			lnum		current line number in buffer.
 			loaded		TRUE if the buffer is loaded.
 			name		full path to the file in the buffer.
-			options		dictionary of buffer local options.
 			signs		list of signs placed in the buffer.
 					Each list item is a dictionary with
 					the following fields:
 					    id	  sign identifier
 					    lnum  line number
 					    name  sign name
-			variables	dictionary of buffer local variables.
-			windows		list of |window-ID|s with this buffer
+			variables	a reference to the dictionary with
+					buffer-local variables.
+			windows		list of |window-ID|s that display this
+					buffer
 
 		Examples: >
 			for buf in getbufinfo()
 			    echo buf.name
 			endfor
 			for buf in getbufinfo({'buflisted':1})
-			    if buf.options.filetype == 'java'
+			    if buf.changed
 				....
 			    endif
 			endfor
+<
+		To get buffer-local options use: >
+			getbufvar({bufnr}, '&')
+
 <
 							*getbufline()*
 getbufline({expr}, {lnum} [, {end}])
@@ -4065,6 +4071,10 @@ getbufvar({expr}, {varname} [, {def}])				*getbufvar()*
 		must be used.
 		When {varname} is empty returns a dictionary with all the
 		buffer-local variables.
+		When {varname} is equal to "&" returns a dictionary with all
+		the buffer-local options.
+		Otherwise, when {varname} starts with "&" returns the value of
+		a buffer-local option.
 		This also works for a global or buffer-local option, but it
 		doesn't work for a global variable, window-local variable or
 		window-local option.
@@ -4532,7 +4542,8 @@ gettabinfo([{arg}])					*gettabinfo()*
 
 		Each List item is a Dictionary with the following entries:
 			tabnr		tab page number.
-			variables	dictionary of tabpage local variables.
+			variables	a reference to the dictionary with
+					tabpage-local variables
 			windows		List of |window-ID|s in the tag page.
 
 gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
@@ -4548,10 +4559,12 @@ gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
-		When {varname} starts with "&" get the value of a window-local
-		option.
 		When {varname} is empty a dictionary with all window-local
 		variables is returned.
+		When {varname} is equal to "&" get the values of all
+		window-local options in a Dictionary.
+		Otherwise, when {varname} starts with "&" get the value of a
+		window-local option.
 		Note that {varname} must be the name without "w:".
 		Tabs are numbered starting with one.  For the current tabpage
 		use |getwinvar()|.
@@ -4591,15 +4604,18 @@ getwininfo([{winid}])					*getwininfo()*
 			height		window height
 			loclist		1 if showing a location list
 					{only with the +quickfix feature}
-			options		dictionary of window local options
 			quickfix	1 if quickfix or location list window
 					{only with the +quickfix feature}
 			tabnr		tab page number
-			variables	dictionary of window local variables
+			variables	a reference to the dictionary with
+					window-local variables
 			width		window width
 			winid		|window-ID|
 			winnr		window number
 
+		To obtain all window-local variables use: >
+			gettabwinvar({tabnr}, {winnr}, '&')
+
 getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
@@ -5987,6 +6003,16 @@ printf({fmt}, {expr1} ...)				*printf()*
 			cause truncation of a numeric field; if the result of
 			a conversion is wider 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.
+			Generally, these modifiers are not useful. They are
+			ignored when type is known from the argument.
+
+		i	alias for d
+		D	alias for ld
+		U	alias for lu
+		O	alias for lo
 
 							*printf-c*
 		c	The Number argument is converted to a byte, and the
@@ -6006,7 +6032,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 			feature works just like 's'.
 
 							*printf-f* *E807*
-		f	The Float argument is converted into a string of the 
+		f F	The Float argument is converted into a string of the 
 			form 123.456.  The precision specifies the number of
 			digits after the decimal point.  When the precision is
 			zero the decimal point is omitted.  When the precision

runtime/doc/index.txt

@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.4.  Last change: 2016 Aug 24
+*index.txt*     For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -984,7 +984,7 @@ tag		command	      action in Command-line editing mode	~
 |c_CTRL-E|	CTRL-E		cursor to end of command-line
 |'cedit'|	CTRL-F		default value for 'cedit': opens the
 				command-line window; otherwise not used
-		CTRL-G		not used
+|c_CTRL-G|	CTRL-G		next match when 'incsearch' is active
 |c_<BS>|	<BS>		delete the character in front of the cursor
 |c_digraph|	{char1} <BS> {char2}
 				enter digraph when 'digraph' is on
@@ -1017,7 +1017,7 @@ tag		command	      action in Command-line editing mode	~
 				insert the contents of a register or object
 				under the cursor literally
 		CTRL-S		(used for terminal control flow)
-		CTRL-T		not used
+|c_CTRL-T|	CTRL-T		previous match when 'incsearch' is active
 |c_CTRL-U|	CTRL-U		remove all characters
 |c_CTRL-V|	CTRL-V		insert next non-digit literally, insert three
 				digit decimal number as a single byte.

runtime/doc/map.txt

@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2016 Jul 30
+*map.txt*       For Vim version 7.4.  Last change: 2016 Aug 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -431,6 +431,9 @@ with a space.
 Note: When using mappings for Visual mode, you can use the "'<" mark, which
 is the start of the last selected Visual area in the current buffer |'<|.
 
+The |:filter| command can be used to select what mappings to list.  The
+pattern is matched against the {lhs} and {rhs} in the raw form.
+
 							*:map-verbose*
 When 'verbose' is non-zero, listing a key map will also display where it was
 last defined.  Example: >
@@ -1177,6 +1180,10 @@ scripts.
 			    "	Command has the -register attribute
 			    b	Command is local to current buffer
 			(see below for details on attributes)
+			The list can be filtered on command name with
+			|:filter|, e.g., to list all commands with "Pyth" in
+			the name: >
+				filter Pyth command
 
 :com[mand] {cmd}	List the user-defined commands that start with {cmd}
 

runtime/doc/starting.txt

@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4.  Last change: 2016 Aug 23
+*starting.txt*  For Vim version 7.4.  Last change: 2016 Aug 26
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1633,7 +1633,7 @@ most of the information will be restored).
 			afterwards with `:rviminfo!`.  Also see |v:oldfiles|.
 			The number can be used with |c_#<|.
 			The output can be filtered with |:filter|, e.g.: >
-				filter /\\.vim/ oldfiles
+				filter /\.vim/ oldfiles
 <			The filtering happens on the file name.
 			{not in Vi, only when compiled with the |+eval|
 			feature}

runtime/doc/tags

@@ -1616,9 +1616,9 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 /\{-	pattern.txt	/*\/\\{-*
 /\~	pattern.txt	/*\/\\~*
 /^	pattern.txt	/*\/^*
+/_CTRL-G	cmdline.txt	/*\/_CTRL-G*
 /_CTRL-L	cmdline.txt	/*\/_CTRL-L*
-/_CTRL-N	cmdline.txt	/*\/_CTRL-N*
-/_CTRL-P	cmdline.txt	/*\/_CTRL-P*
+/_CTRL-T	cmdline.txt	/*\/_CTRL-T*
 /atom	pattern.txt	/*\/atom*
 /bar	pattern.txt	/*\/bar*
 /branch	pattern.txt	/*\/branch*
@@ -5228,6 +5228,7 @@ c_CTRL-C	cmdline.txt	/*c_CTRL-C*
 c_CTRL-D	cmdline.txt	/*c_CTRL-D*
 c_CTRL-E	cmdline.txt	/*c_CTRL-E*
 c_CTRL-F	cmdline.txt	/*c_CTRL-F*
+c_CTRL-G	cmdline.txt	/*c_CTRL-G*
 c_CTRL-H	cmdline.txt	/*c_CTRL-H*
 c_CTRL-I	cmdline.txt	/*c_CTRL-I*
 c_CTRL-J	cmdline.txt	/*c_CTRL-J*
@@ -5244,6 +5245,7 @@ c_CTRL-R_CTRL-O	cmdline.txt	/*c_CTRL-R_CTRL-O*
 c_CTRL-R_CTRL-P	cmdline.txt	/*c_CTRL-R_CTRL-P*
 c_CTRL-R_CTRL-R	cmdline.txt	/*c_CTRL-R_CTRL-R*
 c_CTRL-R_CTRL-W	cmdline.txt	/*c_CTRL-R_CTRL-W*
+c_CTRL-T	cmdline.txt	/*c_CTRL-T*
 c_CTRL-U	cmdline.txt	/*c_CTRL-U*
 c_CTRL-V	cmdline.txt	/*c_CTRL-V*
 c_CTRL-W	cmdline.txt	/*c_CTRL-W*
@@ -6922,6 +6924,7 @@ improvements-7	version7.txt	/*improvements-7*
 improvements-8	version8.txt	/*improvements-8*
 in_bot	channel.txt	/*in_bot*
 in_buf	channel.txt	/*in_buf*
+in_io-buffer	channel.txt	/*in_io-buffer*
 in_mode	channel.txt	/*in_mode*
 in_name	channel.txt	/*in_name*
 in_top	channel.txt	/*in_top*
@@ -7787,6 +7790,7 @@ os_win32.txt	os_win32.txt	/*os_win32.txt*
 other-features	vi_diff.txt	/*other-features*
 out_buf	channel.txt	/*out_buf*
 out_cb	channel.txt	/*out_cb*
+out_io-buffer	channel.txt	/*out_io-buffer*
 out_mode	channel.txt	/*out_mode*
 out_name	channel.txt	/*out_name*
 out_timeout	channel.txt	/*out_timeout*

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2016 Aug 26
+*todo.txt*      For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,15 +35,9 @@ not be repeated below, unless there is extra information.
 -------------------- Known bugs and current work -----------------------
 
 Make ":filter" work with more commands.
-
-C highlighting: modern C allows /* comment */ #ifdef
-
-Ramel Eshed: system() is much slower than job_start(), why? (Aug 26)
-
-Error in viminfo. (John Chen, 2016 Aug 26, #1010)
+Search for: msg_putchar('\n')
 
 +channel:
-- Check that raw mode does NL-NUL conversion.
 - Implement |job-term| ?
 - Channel test fails with Motif.  Sometimes kills the X11 server.
 - When a message in the queue but there is no callback, drop it after a while?
@@ -111,9 +105,6 @@ Regexp problems:
 - Search for /\%d0\+  causes error E363 in a file with consecutive NUL
   characters. (Christian Brabandt, 2016 Jun 7)
 
-getbufinfo() may return a lot of data.  Select what to return?
-    remove variables, does that help?
-
 json_encode(): should convert to utf-8. (Nikolai Pavlov, 2016 Jan 23)
 What if there is an invalid character?
 
@@ -126,10 +117,6 @@ Once .exe with updated installer is available: Add remark to download page
 about /S and /D options (Ken Takata, 2016 Apr 13)
 Or point to nightly builds: https://github.com/vim/vim-win32-installer/releases
 
-Problem with completion on "**/" in $path. (issue #932)
-Happens in uniquefy_paths() ?  More info Jul 22.
-Fix for this (Harm te Hennepe, 2016 Jul 21, #939)
-
 Cursor positioned in the wrong place when editing src/testdir/test_viml.vim.
 
 Javascript indent wrong after /* in single quoted string:
@@ -194,6 +181,8 @@ Patch for restoring wide characters in the console buffer.
 We can use '. to go to the last change in the current buffer, but how about
 the last change in any buffer?  Can we use ', (, is next to .)?
 
+Ramel Eshed: system() is much slower than job_start(), why? (Aug 26)
+
 Patch for Python: #622. (Roland Puntaier, 2016 Feb 2)
 What does it change?
 
@@ -405,6 +394,10 @@ inconsistent with the documentation.
 Can we cache the syntax attributes, so that updates for 'relativenumber' and
 'cursorline'/'cursorcolumn' are a lot faster?
 
+C highlighting: modern C allows: /* comment */ #ifdef
+and also line continuation after #include.
+I can't recommend it though.
+
 Build with Python on Mac does not always use the right library.
 (Kazunobu Kuriyama, 2015 Mar 28)