Merge remote-tracking branch 'vim/master'

Author: splhack

Filelist

@@ -907,6 +907,7 @@ LANG_SRC = \
 		src/po/check.vim \
 		src/po/cleanup.vim \
 		src/po/Makefile \
+		src/po/Make_all.mak \
 		src/po/Make_cyg.mak \
 		src/po/Make_ming.mak \
 		src/po/Make_mvc.mak \

runtime/doc/autocmd.txt

@@ -4,7 +4,7 @@
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
-Automatic commands					*autocommand*
+Automatic commands				*autocommand* *autocommands*
 
 For a basic explanation, see section |40.3| in the user manual.
 

runtime/doc/change.txt

@@ -987,6 +987,11 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.
 			this (that's a good habit anyway).
 			`:retab!` may also change a sequence of spaces by
 			<Tab> characters, which can mess up a printf().
+			If the |+vartabs| feature is enabled then a list of
+			tab widths separated by commas may be used in place of
+			a single tabstop.  Each value in the list represents
+			the width of one tabstop, except the final value which
+			applies to all following tabstops.
 			{not in Vi}
 
 							*retab-example*

runtime/doc/eval.txt

@@ -7053,6 +7053,7 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		When evaluating {skip} causes an error the search is aborted
 		and -1 returned.
 		{skip} can be a string, a lambda, a funcref or a partial.
+		Anything else makes the function fail.
 
 		For {stopline} and {timeout} see |search()|.
 
@@ -8694,6 +8695,8 @@ test_override({name}, {val})				*test_override()*
 		redraw       disable the redrawing() function
 		char_avail   disable the char_avail() function
 		starting     reset the "starting" variable, see below
+		nfa_fail     makes the NFA regexp engine fail to force a
+			     fallback to the old engine
 		ALL	     clear all overrides ({val} is not used)
 
 		"starting" is to be used when a test should behave like

runtime/doc/options.txt

@@ -7333,6 +7333,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	set.
 	NOTE: This option is set to 0 when 'compatible' is set.
 
+	If Vim is compiled with the |+vartabs| feature then the value of
+	'softtabstop' will be ignored if |'varsofttabstop'| is set to
+	anything other than an empty string.
+
 						*'spell'* *'nospell'*
 'spell'			boolean	(default off)
 			local to window
@@ -7884,6 +7888,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   though.  Otherwise aligned comments will be wrong when 'tabstop' is
 	   changed.
 
+	If Vim is compiled with the |+vartabs| feature then the value of
+	'tabstop' will be ignored if |'vartabstop'| is set to anything other
+	than an empty string.
+
 			*'tagbsearch'* *'tbs'* *'notagbsearch'* *'notbs'*
 'tagbsearch' 'tbs'	boolean	(default on)
 			global
@@ -8643,6 +8651,44 @@ A jump table for the options with a short description can be found at |Q_op|.
 	written to disk (see |crash-recovery|).  Also used for the
 	|CursorHold| autocommand event.
 
+					*'varsofttabstop'* *'vsts'*
+'varsofttabstop' 'vsts'	string	(default "")
+			local to buffer
+			{only available when compiled with the |+vartabs|
+			feature}
+			{not in Vi}
+	A list of the number of spaces that a <Tab> counts for while editing,
+	such as inserting a <Tab> or using <BS>.  It "feels" like variable-
+	width <Tab>s are being inserted, while in fact a mixture of spaces
+	and <Tab>s is used.  Tab widths are separated with commas, with the
+	final value applying to all subsequent tabs.
+
+	For example, when editing assembly language files where statements
+	start in the 8th column and comments in the 40th, it may be useful
+	to use the following: >
+		:set varsofttabstop=8,32,8
+<	This will set soft tabstops at the 8th and 40th columns, and at every
+	8th column thereafter.
+
+	Note that the value of |'softtabstop'| will be ignored while
+	'varsofttabstop' is set.
+
+						*'vartabstop'* *'vts'*
+'vartabstop' 'vts'	string	(default "")
+			local to buffer
+			{only available when compiled with the |+vartabs|
+			feature}
+			{not in Vi}
+	A list of the number of spaces that a <Tab> in the file counts for,
+	separated by commas.  Each value corresponds to one tab, with the
+	final value applying to all subsequent tabs. For example: >
+		:set vartabstop=4,20,10,8
+<	This will make the first tab 4 spaces wide, the second 20 spaces,
+	the third 10 spaces, and all following tabs 8 spaces.
+
+	Note that the value of |'tabstop'| will be ignored while 'vartabstop'
+	is set.
+
 						*'verbose'* *'vbs'*
 'verbose' 'vbs'		number	(default 0)
 			global

runtime/doc/quickref.txt

@@ -965,6 +965,8 @@ Short explanation of each option:		*option-list*
 'undoreload'	  'ur'	    max nr of lines to save for undo on a buffer reload
 'updatecount'	  'uc'	    after this many characters flush swap file
 'updatetime'	  'ut'	    after this many milliseconds flush swap file
+'varsofttabstop'  'vsts'    a list of number of spaces when typing <Tab>
+'vartabstop'	  'vts'	    a list of number of spaces for <Tab>s
 'verbose'	  'vbs'     give informative messages
 'verbosefile'	  'vfile'   file to write messages in
 'viewdir'	  'vdir'    directory where to store files with :mkview

runtime/doc/remote.txt

@@ -64,7 +64,7 @@ The following command line arguments are available:
    --servername {name}		Become the server {name}.  When used together
 				with one of the --remote commands: connect to
 				server {name} instead of the default (see
-				below).
+				below).  The name used will be uppercase.
 								*--remote-send*
    --remote-send {keys}		Send {keys} to server and exit.  The {keys}
    				are not mapped.  Special key names are

