diff runtime/doc/options.txt @ 18719:99586852c2db

Update runtime files Commit: https://github.com/vim/vim/commit/0c0734d527a132edfb4089be48486586424b3f41 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Nov 26 21:44:46 2019 +0100 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Tue, 26 Nov 2019 21:45:05 +0100
parents 394abd397e15
children 6848b809a26e
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.1.  Last change: 2019 Nov 10
+*options.txt*	For Vim version 8.1.  Last change: 2019 Nov 26
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1195,7 +1195,7 @@ A jump table for the options with a shor
 		    (mostly used in |Normal-mode| or |Cmdline-mode|).
 	esc	    hitting <Esc> in |Normal-mode|.
 	ex	    In |Visual-mode|, hitting |Q| results in an error.
-	hangul	    Error occurred when using hangul input.
+	hangul	    Ignored.
 	insertmode  Pressing <Esc> in 'insertmode'.
 	lang	    Calling the beep module for Lua/Mzscheme/TCL.
 	mess	    No output available for |g<|.
@@ -1920,7 +1920,7 @@ A jump table for the options with a shor
 		    {only works when compiled with the |+textprop| feature}
 
 	   popuphidden
-	   	    Just like "popup" but initially hide the popup.  Use a
+		    Just like "popup" but initially hide the popup.  Use a
 		    |CompleteChanged| autocommand to fetch the info and call
 		    |popup_show()| once the popup has been filled.
 		    See the example at |complete-popuphidden|.
@@ -6574,12 +6574,11 @@ A jump table for the options with a shor
 	of this option).
 	The default is ">".  For Unix, if the 'shell' option is "csh" or
 	"tcsh" during initializations, the default becomes ">&".  If the
-	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh",
-	"zsh-beta","bash" or "fish", the default becomes ">%s 2>&1".  This
-	means that stderr is also included.  For Win32, the Unix checks are
-	done and additionally "cmd" is checked for, which makes the default
-	">%s 2>&1".  Also, the same names with ".exe" appended are checked
-	for.
+	'shell' option is "sh", "ksh", "mksh", "pdksh", "zsh", "zsh-beta",
+	"bash" or "fish", the default becomes ">%s 2>&1".  This means that
+	stderr is also included.  For Win32, the Unix checks are done and
+	additionally "cmd" is checked for, which makes the default ">%s 2>&1".
+	Also, the same names with ".exe" appended are checked for.
 	The initialization of this option is done after reading the ".vimrc"
 	and the other initializations, so that when the 'shell' option is set
 	there, the 'shellredir' option changes automatically unless it was
@@ -7255,7 +7254,7 @@ A jump table for the options with a shor
 	{ NF  Evaluate expression between '%{' and '}' and substitute result.
 	      Note that there is no '%' before the closing '}'.  The
 	      expression cannot contain a '}' character, call a function to
-	      work around that.
+	      work around that.  See |stl-%{| below.
 	( -   Start of item group.  Can be used for setting the width and
 	      alignment of a section.  Must be followed by %) somewhere.
 	) -   End of item group.  No width fields allowed.
@@ -7289,13 +7288,13 @@ A jump table for the options with a shor
 		:set statusline=...%(\ [%M%R%H]%)...
 <	Beware that an expression is evaluated each and every time the status
 	line is displayed.
-					*g:actual_curbuf* *g:actual_curwin*
-	The current buffer and current window will be set temporarily to that
-	of the window (and buffer) whose statusline is currently being drawn.
-	The expression will evaluate in this context.  The variable
-	"g:actual_curbuf" is set to the `bufnr()` number of the real current
-	buffer and "g:actual_curwin" to the |window-ID| of the real current
-	window.  These values are strings.
+				*stl-%{* *g:actual_curbuf* *g:actual_curwin*
+	While evaluationg %{} the current buffer and current window will be
+	set temporarily to that of the window (and buffer) whose statusline is
+	currently being drawn.  The expression will evaluate in this context.
+	The variable "g:actual_curbuf" is set to the `bufnr()` number of the
+	real current buffer and "g:actual_curwin" to the |window-ID| of the
+	real current window.  These values are strings.
 
 	The 'statusline' option will be evaluated in the |sandbox| if set from
 	a modeline, see |sandbox-option|.
@@ -8951,6 +8950,8 @@ A jump table for the options with a shor
 	fail (and make sure not to exit Vim until the write was successful).
 	See |backup-table| for another explanation.
 	When the 'backupskip' pattern matches, a backup is not made anyway.
+	Depending on 'backupcopy' the backup is a new file or the original
+	file renamed (and a new file is written).
 	NOTE: This option is set to the default value when 'compatible' is
 	set.