runtime/doc/tags

@@ -1164,6 +1164,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'updatetime'	options.txt	/*'updatetime'*
 'ur'	options.txt	/*'ur'*
 'ut'	options.txt	/*'ut'*
+'varsofttabstop'	options.txt	/*'varsofttabstop'*
+'vartabstop'	options.txt	/*'vartabstop'*
 'vb'	options.txt	/*'vb'*
 'vbs'	options.txt	/*'vbs'*
 'vdir'	options.txt	/*'vdir'*
@@ -1180,6 +1182,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'virtualedit'	options.txt	/*'virtualedit'*
 'visualbell'	options.txt	/*'visualbell'*
 'vop'	options.txt	/*'vop'*
+'vsts'	options.txt	/*'vsts'*
+'vts'	options.txt	/*'vts'*
 'w1200'	vi_diff.txt	/*'w1200'*
 'w300'	vi_diff.txt	/*'w300'*
 'w9600'	vi_diff.txt	/*'w9600'*
@@ -1377,6 +1381,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 +transparency	various.txt	/*+transparency*
 +unix	eval.txt	/*+unix*
 +user_commands	various.txt	/*+user_commands*
++vartabs	various.txt	/*+vartabs*
 +vertsplit	various.txt	/*+vertsplit*
 +viminfo	various.txt	/*+viminfo*
 +virtualedit	various.txt	/*+virtualedit*

runtime/doc/todo.txt

@@ -43,32 +43,19 @@ Prompt buffer:
 - delay next prompt until plugin gives OK?
 
 Terminal debugger:
-- Using terminal window: after "cont" in gdb window CTRL-C interrupts, but
-  after :Continue it does not.  Mode of UI is changed?  :Stop does work.
-- patch from Christian to handle changing 'background'
-  and a patch to show breakpoint nr in sign. (June 14)
 - Make prompt-buffer variant work better.
+- When only gdb window exists, on "quit" edit another buffer.
 - Termdebug does not work when Vim was build with mzscheme: gdb hangs just
   after "run".  Everything else works, including communication channel.  Not
   initializing mzscheme avoid the problem, thus it's not some #ifdef.
-- Show breakpoint number in the sign? (Uri Moszkowicz, 2018 Jun 13, #3007)
-- Allow for users to create their own gdb mappings.  Perhaps by making the gdb
-  buffer global?  (Uri Moszkowicz, #3012) Or with a function to send a command
-  to gdb.
 
 Terminal emulator window:
 - With a vertical split only one window is updated. (Linwei, 2018 Jun 2,
   #2977)
-- When typing : at the more prompt, instead of entering a new Vim command, the
-  : is inserted in the terminal window.  Should skip terminal_loop here.
-  ()
 - When pasting should call vterm_keyboard_start_paste(), e.g. when using
   K_MIDDLEMOUSE, calling insert_reg().
 - Users expect parsing the :term argument like a shell does, also support
   single quotes.  E.g. with:  :term grep 'alice says "hello"'  (#1999)
-- When running a shell in a terminal to run Vim tests, CTRL-W : the command
-  line keeps getting cleard.  Doing the same in another window is OK. (Jason
-  Franklin, 2018 Jun 17)
 - How to access selection in Terminal running a shell? (damnskippy, 2018 May
   27, #29620  When terminal doesn't use the mouse, use modeless selection.
 - Win32: Redirecting input does not work, half of Test_terminal_redir_file()
@@ -102,26 +89,11 @@ Errors found with random data:
 More warnings from static analysis:
 https://lgtm.com/projects/g/vim/vim/alerts/?mode=list
 
-Patch to make "is" and "as" work better. (Jason Franklin, 2018 May 19)
-
-Patch to add tests for user and language completion. (Dominique Pelle, 2018
-Jun 2, #2978)  typo wk -> we
-Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
-Aug 16)
-
-Patch to add tests for libcall() and libcallnr(). (Dominique Pelle, #2982)
-
-Patch to fix that v:shell_error is always zero when using terminal for shell
-command. (Ichizok, 2018 Jun 8, #2994)
-
-Patch to make test for terminal out&error more reliable. (Ichizok, 2018 Jun 8,
-#2991)
-
 Patch to fix duplicate entry in tagfiles() and add a test. (Dominique Pelle,
 #2979)
 
 Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17)
-Related to bracketed paste.
+Related to bracketed paste.  I cannot reproduce it.
 
 Using ":file" in quickfix window during an autocommand doesn't work. 
 (Jason Franklin, 2018 May 23) Allow for using it when there is no argument.
@@ -134,6 +106,15 @@ Patch for xterm and vt320 builtin termcap. (Kouichi Iwamoto, 2018 May 31,
 Patch to add more testing for :cd command. (Dominique Pelle, 2018 May 30,
 #2972)
 
+Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan
+Shafran, 2018 Jun 23, #3072)
+
+Patch to set w_curswant when setting the cursor in language interfaces.
+(David Hotham, 2018 Jun 22, #3060)
+
+Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin,
+2018 May 30)
+
 Patch to make mode() return something different for Normal mode when coming
 from Insert mode with CTRL-O. (#3000)
 
@@ -158,6 +139,13 @@ Tests failing for "make testgui" with GTK:
 - Test_setbufvar_options()
 - Test_exit_callback_interval()
 
+Patch to stack and pop the window title and icon. (IWAMOTO Kouichi, 2018 Jun
+22, #3059)
+8   For xterm need to open a connection to the X server to get the window
+    title, which can be slow.  Can also get the title with "<Esc>[21t", no
+    need to use X11 calls.  This returns "<Esc>]l{title}<Esc>\".
+Using title stack probably works better.
+
 Make balloon_show() work outside of 'balloonexpr'?  Users expect it to work:
 #2948. (related to #1512?)
 On Win32 it stops showing, because showState is already ShS_SHOWING.
@@ -198,9 +186,6 @@ deleting autocmds, not when adding them.
 Quickfix window height is not kept with a vertical split. (Lifepillar, 2018
 Jun 10, #2998)
 
-Patch for variable tabstops.  On github (Christian Brabandt, 2014 May 15)
-Update 2018 March 12, #2711
-
 Improve the installer for MS-Windows.  There are a few alternatives:
 - Add silent install option. (Shane Lee, #751)
 - Installer from Cream (Steve Hall).
@@ -321,6 +306,8 @@ highlighted. (van-de-bugger, 2018 Jan 23, #2576)
 Patch to parse ":line" in tags file and use it for search. (Daniel Hahler,
 #2546)  Fixes #1057.  Missing a test.
 
+":file" does not show anything when 'shortmess' contains 'F'. (#3070)
+
 Patch to add winlayout() function. (Yegappan Lakshmanan, 2018 Jan 4)
 
 No profile information for function that executes ":quit". (Daniel Hahler,
@@ -463,6 +450,10 @@ The ++ options for the :edit command are also useful on the Vim command line.
 When recovering a file, put the swap file name in b:recovered_swapfile.  Then
 a command can delete it.
 
+When a swap file exists, is not for a running process, is from the same
+machine and recovering results in the same text, we could silently delete it.
+#1237
+
 Overlong utf-8 sequence is displayed wrong. (Harm te Hennepe, 2017 Sep 14,
 #2089)  Patch with possible solution by Björn Linse.
 
@@ -3430,9 +3421,6 @@ Macintosh:
 7   X11: Some people prefer to use CLIPBOARD instead of PRIMARY for the normal
     selection.  Add an "xclipboard" argument to the 'clipboard' option? (Mark
     Waggoner)
-8   For xterm need to open a connection to the X server to get the window
-    title, which can be slow.  Can also get the title with "<Esc>[21t", no
-    need to use X11 calls.  This returns "<Esc>]l{title}<Esc>\".
 6   When the xterm reports the number of colors, a redraw occurs.  This is
     annoying on a slow connection.  Wait for the xterm to report the number of
     colors before drawing the screen.  With a timeout.

runtime/doc/various.txt

@@ -456,6 +456,7 @@ N  *+title*		Setting the window 'title' and 'icon'
 N  *+toolbar*		|gui-toolbar|
 m  *+transparency*      MacVim only: window background transparency
 N  *+user_commands*	User-defined commands. |user-commands|
+B  *+vartabs*		Variable-width tabstops. |'vartabstop'|
 N  *+viminfo*		|'viminfo'|
    *+vertsplit*		Vertically split windows |:vsplit|; Always enabled
 			since 8.0.1118.