Long overdue runtime update.

2025-07-15 16:51:57 +00:00 · 2017-11-02 22:58:42 +01:00
parent ea84df8041
commit 01164a6546
51 changed files with 2067 additions and 900 deletions
--- a/runtime/autoload/ada.vim
+++ b/runtime/autoload/ada.vim
@ -591,7 +591,7 @@ function ada#Map_Menu (Text, Keys, Command)
 	\" :" . a:Command
      execute
 	\ "inoremap <buffer>" .
-	\ " <Learder>a" . a:Keys .
+	\ " <Leader>a" . a:Keys .
 	\" <C-O>:" . a:Command
   endif
   return
--- a/runtime/autoload/sqlcomplete.vim
+++ b/runtime/autoload/sqlcomplete.vim
@ -2,7 +2,7 @@
 " Language:    SQL
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Version:     16.0
-" Last Change: 2015 Dec 29
+" Last Change: 2017 Oct 15
 " Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
 " Usage:       For detailed help
 "              ":help sql.txt"
@ -860,7 +860,7 @@ function! s:SQLCGetColumns(table_name, list_type)

         " Start characterwise visual mode
         " Advance right one character
-         " Search foward until one of the following:
+         " Search forward until one of the following:
         "     1.  Another select/update/delete statement
         "     2.  A ; at the end of a line (the delimiter)
         "     3.  The end of the file (incase no delimiter)
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Jul 14
+*autocmd.txt*   For Vim version 8.0.  Last change: 2017 Oct 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -501,6 +501,10 @@ CmdlineEnter			After moving the cursor to the command line,
 				|cmdwin-char|
 							*CmdlineLeave*
 CmdlineLeave			Before leaving the command line.
+				Also when abandoning the command line, after
+				typing CTRL-C or <Esc>.
+				When the commands result in an error the
+				command line is still executed.
 				<afile> is set to a single character,
 				indicating the type of command-line.
 				|cmdwin-char|
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 8.0.  Last change: 2017 Sep 17
+*cmdline.txt*   For Vim version 8.0.  Last change: 2017 Oct 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -839,7 +839,8 @@ Note: these are typed literally, they are not special keys!
 	<cfile>    is replaced with the path name under the cursor (like what
 		   |gf| uses)
 	<afile>    When executing autocommands, is replaced with the file name
-		   for a file read or write.
+		   of the buffer being manipulated, or the file for a read or
+		   write.
 	<abuf>     When executing autocommands, is replaced with the currently
 		   effective buffer number (for ":r file" and ":so file" it is
 		   the current buffer, the file being read/sourced is not in a
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 8.0.  Last change: 2017 Sep 26
+*diff.txt*      For Vim version 8.0.  Last change: 2017 Oct 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -326,7 +326,7 @@ g:diff_translations to zero: >

    let g:diff_translations = 0
 <
-After setting this variable, Reload the syntax script: >
+After setting this variable, reload the syntax script: >

    set syntax=diff
 <
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 8.0.  Last change: 2017 Sep 17
+*eval.txt*	For Vim version 8.0.  Last change: 2017 Oct 28


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -120,9 +120,8 @@ To test for a non-empty string, use empty(): >
 Function arguments often behave slightly different from |TRUE|: If the
 argument is present and it evaluates to a non-zero Number, |v:true| or a
 non-empty String, then the value is considered to be TRUE.
-Note that " " and "0" are also non-empty strings, thus cause the mode to be
-cleared.  A List, Dictionary or Float is not a Number or String, thus
-evaluates to FALSE.
+Note that " " and "0" are also non-empty strings, thus considered to be TRUE.
+A List, Dictionary or Float is not a Number or String, thus evaluate to FALSE.

 		*E745* *E728* *E703* *E729* *E730* *E731* *E908* *E910* *E913*
 List, Dictionary, Funcref, Job and Channel types are not automatically
@ -815,14 +814,15 @@ Examples:
 "abc" == "Abc"	  evaluates to 1 if 'ignorecase' is set, 0 otherwise

 							*E691* *E692*
-A |List| can only be compared with a |List| and only "equal", "not equal" and
-"is" can be used.  This compares the values of the list, recursively.
-Ignoring case means case is ignored when comparing item values.
+A |List| can only be compared with a |List| and only "equal", "not equal",
+"is" and "isnot" can be used.  This compares the values of the list,
+recursively.  Ignoring case means case is ignored when comparing item values.

 							*E735* *E736*
 A |Dictionary| can only be compared with a |Dictionary| and only "equal", "not
-equal" and "is" can be used.  This compares the key/values of the |Dictionary|
-recursively.  Ignoring case means case is ignored when comparing item values.
+equal", "is" and "isnot" can be used.  This compares the key/values of the
+|Dictionary| recursively.  Ignoring case means case is ignored when comparing
+item values.

 							*E694*
 A |Funcref| can only be compared with a |Funcref| and only "equal", "not
@ -2321,7 +2321,7 @@ searchpos({pattern} [, {flags} [, {stopline} [, {timeout}]]])
 server2client({clientid}, {string})
 				Number	send reply string
 serverlist()			String	get a list of available servers
-setbufline( {expr}, {lnum}, {line})
+setbufline({expr}, {lnum}, {line})
 				Number	set line {lnum} to {line} in buffer
 					{expr}
 setbufvar({expr}, {varname}, {val})
@ -2950,6 +2950,9 @@ ch_evalraw({handle}, {string} [, {options}])		*ch_evalraw()*
 		correct contents.  Also does not add a newline for a channel
 		in NL mode, the caller must do that.  The NL in the response
 		is removed.
+		Note that Vim does not know when the text received on a raw
+		channel is complete, it may only return the first part and you 
+		need to use ch_readraw() to fetch the rest.
 		See |channel-use|.

 		{only available when compiled with the |+channel| feature}
@ -6463,6 +6466,12 @@ remote_expr({server}, {string} [, {idvar} [, {timeout}]])
 		{only available when compiled with the |+clientserver| feature}
 		Note: Any errors will cause a local error message to be issued
 		and the result will be the empty string.
+
+		Variables will be evaluated in the global namespace,
+		independent of a function currently being activel.  Except
+		when in debug mode, then local function variables and
+		arguments can be evaluated.
+
 		Examples: >
 			:echo remote_expr("gvim", "2+2")
 			:echo remote_expr("gvim1", "b:current_syntax")
@ -8154,6 +8163,11 @@ term_setsize({buf}, {expr})				*term_setsize()*
 term_start({cmd}, {options})				*term_start()*
 		Open a terminal window and run {cmd} in it.

+		{cmd} can be a string or a List, like with |job_start()|. The
+		string "NONE" can be used to open a terminal window without
+		starting a job, the pty of the terminal can be used by a
+		command like gdb.
+
 		Returns the buffer number of the terminal window.  If {cmd}
 		cannot be executed the window does open and shows an error
 		message.
@ -9055,13 +9069,16 @@ See |:verbose-cmd| for more information.

 						*E124* *E125* *E853* *E884*
 :fu[nction][!] {name}([arguments]) [range] [abort] [dict] [closure]
-			Define a new function by the name {name}.  The name
-			must be made of alphanumeric characters and '_', and
-			must start with a capital or "s:" (see above).  Note
-			that using "b:" or "g:" is not allowed. (since patch
-			7.4.260 E884 is given if the function name has a colon
-			in the name, e.g. for "foo:bar()".  Before that patch
-			no error was given).
+			Define a new function by the name {name}.  The body of
+			the function follows in the next lines, until the
+			matching |:endfunction|.
+			
+			The name must be made of alphanumeric characters and
+			'_', and must start with a capital or "s:" (see
+			above).  Note that using "b:" or "g:" is not allowed.
+			(since patch 7.4.260 E884 is given if the function
+			name has a colon in the name, e.g. for "foo:bar()".
+			Before that patch no error was given).

 			{name} can also be a |Dictionary| entry that is a
 			|Funcref|: >
@ -9197,9 +9214,10 @@ to the number of named arguments.  When using "...", the number of arguments
 may be larger.

 It is also possible to define a function without any arguments.  You must
-still supply the () then.  The body of the function follows in the next lines,
-until the matching |:endfunction|.  It is allowed to define another function
-inside a function body.
+still supply the () then.
+
+It is allowed to define another function inside a function
+body.

 							*local-variables*
 Inside a function local variables can be used.  These will disappear when the
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 8.0.  Last change: 2017 Mar 28
+*filetype.txt*  For Vim version 8.0.  Last change: 2017 Oct 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -43,7 +43,7 @@ Detail: The ":filetype on" command will load one of these files:
 	BufNewFile and BufRead events.  If the file type is not found by the
 	name, the file $VIMRUNTIME/scripts.vim is used to detect it from the
 	contents of the file.
-	When the GUI is running or will start soon, the menu.vim script is
+	When the GUI is running or will start soon, the |menu.vim| script is
 	also sourced.  See |'go-M'| about avoiding that.

 To add your own file types, see |new-filetype| below.  To search for help on a
@ -607,6 +607,7 @@ Works on:
  - Linux
  - Mac OS
  - FreeBSD
+  - OpenBSD
  - Cygwin
  - Win 10 under Bash

@ -620,6 +621,10 @@ For bash,zsh,ksh or dash by adding to the config file (.bashrc,.zshrc, ...)

 	export MANPAGER="env MAN_PN=1 vim -M +MANPAGER -"

+On OpenBSD:
+
+        export MANPAGER="env MAN_PN=1 vim -M +MANPAGER"
+
 For (t)csh by adding to the config file

 	setenv MANPAGER "env MAN_PN=1 vim -M +MANPAGER -"
--- a/runtime/doc/ft_rust.txt
+++ b/runtime/doc/ft_rust.txt
@ -199,7 +199,7 @@ COMMANDS                                                       *rust-commands*
 		|g:rust_playpen_url| is the base URL to the playpen, by default
 		"https://play.rust-lang.org/".

-		|g:rust_shortener_url| is the base URL for the shorterner, by
+		|g:rust_shortener_url| is the base URL for the shortener, by
 		default "https://is.gd/"

 :RustFmt                                                       *:RustFmt*
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@ -482,6 +482,7 @@ menus and menu items.  They are most useful for things that you can't remember
 what the key sequence was.

 For creating menus in a different language, see |:menutrans|.
+If you don't want to use menus at all, see |'go-M'|.

 							*menu.vim*
 The default menus are read from the file "$VIMRUNTIME/menu.vim".  See
@ -498,7 +499,11 @@ in the menu (which can take a bit of time to load).  If you want to have all
 filetypes already present at startup, add: >
 	:let do_syntax_sel_menu = 1

-<
+Note that the menu.vim is sourced when `:syntax on` or `:filetype on` is
+executed or after your .vimrc file is sourced.  This means that the 'encoding'
+option and the language of messages (`:language messages`) must be set before
+that (if you want to change them).
+
 							*console-menus*
 Although this documentation is in the GUI section, you can actually use menus
 in console mode too.  You will have to load |menu.vim| explicitly then, it is
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 8.0.  Last change: 2014 Dec 20
+*gui_w32.txt*   For Vim version 8.0.  Last change: 2017 Oct 27


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -382,38 +382,8 @@ Note that a menu that starts with ']' will not be displayed.
 ==============================================================================
 7. Command line arguments				*gui-w32-cmdargs*

-Analysis of a command line into parameters is not standardised in MS Windows.
-Gvim has to provide logic to analyse a command line.  This logic is likely to
-be different from the default logic provided by a compilation system used to
-build vim.  The differences relate to unusual double quote (") usage.
-The arguments "C:\My Music\freude.txt" and "+/Sch\"iller" are handled in the
-same way.  The argument "+/Sch""iller" may be handled different by gvim and
-vim, depending what it was compiled with.
-
-The rules are:
-      a) A parameter is a sequence of graphic characters.
-      b) Parameters are separated by white space.
-      c) A parameter can be enclosed in double quotes to include white space.
-      d) A sequence of zero or more backslashes (\) and a double quote (")
-	is special.  The effective number of backslashes is halved, rounded
-	down.  An even number of backslashes reverses the acceptability of
-	spaces and tabs, an odd number of backslashes produces a literal
-	double quote.
-
-So:
-	"	is a special double quote
-	\"	is a literal double quote
-	\\"	is a literal backslash and a special double quote
-	\\\"	is a literal backslash and a literal double quote
-	\\\\"	is 2 literal backslashes and a special double quote
-	\\\\\"	is 2 literal backslashes and a literal double quote
-	etc.
-
-Example: >
-	gvim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
-
-opens "C:\My Music\freude" and executes the line mode commands: >
-	set ignorecase; /"foo\ and /bar\"
+Command line arguments behave the same way as with the console application,
+see |win32-cmdargs|.

 ==============================================================================
 8. Various						*gui-w32-various*
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@ -1,4 +1,4 @@
-*help.txt*	For Vim version 8.0.  Last change: 2016 Sep 12
+*help.txt*	For Vim version 8.0.  Last change: 2017 Oct 28

 			VIM - main help file
 									 k
@ -142,6 +142,7 @@ Special issues ~
 |print.txt|	printing
 |remote.txt|	using Vim as a server or client
 |term.txt|	using different terminals and mice
+|terminal.txt|	Terminal window support
 |digraph.txt|	list of available digraphs
 |mbyte.txt|	multi-byte text support
 |mlang.txt|	non-English language support
@ -150,6 +151,7 @@ Special issues ~
 |hebrew.txt|	Hebrew language support and editing
 |russian.txt|	Russian language support and editing
 |ft_ada.txt|	Ada (the programming language) support
+|ft_rust.txt|	Filetype plugin for Rust
 |ft_sql.txt|	about the SQL filetype plugin
 |hangulin.txt|	Hangul (Korean) input mode
 |rileft.txt|	right-to-left editing mode
@ -202,6 +204,7 @@ Standard plugins ~
 |pi_logipat.txt|   Logical operators on patterns
 |pi_netrw.txt|     Reading and writing files over a network
 |pi_paren.txt|     Highlight matching parens
+|pi_spec.txt|      Filetype plugin to work with rpm spec files
 |pi_tar.txt|       Tar file explorer
 |pi_vimball.txt|   Create a self-installing Vim script
 |pi_zip.txt|       Zip archive explorer
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@ -1,4 +1,4 @@
-*message.txt*   For Vim version 8.0.  Last change: 2017 Mar 25
+*message.txt*   For Vim version 8.0.  Last change: 2017 Oct 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -639,6 +639,9 @@ starts.  It can be fixed in one of these ways:
 - Just write the file again the next day.  Or set your clock to the next day,
  write the file twice and set the clock back.

+If you get W11 all the time, you may need to disable "Acronis Active
+Protection" or register vim  as a trusted service/application.
+
 							*W12*  >
  Warning: File "{filename}" has changed and the buffer was changed in Vim as well

--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 8.0.  Last change: 2017 Mar 12
+*motion.txt*    For Vim version 8.0.  Last change: 2017 Oct 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@ -1,4 +1,4 @@
-*options.txt*	For Vim version 8.0.  Last change: 2017 Sep 24
+*options.txt*	For Vim version 8.0.  Last change: 2017 Nov 02


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -886,7 +886,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'background' is not dark/light, 'background' will be set and the
 	screen is redrawn.  This may have side effects, make t_BG empty in
 	your .vimrc if you suspect this problem.  The response to |t_RB| can
-	be found in |v:termrgbresp|.
+	be found in |v:termrbgresp|.

 	When starting the GUI, the default value for 'background' will be
 	"light".  When the value is not set in the .gvimrc, and Vim detects
@ -3895,7 +3895,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		that this flag must be added in the .vimrc file, before
 		switching on syntax or filetype recognition (when the |gvimrc|
 		file is sourced the system menu has already been loaded; the
-		":syntax on" and ":filetype on" commands load the menu too).
+		`:syntax on` and `:filetype on` commands load the menu too).
 								*'go-g'*
 	  'g'	Grey menu items: Make menu items that are not active grey.  If
 		'g' is not included inactive menu items are not shown at all.
@ -5127,7 +5127,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		:au FileType c,cpp,java set mps+==:;

 <	For a more advanced way of using "%", see the matchit.vim plugin in
-	the $VIMRUNTIME/macros directory. |add-local-help|
+	the $VIMRUNTIME/pack/dist/opt/matchit directory. |add-local-help|

 						*'matchtime'* *'mat'*
 'matchtime' 'mat'	number	(default 5)
@ -5487,6 +5487,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Specifies the name of the MzScheme shared library. The default is
 	DYNAMIC_MZSCH_DLL which was specified at compile time.
 	Environment variables are expanded |:set_env|.
+	The value must be set in the |vimrc| script or ealier.  In the
+	startup, before the |load-plugins| step.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.

--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@ -81,10 +81,45 @@ The directory of the Vim executable is appended to $PATH.  This is mostly to
 make "!xxd" work, as it is in the Tools menu.  And it also means that when
 executable() returns 1 the executable can actually be executed.

-Quotes in file names					*win32-quotes*
+Command line arguments					*win32-cmdargs*

-Quotes inside a file name (or any other command line argument) can be escaped
-with a backslash.  E.g. >
+Analysis of a command line into parameters is not standardised in MS Windows.
+Vim and gvim used to use different logic to parse it (before 7.4.432), and the
+logic was also depended on what it was compiled with.  Now Vim and gvim both
+use the CommandLineToArgvW() Win32 API, so they behave in the same way.
+
+The basic rules are:					*win32-backslashes*
+      a) A parameter is a sequence of graphic characters.
+      b) Parameters are separated by white space.
+      c) A parameter can be enclosed in double quotes to include white space.
+      d) A sequence of zero or more backslashes (\) and a double quote (")
+	is special.  The effective number of backslashes is halved, rounded
+	down.  An even number of backslashes reverses the acceptability of
+	spaces and tabs, an odd number of backslashes produces a literal
+	double quote.
+
+So:
+	"	is a special double quote
+	\"	is a literal double quote
+	\\"	is a literal backslash and a special double quote
+	\\\"	is a literal backslash and a literal double quote
+	\\\\"	is 2 literal backslashes and a special double quote
+	\\\\\"	is 2 literal backslashes and a literal double quote
+	etc.
+
+Example: >
+	vim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
+
+opens "C:\My Music\freude" and executes the line mode commands: >
+	set ignorecase; /"foo\ and /bar\"
+
+These rules are also described in the reference of the CommandLineToArgvW API:
+    https://msdn.microsoft.com/en-us/library/windows/desktop/bb776391.aspx
+
+							*win32-quotes*
+There are additional rules for quotes (which are not well documented).
+As described above, quotes inside a file name (or any other command line
+argument) can be escaped with a backslash.  E.g. >
 	vim -c "echo 'foo\"bar'"

 Alternatively use three quotes to get one: >
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 8.0.  Last change: 2017 Sep 10
+*quickref.txt*  For Vim version 8.0.  Last change: 2017 Oct 19


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -780,6 +780,8 @@ Short explanation of each option:		*option-list*
 'listchars'	  'lcs'     characters for displaying in list mode
 'loadplugins'	  'lpl'     load plugin scripts when starting up
 'luadll'		    name of the Lua dynamic library
+'mzschemedll'		    name of the MzScheme dynamic library
+'mzschemegcdll'		    name of the MzScheme dynamic library for GC
 'macatsui'		    Mac GUI: use ATSUI text drawing
 'magic'			    changes special characters in search patterns
 'makeef'	  'mef'     name of the errorfile for ":make"
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 8.0.  Last change: 2016 Jan 08
+*spell.txt*	For Vim version 8.0.  Last change: 2017 Oct 26


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -723,7 +723,7 @@ Additionally the following items are recognized:
    =		Case must match exactly.
    ?		Rare word.
    !		Bad (wrong) word.
-    digit	A region in which the word is valid.  If no regions are
+    1 to 9	A region in which the word is valid.  If no regions are
 		specified the word is valid in all regions.

 Example:
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 8.0.  Last change: 2017 Jul 15
+*starting.txt*  For Vim version 8.0.  Last change: 2017 Oct 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -873,6 +873,9 @@ accordingly.  Vim proceeds in this order:
     (*) Using this file or environment variable will cause 'compatible' to be
 	 off by default.  See |compatible-default|.

+     Note: When using the |mzscheme| interface, it is initialzed after loading
+     the vimrc file.  Changing 'mzschemedll' later has no effect.
+
 4. Load the plugin scripts.					*load-plugins*
 	This does the same as the command: >
 		:runtime! plugin/**/*.vim
@ -1044,7 +1047,7 @@ details.  NOTE: this is done since Vim 8.0, not in Vim 7.4. (it was added in
 patch 7.4.2111 to be exact).

 This should work well for new Vim users.  If you create your own .vimrc, it is
-recommended to add this line somewhere near the top: >
+recommended to add these lines somewhere near the top: >
 	unlet! skip_defaults_vim
 	source $VIMRUNTIME/defaults.vim
 Then Vim works like before you had a .vimrc. Copying $VIMRUNTIME/vimrc_example
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 8.0.  Last change: 2017 Aug 12
+*syntax.txt*	For Vim version 8.0.  Last change: 2017 Sep 30


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -61,10 +61,12 @@ fine.  If it doesn't, try setting the VIM environment variable to the
 directory where the Vim stuff is located.  For example, if your syntax files
 are in the "/usr/vim/vim50/syntax" directory, set $VIMRUNTIME to
 "/usr/vim/vim50".  You must do this in the shell, before starting Vim.
+This command also sources the |menu.vim| script when the GUI is running or
+will start soon.  See |'go-M'| about avoiding that.

 							*:syn-on* *:syntax-on*
-The ":syntax enable" command will keep your current color settings.  This
-allows using ":highlight" commands to set your preferred colors before or
+The `:syntax enable` command will keep your current color settings.  This
+allows using `:highlight` commands to set your preferred colors before or
 after using this command.  If you want Vim to overrule your settings with the
 defaults, use: >
 	:syntax on
@ -810,12 +812,9 @@ See |mysyntaxfile-add| for installing script languages permanently.

 APACHE						*apache.vim* *ft-apache-syntax*

-The apache syntax file provides syntax highlighting depending on Apache HTTP
-server version, by default for 1.3.x.  Set "apache_version" to Apache version
-(as a string) to get highlighting for another version.	Example: >
+The apache syntax file provides syntax highlighting for Apache HTTP server
+version 2.2.3.

-	:let apache_version = "2.0"
-<

 		*asm.vim* *asmh8300.vim* *nasm.vim* *masm.vim* *asm68k*
 ASSEMBLY	*ft-asm-syntax* *ft-asmh8300-syntax* *ft-nasm-syntax*
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@ -477,6 +477,8 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 'msm'	options.txt	/*'msm'*
 'mzq'	options.txt	/*'mzq'*
 'mzquantum'	options.txt	/*'mzquantum'*
+'mzschemedll'	options.txt	/*'mzschemedll'*
+'mzschemegcdll'	options.txt	/*'mzschemegcdll'*
 'nf'	options.txt	/*'nf'*
 'noacd'	options.txt	/*'noacd'*
 'noai'	options.txt	/*'noai'*
@ -976,6 +978,7 @@ $VIM_POSIX	vi_diff.txt	/*$VIM_POSIX*
 't_PS'	term.txt	/*'t_PS'*
 't_RB'	term.txt	/*'t_RB'*
 't_RC'	term.txt	/*'t_RC'*
+'t_RF'	term.txt	/*'t_RF'*
 't_RI'	term.txt	/*'t_RI'*
 't_RS'	term.txt	/*'t_RS'*
 't_RV'	term.txt	/*'t_RV'*
@ -3654,6 +3657,8 @@ Cmd-event	autocmd.txt	/*Cmd-event*
 CmdUndefined	autocmd.txt	/*CmdUndefined*
 Cmdline	cmdline.txt	/*Cmdline*
 Cmdline-mode	cmdline.txt	/*Cmdline-mode*
+CmdlineEnter	autocmd.txt	/*CmdlineEnter*
+CmdlineLeave	autocmd.txt	/*CmdlineLeave*
 CmdwinEnter	autocmd.txt	/*CmdwinEnter*
 CmdwinLeave	autocmd.txt	/*CmdwinLeave*
 ColorScheme	autocmd.txt	/*ColorScheme*
@ -3756,7 +3761,6 @@ E169	message.txt	/*E169*
 E17	message.txt	/*E17*
 E170	eval.txt	/*E170*
 E171	eval.txt	/*E171*
-E172	message.txt	/*E172*
 E173	message.txt	/*E173*
 E174	map.txt	/*E174*
 E175	map.txt	/*E175*
@ -6524,6 +6528,7 @@ ga	various.txt	/*ga*
 garbagecollect()	eval.txt	/*garbagecollect()*
 gd	pattern.txt	/*gd*
 gdb	debug.txt	/*gdb*
+gdb-version	terminal.txt	/*gdb-version*
 ge	motion.txt	/*ge*
 get()	eval.txt	/*get()*
 get-ms-debuggers	debug.txt	/*get-ms-debuggers*
@ -7800,6 +7805,7 @@ option-summary	options.txt	/*option-summary*
 option-window	options.txt	/*option-window*
 options	options.txt	/*options*
 options-changed	version5.txt	/*options-changed*
+options-in-terminal	terminal.txt	/*options-in-terminal*
 options.txt	options.txt	/*options.txt*
 optwin	options.txt	/*optwin*
 or()	eval.txt	/*or()*
@ -8618,6 +8624,7 @@ t_PE	term.txt	/*t_PE*
 t_PS	term.txt	/*t_PS*
 t_RB	term.txt	/*t_RB*
 t_RC	term.txt	/*t_RC*
+t_RF	term.txt	/*t_RF*
 t_RI	term.txt	/*t_RI*
 t_RS	term.txt	/*t_RS*
 t_RV	term.txt	/*t_RV*
@ -9115,8 +9122,9 @@ v:t_none	eval.txt	/*v:t_none*
 v:t_number	eval.txt	/*v:t_number*
 v:t_string	eval.txt	/*v:t_string*
 v:termblinkresp	eval.txt	/*v:termblinkresp*
+v:termrbgresp	eval.txt	/*v:termrbgresp*
 v:termresponse	eval.txt	/*v:termresponse*
-v:termrgbresp	eval.txt	/*v:termrgbresp*
+v:termrfgresp	eval.txt	/*v:termrfgresp*
 v:termstyleresp	eval.txt	/*v:termstyleresp*
 v:termu7resp	eval.txt	/*v:termu7resp*
 v:testing	eval.txt	/*v:testing*
@ -9401,6 +9409,8 @@ wildmenumode()	eval.txt	/*wildmenumode()*
 win32	os_win32.txt	/*win32*
 win32-!start	gui_w32.txt	/*win32-!start*
 win32-PATH	os_win32.txt	/*win32-PATH*
+win32-backslashes	os_win32.txt	/*win32-backslashes*
+win32-cmdargs	os_win32.txt	/*win32-cmdargs*
 win32-colors	gui_w32.txt	/*win32-colors*
 win32-compiling	os_win32.txt	/*win32-compiling*
 win32-curdir	os_win32.txt	/*win32-curdir*
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@ -1,4 +1,4 @@
-*tagsrch.txt*   For Vim version 8.0.  Last change: 2016 Sep 20
+*tagsrch.txt*   For Vim version 8.0.  Last change: 2017 Oct 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -195,6 +195,7 @@ the same entry.
 			information in the tags file(s).
 			When [ident] is not given, the last tag name from the
 			tag stack is used.
+			See |tag-!| for [!].
 			With a '>' in the first column is indicated which is
 			the current position in the list (if there is one).
 			[ident] can be a regexp pattern, see |tag-regexp|.
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@ -1,4 +1,4 @@
-*term.txt*      For Vim version 8.0.  Last change: 2017 Aug 28
+*term.txt*      For Vim version 8.0.  Last change: 2017 Oct 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@ -327,6 +327,7 @@ Added by Vim (there are no standard codes for these):
 		|xterm-8bit| |v:termresponse| |'ttymouse'| |xterm-codes|
 	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
 		see |'ambiwidth'|
+	t_RF	request terminal foreground color		*t_RF* *'t_RF'*
 	t_RB	request terminal background color		*t_RB* *'t_RB'*
 	t_8f	set foreground color (R, G, B)			*t_8f* *'t_8f'*
 		|xterm-true-color|
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@ -1,4 +1,4 @@
-*terminal.txt*	For Vim version 8.0.  Last change: 2017 Sep 26
+*terminal.txt*	For Vim version 8.0.  Last change: 2017 Oct 29


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -84,7 +84,7 @@ These are defined like any mapping, but apply only when typing keys that are
 sent to the job running in the terminal.  For example, to make Escape switch
 to Terminal-Normal mode: >
   tnoremap <Esc> <C-W>N
-
+<							*options-in-terminal*
 After opening the terminal window and setting 'buftype' to "terminal" the
 BufWinEnter autocommand event is triggered.  This makes it possible to set
 options specifically for the window and buffer.  Example: >
@ -472,8 +472,11 @@ Customizing ~
 To change the name of the gdb command, set the "termdebugger" variable before
 invoking `:Termdebug`: >
 	let termdebugger = "mygdb"
+<						*gdb-version*
 Only debuggers fully compatible with gdb will work.  Vim uses the GDB/MI
-interface.  This probably requires gdb version 7.12.
+interface.  This probably requires gdb version 7.12.  if you get this error:
+	Undefined command: "new-ui". Try "help".~
+Then your gdb is too old.

 The color of the signs can be adjusted with these highlight groups:
 - debugPC		the current position
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 8.0.  Last change: 2017 Sep 27
+*todo.txt*      For Vim version 8.0.  Last change: 2017 Nov 02


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@ -7,9 +7,9 @@
 			      TODO list for Vim		*todo*

 This is a veeeery long list of known bugs, current work and desired
-improvements.  To make it a little bit accessible, the items are grouped by
-subject.  In the first column of the line a classification is used to be able
-to look for "the next thing to do":
+improvements.  To make it a little bit accessible, the older items are grouped
+by subject.  In the first column of the line a classification is used to be
+able to look for "the next thing to do":

 Priority classification:
 9   next point release
@ -35,14 +35,6 @@ entered there will not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------

-MS-Windows build and installer improvements:
- Switch to VC2015 for building. (Ken Takata, 2017 Sep 21)
-  Check resulting binary on XP.
- Patch to install 32 and 64 bit Gvimext and related dll files. (Ken Takata,
-  2017 Sep 23, #2144)
-
-:term hangs in Athena and Motif. (Kazunobu Kuriyama, 2017 Sep 17)
-
 Universal solution to detect if t_RS is working, using cursor position.
 Koichi Iwamoto, #2126

@ -154,49 +146,38 @@ Suggested by Hiroki Kokubun:
 - [hybrid](https://github.com/w0ng/vim-hybrid)
 Include solarized color scheme?

+Compiler warnings (geeknik, 2017 Oct 26):
+- signed integer overflow in do_sub() (#2249)
+- signed integer overflow in get_address() (#2248)
+- signed integer overflow in getdecchrs() (#2254)
+- signed integer overflow in nfa_regatom() (#2251)
+- undefined left shift in get_string_tv() (#2250)
+
+Patch to recognize neumutt temp files. (Teubel György, 2017 Oct 31, #2269)
+
 When starting with --clean packages under "start" are not loaded.  Make this
 work:  :packadd START {name}  similar to :runtime START name

 When using :packadd files under "later" are not used, which is inconsistent
 with packages under "start". (xtal8, #1994)

+Patch to test autocommand effects. (James McCoy, 2017 Oct 31, #2271)
+
 After 8.0.0962 pasting leaves the cursor in another position. (Ken Takata,
 2017 Aug 23, #2015) Also (zdm, 2017 Aug 23)

-Patch to fix popup menu drawing when changing the window size. (Ozaki Kiichi,
-2017 Sep 17, #2110)
-
-Patch to fix cursor highlighting with match. (Ozaki Kiichi, 2017 Sep 17,
-#2111)
-
-Patch for not profiling the first line of a script. (Lemonboy, 2017 Sep 17,
-#2103)
-
-Mac Terminal.app: ctermbg=15 gives light grey instead of white.
-ctermbg=256 breaks clearing till end of the line.  Both work fine in xterm.
-
-Patch to avoid `rb_load_protect` as a workaround not to crash (#2147)
-
-Patch for drag&drop reordering of GUI tab pages reordering.
-(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
-Now on Git: https://gist.github.com/nocd5/165286495c782b815b94
-Update 2016 Aug 10.
-
-Using ":hi" causes a redraw, but a redraw may update the status line, which
-may trigger a ":hi" command.
-
-Last line not in profile if it is a continuation line. (LemonBoy, 2017 Sep 17,
-#2112)
+fold at end of the buffer behaves inconsistently. (James McCoy, 2017 Oct 9)

 With foldmethod=syntax and nofoldenable comment highlighting isn't removed.
 (Marcin Szewczyk, 2017 Apr 26)

-Patch to make Mac features more clear and add "macdarwin". (Kazunobu Kuriyama,
-2017 Sep 5)
-
 Using 'wildignore' also applies to literally entered file name.  Also with
 :drop (remote commands).

+"gvim --remote" from a directory with non-word characters changes the current
+directory (Paulo Marcel Coelho Arabic, 2017 Oct 30, #2266)
+Also see #1689.
+
 ml_get error when using a Python. (Yggdroot, 2017 Jun 1, #1737)
 Lemonboy can reproduce (2017 Jun 5)

@ -204,17 +185,25 @@ ml_get errors with buggy script. (Dominique, 2017 Apr 30)

 Error in emsg with buggy script. (Dominique, 2017 Apr 30)

-Patch to make ":set scroll&" work properly. (Ozaki Kiichi, 2017 Sep 17, #2104)
+When a timer is running and typing CTRL-R on the command line, it is not
+redrawn properly. (xtal8, 2017 Oct 23, #2241)

-mswin.vim should not map CTRL-F in the console (#2093)
-Patch from Christian, 2017 Sep 15.
-Installer patch from Ken Takata, link on #2093.
+Patch for manpager plugin. (Lcd, 2017 Oct 12)
+Asked maintainer.

 Default install on MS-Windows should source defaults.vim.
 Ask whether to use Windows or Vim key behavior?

+When using command line window, CmdlineLeave is triggered without
+CmdlineEnter.  (xtal8, 2017 Oct 30, #2263)
+Add some way to get the nested state.  Although CmdwinEnter is obviously
+always nested.
+
 matchit hasn't been maintained for a long time.  #955.

+MS-Windows: buffer completetion doesn't work when using backslash (or slash)
+for a path separator. (xtal8, #2201)
+
 Test runtime files.
 Start with filetype detection: testdir/test_filetype.vim

@ -236,6 +225,17 @@ line breaks. (Ken Takata, 2017 Aug 22)
 This example in the help does not work (Andy Wokula, 2017 Aug 20):
    augroup mine | au! BufRead | augroup END

+24 bit color support in MS-Windows console, using vcon. (Nobuhiro Takasaki,
+2017 Oct 1, #2060).  Should not set 'tgc' automatically.
+
+Patch to change GUI behavior: instead of changing the window size change the
+lines/columns when menu/toolbar/etc. is added/removed. (Ychin, 2016 Mar 20,
+#703)
+
+Patch to skip globpath() for color schemes, keymaps and compiler settings.
+So that loading menus is faster. (Ken Takata, 2017 Oct 23)
+Update to expand the menus in a CursorHold autocmd. (2017 Oct 25)
+
 Memory leaks in test_channel? (or is it because of fork())
 Memory leak in test_arabic.
 Using uninitialized value in test_crypt.
@ -244,7 +244,7 @@ Patch to make gM move to middle of line. (Yasuhiro Matsumoto, Sep 8, #2070)

 Include Haiku port. (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
 It can replace the BeOS code, which is likely not used anymore.
-Now on github: #1856.
+Now on github: #1856.  Updated Oct 2017
 Got permission to include this under the Vim license.

 Refactored HTML indent file. (Michael Lee, #1821)
@ -252,6 +252,8 @@ Refactored HTML indent file. (Michael Lee, #1821)
 Test_writefile_fails_conversion failure on Solaris because if different iconv
 behavior.  Skip when "uname" returns "SunOS"? (Pavel Heimlich, #1872)

+'tagrelative' is broken in specific situation. (xaizek, 2017 Oct 19, #2221)
+
 All functions are global, which makes functions like get() and len() awkward.
 For the future use the ~get() and ~len() syntax, e.g.:
    mylist~get(idx)
@ -269,6 +271,9 @@ The ++ options for the :edit command are also useful on the Vim command line.
 Overlong utf-8 sequence is displayed wrong. (Harm te Hennepe, 2017 Sep 14,
 #2089)  Patch with possible solution by Björn Linse.

+The change list index is local to a buffer, but it doesn't make sense using it
+for another buffer.  (lacygoll) Copy w_changelistidx to wininfo_S and back.
+
 X11: Putting more than about 262040 characters of text on the clipboard and
 pasting it in another Vim doesn't work.  (Dominique Pelle, 2008 Aug 21-23)
 clip_x11_request_selection_cb() is called with zero value and length.
@ -292,6 +297,12 @@ terminal.c and then CTRL-N twice.
 Should do current file first and not split it up when more results are found.
 (Also #1890)

+Patch from Christian Brabandt to preserve upper case marks when wiping out a
+buffer. (2013 Dec 9)
+Also fixes #2166?
+
+Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
+
 Python: After "import vim" error messages only show the first line of the
 stack trace. (Yggdroot, 2017 Jul 28, #1887)

@ -406,10 +417,6 @@ Error in test_startup_utf8 on Solaris. (Danek Duvall, 2016 Aug 17)

 Completion for :!cmd shows each match twice. #1435

-Patch to change GUI behavior: instead of changing the window size change the
-lines/columns when menu/toolbar/etc. is added/removed. (Ychin, 2016 Mar 20,
-#703)
-
 GTK: When adding a timer from 'balloonexpr' it won't fire, because
 g_main_context_iteration() doesn't return.  Need to trigger an event when the
 timer expires.
@ -1035,8 +1042,6 @@ Jun 8)
 Bug: Autocompleting ":tag/pat" replaces "/pat" with a match but does not
 insert a space. (Micha Mos, 2014 Nov 7)

-Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
-
 No error for missing endwhile. (ZyX, 2014 Mar 20)

 Patch to make extend() fail early when it might fail at some point.
@ -1182,9 +1187,6 @@ When evaluating expression in backticks, autoload doesn't work.
 Using <nr>ifoobar<esc> can slow down Vim.  Patch by Christian Brabandt, 2013
 Dec 13.

-Patch from Christian Brabandt to preserve upper case marks when wiping out a
-buffer. (2013 Dec 9)
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)

@ -1458,8 +1460,6 @@ Vim using lots of memory when joining lines. (John Little, 2010 Dec 3)
 BT regexp engine: After trying a \@> match and failing, submatches are not
 cleared.  See test64.

-Changes to manpage plugin. (Elias Toivanen, 2011 Jul 25)
-
 Patch to make "z=" work when 'spell' is off.  Does this have nasty side
 effects?  (Christian Brabandt, 2012 Aug 5, Update 2013 Aug 12)
 Would also need to do this for spellbadword() and spellsuggest().
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 8.0.  Last change: 2017 Aug 22
+*usr_41.txt*	For Vim version 8.0.  Last change: 2017 Oct 15

 		     VIM USER MANUAL - by Bram Moolenaar

@ -889,7 +889,7 @@ GUI:						*gui-functions*

 Vim server:					*server-functions*
 	serverlist()		return the list of server names
-	remote_startserve()	run a server
+	remote_startserver()	run a server
 	remote_send()		send command characters to a Vim server
 	remote_expr()		evaluate an expression in a Vim server
 	server2client()		send a reply to a client of a Vim server
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@ -11778,7 +11778,7 @@ Files:      src/os_unix.c
 Patch 7.4.1915
 Problem:    The effect of the PopupMenu autocommand isn't directly visible.
 Solution:   Call gui_update_menus() before displaying the popup menu. (Shane
-            Harper, closs #855)
+            Harper, closes #855)
 Files:      src/menu.c

 Patch 7.4.1916 (after 7.4.1906)
@ -15398,7 +15398,7 @@ Files:      src/testdir/test_undo.vim, src/undo.c
 Patch 8.0.0150
 Problem:    When the pattern of :filter does not have a separator then
            completion of the command fails.
-Solution:   Skip over the pattern. (Ozaki Kiichi, clodes #1299)
+Solution:   Skip over the pattern. (Ozaki Kiichi, closes #1299)
 Files:      src/ex_docmd.c, src/testdir/test_filter_cmd.vim

 Patch 8.0.0151
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Aug 11
+" Last Change:	2017 Nov 02

 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@ -292,14 +292,14 @@ au BufNewFile,BufRead *.bst			setf bst

 " BIND configuration
 " sudoedit uses namedXXXX.conf
-au BufNewFile,BufRead named*.conf,rndc*.conf	setf named
+au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named

 " BIND zone
 au BufNewFile,BufRead named.root		setf bindzone
 au BufNewFile,BufRead *.db			call s:BindzoneCheck('')

 func! s:BindzoneCheck(default)
-  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA'
+  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
    setf bindzone
  elseif a:default != ''
    exe 'setf ' . a:default
@ -1155,8 +1155,8 @@ au BufNewFile,BufRead *.m4
 " MaGic Point
 au BufNewFile,BufRead *.mgp			setf mgp

-" Mail (for Elm, trn, mutt, muttng, rn, slrn)
-au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
+" Mail (for Elm, trn, mutt, muttng, rn, slrn, neomutt)
+au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail

 " Mail aliases
 au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases	setf mailaliases
@ -1354,6 +1354,9 @@ au BufNewFile,BufRead */etc/nanorc,*.nanorc  	setf nanorc
 " Natural
 au BufNewFile,BufRead *.NS[ACGLMNPS]		setf natural

+" Noemutt setup file
+au BufNewFile,BufRead Neomuttrc			setf neomuttrc
+
 " Netrc
 au BufNewFile,BufRead .netrc			setf netrc

@ -1445,6 +1448,9 @@ au BufNewFile,BufRead *.dpr			setf pascal
 " PDF
 au BufNewFile,BufRead *.pdf			setf pdf

+" PCMK - HAE - crm configure edit 
+au BufNewFile,BufRead *.pcmk 			setf pcmk
+
 " Perl
 if has("fname_case")
  au BufNewFile,BufRead *.pl,*.PL		call s:FTpl()
@ -2437,6 +2443,9 @@ au BufNewFile,BufRead *.wbt			setf winbatch
 " WSML
 au BufNewFile,BufRead *.wsml			setf wsml

+" WPL
+au BufNewFile,BufRead *.wpl			setf xml
+
 " WvDial
 au BufNewFile,BufRead wvdial.conf,.wvdialrc	setf wvdial

@ -2717,7 +2726,7 @@ au BufNewFile,BufRead [mM]akefile*		call s:StarSetf('make')
 au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')

 " Mail (also matches muttrc.vim, so this is below the other checks)
-au BufNewFile,BufRead mutt[[:alnum:]._-]\\\{6\}	setf mail
+au BufNewFile,BufRead {neo,}mutt[[:alnum:]._-]\\\{6\}	setf mail

 au BufNewFile,BufRead reportbug-*		call s:StarSetf('mail')

@ -2732,6 +2741,10 @@ au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
 au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
 au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')

+" Neomutt setup file
+au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc*	call s:StarSetf('neomuttrc')
+au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
+
 " Nroff macros
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')

--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jun 12
+" Last Change:	2017 Sep 28

 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@ -35,8 +35,8 @@ if has("vms")
 endif

 " When the matchit plugin is loaded, this makes the % command skip parens and
-" braces in comments.
-let b:match_words = &matchpairs . ',^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
+" braces in comments properly.
+let b:match_words = '^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
 let b:match_skip = 's:comment\|string\|character\|special'

 " Win32 can filter files in the browse dialog
--- a/runtime/ftplugin/gdb.vim
+++ b/runtime/ftplugin/gdb.vim
@ -0,0 +1,12 @@
+" Vim filetype plugin file
+" Language:	gdb
+" Maintainer:	Michaël Peeters <NOSPAMm.vim@noekeon.org>
+" Last Changed: 26 Oct 2017
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#%s
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal cms<"
--- a/runtime/ftplugin/neomuttrc.vim
+++ b/runtime/ftplugin/neomuttrc.vim
@ -0,0 +1,23 @@
+" Vim filetype plugin file
+" Language:             NeoMutt RC File
+" Previous Maintainer:  Guillaume Brogi <gui-gui@netcourrier.com>
+" Latest Revision:      2017-09-17
+" Original version copied from ftplugin/muttrc.vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &l:include = '^\s*source\>'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@ -1,9 +1,10 @@
 " Vim filetype plugin file
 " Language:	python
-" Maintainer:	James Sully <sullyj3@gmail.com>
+" Maintainer:	Tom Picton <tom@tompicton.co.uk>
+" Previous Maintainer: James Sully <sullyj3@gmail.com>
 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change:	Tue, 09 October 2016
-" https://github.com/sullyj3/vim-ftplugin-python
+" Last Change:	Fri, 20 October 2017
+" https://github.com/tpict/vim-ftplugin-python

 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
@ -24,31 +25,51 @@ set wildignore+=*.pyc

 let b:next_toplevel='\v%$\|^(class\|def\|async def)>'
 let b:prev_toplevel='\v^(class\|def\|async def)>'
+let b:next_endtoplevel='\v%$\|\S.*\n+(def\|class)'
+let b:prev_endtoplevel='\v\S.*\n+(def\|class)'
 let b:next='\v%$\|^\s*(class\|def\|async def)>'
 let b:prev='\v^\s*(class\|def\|async def)>'
+let b:next_end='\v\S\n*(%$\|^\s*(class\|def\|async def)\|^\S)'
+let b:prev_end='\v\S\n*(^\s*(class\|def\|async def)\|^\S)'

 execute "nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '". b:next_toplevel."', 'W')<cr>"
 execute "nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "nnoremap <silent> <buffer> ][ :call <SID>Python_jump('n', '". b:next_endtoplevel."', 'W', 0)<cr>"
+execute "nnoremap <silent> <buffer> [] :call <SID>Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0)<cr>"
 execute "nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '". b:next."', 'W')<cr>"
 execute "nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '". b:prev."', 'Wb')<cr>"
+execute "nnoremap <silent> <buffer> ]M :call <SID>Python_jump('n', '". b:next_end."', 'W', 0)<cr>"
+execute "nnoremap <silent> <buffer> [M :call <SID>Python_jump('n', '". b:prev_end."', 'Wb', 0)<cr>"

 execute "onoremap <silent> <buffer> ]] :call <SID>Python_jump('o', '". b:next_toplevel."', 'W')<cr>"
 execute "onoremap <silent> <buffer> [[ :call <SID>Python_jump('o', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "onoremap <silent> <buffer> ][ :call <SID>Python_jump('n', '". b:next_endtoplevel."', 'W', 0)<cr>"
+execute "onoremap <silent> <buffer> [] :call <SID>Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0)<cr>"
 execute "onoremap <silent> <buffer> ]m :call <SID>Python_jump('o', '". b:next."', 'W')<cr>"
 execute "onoremap <silent> <buffer> [m :call <SID>Python_jump('o', '". b:prev."', 'Wb')<cr>"
+execute "onoremap <silent> <buffer> ]M :call <SID>Python_jump('o', '". b:next_end."', 'W', 0)<cr>"
+execute "onoremap <silent> <buffer> [M :call <SID>Python_jump('o', '". b:prev_end."', 'Wb', 0)<cr>"

 execute "xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '". b:next_toplevel."', 'W')<cr>"
 execute "xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "xnoremap <silent> <buffer> ][ :call <SID>Python_jump('n', '". b:next_endtoplevel."', 'W', 0)<cr>"
+execute "xnoremap <silent> <buffer> [] :call <SID>Python_jump('n', '". b:prev_endtoplevel."', 'Wb', 0)<cr>"
 execute "xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '". b:next."', 'W')<cr>"
 execute "xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '". b:prev."', 'Wb')<cr>"
+execute "xnoremap <silent> <buffer> ]M :call <SID>Python_jump('x', '". b:next_end."', 'W', 0)<cr>"
+execute "xnoremap <silent> <buffer> [M :call <SID>Python_jump('x', '". b:prev_end."', 'Wb', 0)<cr>"

 if !exists('*<SID>Python_jump')
-  fun! <SID>Python_jump(mode, motion, flags) range
+  fun! <SID>Python_jump(mode, motion, flags, ...) range
+      let l:startofline = (a:0 >= 1) ? a:1 : 1
+
      if a:mode == 'x'
          normal! gv
      endif

-      normal! 0
+      if l:startofline == 1
+          normal! 0
+      endif

      let cnt = v:count1
      mark '
@ -57,7 +78,9 @@ if !exists('*<SID>Python_jump')
          let cnt = cnt - 1
      endwhile

-      normal! ^
+      if l:startofline == 1
+          normal! ^
+      endif
  endfun
 endif

--- a/runtime/indent/gitolite.vim
+++ b/runtime/indent/gitolite.vim
@ -1,8 +1,10 @@
 " Vim indent file
 " Language:	gitolite configuration
-" URL:		https://github.com/tmatilai/gitolite.vim
-" Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>
-" Last Change:	2017 Jun 13
+" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/vim/indent/gitolite.vim
+"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/indent/gitolite.vim)
+" Maintainer:	Sitaram Chamarty <sitaramc@gmail.com>
+" (former Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>)
+" Last Change:	2017 Oct 05

 if exists("b:did_indent")
  finish
@ -30,6 +32,8 @@ function! GetGitoliteIndent()
    return shiftwidth()
  elseif cline =~ '^\s*config\s'
    return shiftwidth()
+  elseif cline =~ '^\s*option\s'
+    return shiftwidth()
  elseif pline =~ '^\s*repo\s' && cline =~ '^\s*\(#.*\)\?$'
    return shiftwidth()
  elseif cline =~ '^\s*#'
--- a/runtime/indent/vhdl.vim
+++ b/runtime/indent/vhdl.vim
@ -1,8 +1,8 @@
 " VHDL indent ('93 syntax)
 " Language:    VHDL
 " Maintainer:  Gerald Lai <laigera+vim?gmail.com>
-" Version:     1.60
-" Last Change: 2017 Jun 13
+" Version:     1.62
+" Last Change: 2017 Oct 17
 " URL:         http://www.vim.org/scripts/script.php?script_id=1450

 " only load this indent file when no other was loaded
@ -412,11 +412,12 @@ function GetVHDLindent()

  " ****************************************************************************************
  " indent:   maintain indent of previous opening statement
-  " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$
+  " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + "in", "out", "inout", "buffer", "linkage", variable & ":="
  " where:    start of current line
-  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
+  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\w\+\s\+:=\)'
    return ind2
  endif
+
  " ****************************************************************************************
  " indent:     maintain indent of previous opening statement, corner case which
  "             does not end in ;, but is part of a mapping
@ -424,10 +425,10 @@ function GetVHDLindent()
  "             prevline without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$
  " where:      start of current line
  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*[^;].*$'
-      if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
-         return ind2
-     endif
- endif
+    if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
+      return ind2
+    endif
+  endif

  " return leftover filtered indent
  return ind
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Sep 10
+" Last Change:	2017 Oct 19

 " If there already is an option window, jump to that one.
 let buf = bufnr('option-window')
@ -1360,6 +1360,12 @@ if exists("&tcldll")
  call append("$", "tcldll\tname of the Tcl dynamic library")
  call <SID>OptionG("tcldll", &tcldll)
 endif
+if exists("&mzschemedll")
+  call append("$", "mzschemedll\tname of the Tcl dynamic library")
+  call <SID>OptionG("mzschemedll", &mzschemedll)
+  call append("$", "mzschemegcdll\tname of the Tcl GC dynamic library")
+  call <SID>OptionG("mzschemegcdll", &mzschemegcdll)
+endif

 set cpo&vim

--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@ -95,6 +95,7 @@ func s:StartDebug(cmd)
  let s:gdbwin = win_getid(winnr())

  " Connect gdb to the communication pty, using the GDB/MI interface
+  " If you get an error "undefined command" your GDB is too old.
  call term_sendkeys(gdbbuf, 'new-ui mi ' . commpty . "\r")

  " Sign used to highlight the line where the program has stopped.
@ -299,6 +300,7 @@ func s:HandleCursor(msg)
 	  endif
 	endif
 	exe lnum
+	exe 'sign unplace ' . s:pc_id
 	exe 'sign place ' . s:pc_id . ' line=' . lnum . ' name=debugPC file=' . fname
 	setlocal signcolumn=yes
      endif
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2016 Feb 16
+" Last Change: 2017 Sep 30

 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
@ -186,9 +186,23 @@ function! s:Highlight_Matching_Pair()
 endfunction

 " Define commands that will disable and enable the plugin.
-command! NoMatchParen windo silent! call matchdelete(3) | unlet! g:loaded_matchparen |
-	  \ au! matchparen
-command! DoMatchParen runtime plugin/matchparen.vim | windo doau CursorMoved
+command! DoMatchParen call s:DoMatchParen()
+command! NoMatchParen call s:NoMatchParen()
+
+func! s:NoMatchParen()
+  let w = winnr()
+  noau windo silent! call matchdelete(3)
+  unlet! g:loaded_matchparen
+  exe "noau ". w . "wincmd w"
+  au! matchparen
+endfunc
+
+func! s:DoMatchParen()
+  runtime plugin/matchparen.vim
+  let w = winnr()
+  silent windo doau CursorMoved
+  exe "noau ". w . "wincmd w"
+endfunc

 let &cpo = s:cpo_save
 unlet s:cpo_save
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@ -324,7 +324,7 @@ else
    set ft=sindacmp

    " DNS zone files
-  elseif s:line1.s:line2.s:line3.s:line4 =~# '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA'
+  elseif s:line1.s:line2.s:line3.s:line4 =~# '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
    set ft=bindzone

    " BAAN
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@ -2,7 +2,7 @@
 " This file is normally sourced from menu.vim.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Aug 13
+" Last Change:	2017 Oct 28

 " Define the SetSyn function, used for the Syntax menu entries.
 " Set 'filetype' and also 'syntax' if it is manually selected.
@ -351,12 +351,13 @@ an 50.70.510 &Syntax.M.Muttrc :cal SetSyn("muttrc")<CR>
 an 50.80.100 &Syntax.NO.Nanorc :cal SetSyn("nanorc")<CR>
 an 50.80.110 &Syntax.NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
 an 50.80.120 &Syntax.NO.Natural :cal SetSyn("natural")<CR>
-an 50.80.130 &Syntax.NO.Netrc :cal SetSyn("netrc")<CR>
-an 50.80.140 &Syntax.NO.Ninja :cal SetSyn("ninja")<CR>
-an 50.80.150 &Syntax.NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
-an 50.80.160 &Syntax.NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
-an 50.80.170 &Syntax.NO.Nroff :cal SetSyn("nroff")<CR>
-an 50.80.180 &Syntax.NO.NSIS\ script :cal SetSyn("nsis")<CR>
+an 50.80.130 &Syntax.NO.Neomuttrc :cal SetSyn("neomuttrc")<CR>
+an 50.80.140 &Syntax.NO.Netrc :cal SetSyn("netrc")<CR>
+an 50.80.150 &Syntax.NO.Ninja :cal SetSyn("ninja")<CR>
+an 50.80.160 &Syntax.NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
+an 50.80.170 &Syntax.NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
+an 50.80.180 &Syntax.NO.Nroff :cal SetSyn("nroff")<CR>
+an 50.80.190 &Syntax.NO.NSIS\ script :cal SetSyn("nsis")<CR>
 an 50.80.200 &Syntax.NO.Obj\ 3D\ wavefront :cal SetSyn("obj")<CR>
 an 50.80.210 &Syntax.NO.Objective\ C :cal SetSyn("objc")<CR>
 an 50.80.220 &Syntax.NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@ -2,7 +2,7 @@
 " Language:	BibTeX (bibliographic database format for (La)TeX)
 " Maintainer:	Bernd Feige <Bernd.Feige@gmx.net>
 " Filenames:	*.bib
-" Last Change:	2016 Sep 12
+" Last Change:	2017 Sep 29

 " Thanks to those who pointed out problems with this file or supplied fixes!

@ -81,16 +81,18 @@ syn match bibUnescapedSpecial contained /[^\\][%&]/hs=s+1
 syn match bibKey contained /\s*[^ \t}="]\+,/hs=s,he=e-1 nextgroup=bibField
 syn match bibVariable contained /[^{}," \t=]/
 syn region bibComment start=/./ end=/^\s*@/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
-syn region bibMath contained start=/\$/ end=/\$/ skip=/\(\\\$\)/
+syn region bibMath contained start=/\(\\\)\@<!\$/ end=/\$/ skip=/\(\\\$\)/
 syn region bibQuote contained start=/"/ end=/"/ skip=/\(\\"\)/ contains=@bibVarContents
 syn region bibBrace contained start=/{/ end=/}/ skip=/\(\\[{}]\)/ contains=@bibVarContents
 syn region bibParen contained start=/(/ end=/)/ skip=/\(\\[()]\)/ contains=@bibVarContents
 syn region bibField contained start="\S\+\s*=\s*" end=/[}),]/me=e-1 contains=bibEntryKw,bibNSEntryKw,bibBrace,bibParen,bibQuote,bibVariable
-syn region bibEntryData contained start=/[{(]/ms=e+1 end=/[})]/me=e-1 contains=bibKey,bibField
+syn region bibEntryData contained start=/[{(]/ms=e+1 end=/[})]/me=e-1 contains=bibKey,bibField,bibComment3
 " Actually, 5.8 <= Vim < 6.0 would ignore the `fold' keyword anyway, but Vim<5.8 would produce
 " an error, so we explicitly distinguish versions with and without folding functionality:
 syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent fold contains=bibType,bibEntryData nextgroup=bibComment
 syn region bibComment2 start=/@Comment\s*[{(]/ end=/^\s*[})]/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
+" biblatex style comments inside a bibEntry
+syn match bibComment3 "%.*"

 " Synchronization
 " ===============
@ -111,6 +113,7 @@ hi def link bibVariable	Constant
 hi def link bibUnescapedSpecial	Error
 hi def link bibComment	Comment
 hi def link bibComment2	Comment
+hi def link bibComment3	Comment

 let b:current_syntax = "bib"

--- a/runtime/syntax/gitolite.vim
+++ b/runtime/syntax/gitolite.vim
@ -1,8 +1,10 @@
 " Vim syntax file
 " Language:	gitolite configuration
-" URL:		https://github.com/tmatilai/gitolite.vim
-" Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>
-" Last Change:	2011-12-25
+" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/vim/syntax/gitolite.vim
+"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/syntax/gitolite.vim)
+" Maintainer:	Sitaram Chamarty <sitaramc@gmail.com>
+" (former Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>)
+" Last Change:	2017 Oct 05

 if exists("b:current_syntax")
  finish
@ -11,74 +13,80 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim

-" Comment
-syn match	gitoliteComment		"\(^\|\s\)#.*" contains=gitoliteTodo
-syn keyword	gitoliteTodo		TODO FIXME XXX NOT contained
+" this seems to be the best way, for now.
+syntax sync fromstart

-" Groups, users and repos
-syn match	gitoliteGroupDef	"\(^\s*\)\@<=@[^=]\{-1,}\(\s*=\)\@=" contains=gitoliteSpaceError,gitoliteUserError nextgroup=gitoliteGroupDefSep
-syn match	gitoliteGroupDefSep	"\s*=" contained nextgroup=gitoliteRepoLine
-syn match	gitoliteRepoDef		"^\s*repo\s" nextgroup=gitoliteRepoLine
+" ---- common stuff

-syn match	gitoliteRepoLine	".*" contained transparent contains=gitoliteGroup,gitoliteWildRepo,gitoliteCreator,gitoliteExtCmdHelper,gitoliteRepoError,gitoliteComment
-syn match	gitoliteUserLine	".*" contained transparent contains=gitoliteGroup,gitolitePreProc,gitoliteUserError,gitoliteComment
+syn match   gitoliteGroup           '@\S\+'

-syn match	gitoliteWildRepo	"[ \t=]\@<=[^ \t]*[\\^$|()[\]*?{},][^ \t]*" contained contains=gitoliteCreator,gitoliteRepoError
-syn match	gitoliteGroup		"[ \t=]\@<=@[^ \t]\+" contained contains=gitoliteUserError
+syn match   gitoliteComment         '#.*' contains=gitoliteTodo
+syn keyword gitoliteTodo            TODO FIXME XXX NOT contained

-syn keyword	gitoliteCreator		CREATER CREATOR contained
-syn keyword	gitolitePreProc		CREATER CREATOR READERS WRITERS contained
+" ---- main section

-syn match	gitoliteExtCmdHelper	"[ \t=]\@<=EXTCMD/" contained nextgroup=gitoliteExtCmd
-syn match	gitoliteExtCmd		"rsync\(\s\|$\)" contained
+" catch template-data syntax appearing outside template-data section
+syn match   gitoliteRepoError       '^\s*repo.*='
+syn match   gitoliteRepoError       '^\s*\S\+\s*='  " this gets overridden later when first word is a perm, don't worry

-" Illegal characters
-syn match	gitoliteRepoError	"[^ \t0-9a-zA-Z._@+/\\^$|()[\]*?{},-]\+" contained
-syn match	gitoliteUserError	"[^ \t0-9a-zA-Z._@+-]\+" contained
-syn match	gitoliteSpaceError	"\s\+" contained
+" normal gitolite group and repo lines
+syn match   gitoliteGroupLine       '^\s*@\S\+\s*=\s*\S.*$' contains=gitoliteGroup,gitoliteComment
+syn match   gitoliteRepoLine        '^\s*repo\s\+[^=]*$' contains=gitoliteRepo,gitoliteGroup,gitoliteComment
+syn keyword gitoliteRepo            repo contained

-" Permission
-syn match	gitoliteKeyword		"^\s*\(C\|R\|RW\|RW+\|RWC\|RW+C\|RWD\|RW+D\|RWCD\|RW+CD\)[ \t=]\@=" nextgroup=gitoliteRefex
-syn match	gitoliteKeyword		"^\s*-[ \t=]\@=" nextgroup=gitoliteDenyRefex
-syn match	gitoliteRefex		"[^=]*="he=e-1 contained contains=gitoliteSpecialRefex,gitoliteGroup nextgroup=gitoliteUserLine
-syn match	gitoliteDenyRefex	"[^=]*="he=e-1 contained contains=gitoliteSpecialRefex,gitoliteGroup nextgroup=gitoliteDenyUsers
-syn match	gitoliteSpecialRefex	"\sNAME/"he=e-1 contained
-syn match	gitoliteSpecialRefex	"/USER/"hs=s+1,he=e-1 contained
-syn match	gitoliteDenyUsers	".*" contained contains=gitoliteUserError,gitoliteComment
+syn keyword gitoliteSpecialRepo     CREATOR

-" Configuration
-syn match	gitoliteKeyword		"^\s*config\s\+" nextgroup=gitoliteConfVariable
-syn match	gitoliteConfVariable	"[^=]*" contained
+" normal gitolite rule lines
+syn match   gitoliteRuleLine        '^\s*\(-\|C\|R\|RW+\?C\?D\?\)\s[^#]*' contains=gitoliteRule,gitoliteCreateRule,gitoliteDenyRule,gitoliteRefex,gitoliteUsers,gitoliteGroup
+syn match   gitoliteRule            '\(^\s*\)\@<=\(-\|C\|R\|RW+\?C\?D\?\)\s\@=' contained
+syn match   gitoliteRefex           '\(^\s*\(-\|R\|RW+\?C\?D\?\)\s\+\)\@<=\S.\{-}\(\s*=\)\@=' contains=gitoliteSpecialRefex
+syn match   gitoliteSpecialRefex    'NAME/'
+syn match   gitoliteSpecialRefex    '/USER/'
+syn match   gitoliteCreateRule      '\(^\s*C\s.*=\s*\)\@<=\S[^#]*[^# ]' contained contains=gitoliteGroup
+syn match   gitoliteDenyRule        '\(^\s*-\s.*=\s*\)\@<=\S[^#]*[^# ]' contained

-" Include
-syn match	gitoliteInclude		"^\s*\(include\|subconf\)\s"
+" normal gitolite config (and similar) lines
+syn match   gitoliteConfigLine      '^\s*\(config\|option\|include\|subconf\)\s[^#]*' contains=gitoliteConfigKW,gitoliteConfigKey,gitoliteConfigVal,gitoliteComment
+syn keyword gitoliteConfigKW        config option include subconf contained
+syn match   gitoliteConfigKey       '\(\(config\|option\)\s\+\)\@<=[^ =]*' contained
+syn match   gitoliteConfigVal       '\(=\s*\)\@<=\S.*' contained

-" String
-syn region	gitoliteString		start=+"+ end=+"+ oneline
+" ---- template-data section

-" Define the default highlighting
-hi def link gitoliteComment		Comment
-hi def link gitoliteTodo		Todo
-hi def link gitoliteGroupDef		gitoliteGroup
-hi def link gitoliteGroup		Identifier
-hi def link gitoliteWildRepo		Special
-hi def link gitoliteRepoError		gitoliteError
-hi def link gitoliteUserError		gitoliteError
-hi def link gitoliteSpaceError		gitoliteError
-hi def link gitoliteError		Error
-hi def link gitoliteCreator		gitolitePreProc
-hi def link gitolitePreProc		PreProc
-hi def link gitoliteExtCmdHelper	PreProc
-hi def link gitoliteExtCmd		Special
-hi def link gitoliteRepoDef		Type
-hi def link gitoliteKeyword		Keyword
-hi def link gitoliteRefex		String
-hi def link gitoliteDenyRefex		gitoliteRefex
-hi def link gitoliteSpecialRefex	PreProc
-hi def link gitoliteDenyUsers		WarningMsg
-hi def link gitoliteConfVariable	Identifier
-hi def link gitoliteInclude		Include
-hi def link gitoliteString		String
+syn region  gitoliteTemplateLine    matchgroup=PreProc start='^=begin template-data$' end='^=end$' contains=gitoliteTplRepoLine,gitoliteTplRoleLine,gitoliteGroup,gitoliteComment,gitoliteTplError
+
+syn match   gitoliteTplRepoLine     '^\s*repo\s\+\S.*=.*' contained contains=gitoliteTplRepo,gitoliteTplTemplates,gitoliteGroup
+syn keyword gitoliteTplRepo         repo contained
+syn match   gitoliteTplTemplates    '\(=\s*\)\@<=\S.*' contained contains=gitoliteGroup,gitoliteComment
+
+syn match   gitoliteTplRoleLine     '^\s*\S\+\s*=\s*.*' contained contains=gitoliteTplRole,gitoliteGroup,gitoliteComment
+syn match   gitoliteTplRole         '\S\+\s*='he=e-1 contained
+
+" catch normal gitolite rules appearing in template-data section
+syn match   gitoliteTplError        '^\s*repo[^=]*$' contained
+syn match   gitoliteTplError        '^\s*\(-\|R\|RW+\?C\?D\?\)\s'he=e-1 contained
+syn match   gitoliteTplError        '^\s*\(config\|option\|include\|subconf\)\s'he=e-1 contained
+syn match   gitoliteTplError        '^\s*@\S\+\s*=' contained contains=NONE
+
+hi def link gitoliteGroup           Identifier
+hi def link gitoliteComment         Comment
+hi def link gitoliteTodo            ToDo
+hi def link gitoliteRepoError       Error
+hi def link gitoliteGroupLine       PreProc
+hi def link gitoliteRepo            Keyword
+hi def link gitoliteSpecialRepo     PreProc
+hi def link gitoliteRule            Keyword
+hi def link gitoliteCreateRule      PreProc
+hi def link gitoliteDenyRule        WarningMsg
+hi def link gitoliteRefex           Constant
+hi def link gitoliteSpecialRefex    PreProc
+hi def link gitoliteConfigKW        Keyword
+hi def link gitoliteConfigKey       Identifier
+hi def link gitoliteConfigVal       String
+hi def link gitoliteTplRepo         Keyword
+hi def link gitoliteTplTemplates    Constant
+hi def link gitoliteTplRole         Constant
+hi def link gitoliteTplError        Error

 let b:current_syntax = "gitolite"

--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2017 Jun 13
+" Last Change:	2017 Oct 19

 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@ -60,6 +60,7 @@ syn match helpSpecial		"\<N\>"
 syn match helpSpecial		"\<N\.$"me=e-1
 syn match helpSpecial		"\<N\.\s"me=e-2
 syn match helpSpecial		"(N\>"ms=s+1
+
 syn match helpSpecial		"\[N]"
 " avoid highlighting N  N in help.txt
 syn match helpSpecial		"N  N"he=s+1
@ -85,6 +86,9 @@ syn match helpSpecial		"\[arguments]"
 syn match helpSpecial		"\[ident]"
 syn match helpSpecial		"\[addr]"
 syn match helpSpecial		"\[group]"
+" Don't highlight [converted] and others that do not have a tag
+syn match helpNormal		"\[\(readonly\|fifo\|socket\|converted\|crypted\)]"
+
 syn match helpSpecial		"CTRL-."
 syn match helpSpecial		"CTRL-Break"
 syn match helpSpecial		"CTRL-PageUp"
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@ -3,8 +3,9 @@
 " Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2017 Jan 21
-"                       included patch from Jorge Maldonado Ventura
+" Last Change:          2017 Sep 30
+" included patch from Christian Brabandt to make use of the strikethrough attributes
+"

 " Please check :help html.vim for some comments and a description of the options

@ -45,13 +46,13 @@ syn keyword htmlTagName contained cite code dd dfn dir div dl dt font
 syn keyword htmlTagName contained form hr html img
 syn keyword htmlTagName contained input isindex kbd li link map menu
 syn keyword htmlTagName contained meta ol option param pre p samp span
-syn keyword htmlTagName contained select small strike sub sup
+syn keyword htmlTagName contained select small sub sup
 syn keyword htmlTagName contained table td textarea th tr tt ul var xmp
 syn match htmlTagName contained "\<\(b\|i\|u\|h[1-6]\|em\|strong\|head\|body\|title\)\>"

 " new html 4.0 tags
 syn keyword htmlTagName contained abbr acronym bdo button col label
-syn keyword htmlTagName contained colgroup del fieldset iframe ins legend
+syn keyword htmlTagName contained colgroup fieldset iframe ins legend
 syn keyword htmlTagName contained object optgroup q s tbody tfoot thead

 " new html 5 tags
@ -135,6 +136,9 @@ if !exists("html_no_rendering")
  " rendering
  syn cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,javaScript,@htmlPreproc

+  syn region htmlStrike start="<del\>" end="</del>"me=e-6 contains=@htmlTop
+  syn region htmlStrike start="<strike\>" end="</strike>"me=e-9 contains=@htmlTop
+
  syn region htmlBold start="<b\>" end="</b>"me=e-4 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
  syn region htmlBold start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
  syn region htmlBoldUnderline contained start="<u\>" end="</u>"me=e-4 contains=@htmlTop,htmlBoldUnderlineItalic
@ -268,6 +272,11 @@ if !exists("html_no_rendering")
    hi def htmlUnderline           term=underline cterm=underline gui=underline
    hi def htmlUnderlineItalic     term=italic,underline cterm=italic,underline gui=italic,underline
    hi def htmlItalic              term=italic cterm=italic gui=italic
+    if v:version > 800 || v:version == 800 && has("patch1038")
+        hi def htmlStrike              term=strikethrough cterm=strikethrough gui=strikethrough
+    else
+        hi def htmlStrike              term=underline cterm=underline gui=underline
+    endif
  endif
 endif

--- a/runtime/syntax/neomuttrc.vim
+++ b/runtime/syntax/neomuttrc.vim
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@ -6,8 +6,8 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2016 Dec 28
-" SSH Version:	7.4p1
+" Last Change:	2017 Oct 25
+" SSH Version:	7.6p1
 "

 " Setup
@ -224,7 +224,6 @@ syn keyword sshdconfigKeyword TrustedUserCAKeys
 syn keyword sshdconfigKeyword UseDNS
 syn keyword sshdconfigKeyword UseLogin
 syn keyword sshdconfigKeyword UsePAM
-syn keyword sshdconfigKeyword UsePrivilegeSeparation
 syn keyword sshdconfigKeyword VersionAddendum
 syn keyword sshdconfigKeyword X11DisplayOffset
 syn keyword sshdconfigKeyword X11Forwarding
--- a/runtime/tutor/tutor.pt
+++ b/runtime/tutor/tutor.pt
@ -455,8 +455,8 @@ de Inser

  4. Mova o cursor at<61> o primeiro erro.

-  5. Digite  c$  para tornar o resto da linha igual <20> segunda e pressione
-     <ESC>.
+  5. Digite  c$  e digite o resto da segunda para torn<72>-las iguais e 
+     pressione  <ESC>.

 ---> O fim desta linha precisa de ajuda para ficar igual <20> segunda.
 ---> O fim desta linha precisa ser corrigido usando o comando  c$.
--- a/runtime/tutor/tutor.pt.utf-8
+++ b/runtime/tutor/tutor.pt.utf-8
@ -455,8 +455,8 @@ de Inserção.

  4. Mova o cursor até o primeiro erro.

-  5. Digite  c$  para tornar o resto da linha igual à segunda e pressione
-     <ESC>.
+  5. Digite  c$  e digite o resto da segunda linha para torná-las iguais e 
+     pressione <ESC>.

 ---> O fim desta linha precisa de ajuda para ficar igual à segunda.
 ---> O fim desta linha precisa ser corrigido usando o comando  c$.
--- a/src/po/check.vim
+++ b/src/po/check.vim
@ -146,7 +146,10 @@ endwhile
 " Check that the file is well formed according to msgfmts understanding
 if executable("msgfmt")
  let filename = expand("%")
-  let a = system("msgfmt --statistics OLD_PO_FILE_INPUT=yes " . filename)
+  " Newer msgfmt does not take OLD_PO_FILE_INPUT argument, must be in
+  " environment.
+  let $OLD_PO_FILE_INPUT = 'yes'
+  let a = system("msgfmt --statistics " . filename)
  if v:shell_error != 0
    let error = matchstr(a, filename.':\zs\d\+\ze:')+0
    for line in split(a, '\n') | echomsg line | endfor
--- a/src/po/de.po
+++ b/src/po/de.po
@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(deutsch)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-01 14:56+0200\n"
+"POT-Creation-Date: 2017-10-15 22:00+0200\n"
 "PO-Revision-Date: 2008-05-24 17:26+0200\n"
 "Last-Translator: Christian Brabandt\n"
 "Language-Team: German <de@li.org>\n"
@ -106,6 +106,18 @@ msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
 "E89: Puffer %ld seit der letzten <20>nderung nicht gesichert (erzwinge mit !)"

+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: Job l<>uft noch (Beenden mit !)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Kein Schreibvorgang seit der letzten <20>nderung (erzwinge mit !)"
+
+msgid "E948: Job still running"
+msgstr "E948: Job l<>uft noch"
+
+msgid "E37: No write since last change"
+msgstr "E37: Nicht geschrieben seit letzter <20>nderung"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Achtung: <20>berlauf der Dateinamensliste."

@ -1142,8 +1154,8 @@ msgstr "E750: Benutze vorher :profile start <fname>"
 msgid "Save changes to \"%s\"?"
 msgstr "<22>nderungen in \"%s\" speichern?"

-msgid "Untitled"
-msgstr "Unbenannt"
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: Job noch aktiv in Puffer \"%s\""

 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
@ -1501,6 +1513,9 @@ msgstr "E500: Ergibt eine leere Zeichenkette"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo kann nicht zum Lesen ge<67>ffnet werden."

+msgid "Untitled"
+msgstr "Unbenannt"
+
 msgid "E196: No digraphs in this version"
 msgstr "E196: Keine Digraphen in dieser Version."

@ -3875,6 +3890,10 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "Rei<65>e dieses Men<65> ab"

+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: Men<65> ist f<>r Modus %s nicht definiert"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Men<65>-Pfad muss zu einem Men<65>punkt f<>hren"

@ -3882,10 +3901,6 @@ msgstr "E333: Men
 msgid "E334: Menu not found: %s"
 msgstr "E334: Men<65> nicht gefunden: %s"

-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Men<65> ist f<>r Modus %s nicht definiert"
-
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Men<65>-Pfad muss zum Untermen<65> f<>hren"

@ -4262,9 +4277,6 @@ msgstr ""
 msgid "(+%ld for BOM)"
 msgstr "(+%ld f<>r BOM)"

-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Seite %N"
-
 msgid "Thanks for flying Vim"
 msgstr "Danke f<>r die Benutzung von Vim"

@ -5775,6 +5787,9 @@ msgstr "Terminal"
 msgid "Terminal-finished"
 msgstr "Terminal beendet"

+msgid "active"
+msgstr "aktiv"
+
 msgid "running"
 msgstr "F<>hre aus"

@ -6637,12 +6652,6 @@ msgstr "E484: Kann die Datei %s nicht
 msgid "E485: Can't read file %s"
 msgstr "E485: Kann Datei %s nicht lesen"

-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Kein Schreibvorgang seit der letzten <20>nderung (erzwinge mit !)"
-
-msgid "E37: No write since last change"
-msgstr "E37: Nicht geschrieben seit letzter <20>nderung"
-
 msgid "E38: Null argument"
 msgstr "E38: Null-Argument"

--- a/src/po/eo.po
+++ b/src/po/eo.po
@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-11 23:10+0200\n"
-"PO-Revision-Date: 2017-07-12 05:14+0200\n"
+"POT-Creation-Date: 2017-10-02 22:42+0200\n"
+"PO-Revision-Date: 2017-10-02 22:57+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@ -99,7 +99,6 @@ msgstr "E90: Ne eblas malŝargi la lastan bufron"
 msgid "E84: No modified buffer found"
 msgstr "E84: Neniu modifita bufro trovita"

-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85: Estas neniu listigita bufro"

@ -115,6 +114,18 @@ msgstr ""
 "E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por "
 "transpasi)"

+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: Tasko akoraŭ aktiva (aldonu ! por fini la taskon)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
+
+msgid "E948: Job still running"
+msgstr "E948: Tasko ankoraŭ aktiva"
+
+msgid "E37: No write since last change"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Averto: Listo de dosiernomoj troas"

@ -170,7 +181,6 @@ msgstr "linio %ld de %ld --%d%%-- kol "
 msgid "[No Name]"
 msgstr "[Neniu nomo]"

-#. must be a help buffer
 msgid "help"
 msgstr "helpo"

@ -196,6 +206,9 @@ msgstr ""
 "\n"
 "# Listo de bufroj:\n"

+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
+
 msgid "[Scratch]"
 msgstr "[Malneto]"

@ -363,7 +376,6 @@ msgstr "E791: Malplena rikordo en klavmapo"
 msgid " Keyword completion (^N^P)"
 msgstr " Kompletigo de ŝlosilvorto (^N^P)"

-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " Reĝimo ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"

@ -442,10 +454,6 @@ msgstr "kongruo en dosiero"
 msgid " Adding"
 msgstr " Aldonanta"

-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- Serĉanta..."

@ -466,7 +474,6 @@ msgstr "kongruo %d de %d"
 msgid "match %d"
 msgstr "kongruo %d"

-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""

@ -526,8 +533,6 @@ msgstr "E690: \"in\" mankas malantaŭ \":for\""
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Ne estas tia variablo: \"%s\""

-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: Ne eblas ŝlosi aŭ malŝlosi variablon %s"
@ -700,11 +705,6 @@ msgstr "argumento de add()"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"

-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
 msgid "&Ok"
 msgstr "&Bone"

@ -865,7 +865,6 @@ msgstr " malnovaj dosieroj"
 msgid " FAILED"
 msgstr " MALSUKCESIS"

-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Dosiero viminfo ne skribeblas: %s"
@ -886,7 +885,6 @@ msgstr "Skribas dosieron viminfo \"%s\""
 msgid "E886: Can't rename viminfo file to %s!"
 msgstr "E886: Ne eblas renomi dosieron viminfo al %s!"

-#. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n"
@ -1005,7 +1003,6 @@ msgstr " en 1 linio"
 msgid " on %ld lines"
 msgstr " en %ld linioj"

-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso"

@ -1158,8 +1155,9 @@ msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
 msgid "Save changes to \"%s\"?"
 msgstr "Ĉu konservi ŝanĝojn al \"%s\"?"

-msgid "Untitled"
-msgstr "Sen titolo"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: Tasko ankoraŭ aktiva en la bufro \"%s\""

 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
@ -1199,7 +1197,7 @@ msgstr "W20: Pitono versio 2.x bezonata sed nesubtenata, ignoro de dosiero: %s"

 #, c-format
 msgid "W21: Required python version 3.x not supported, ignoring file: %s"
-msgstr "W21: pitono versio 3.x bezonata sed nesubtenata, ignore de dosiero: %s"
+msgstr "W21: pitono versio 3.x bezonata sed nesubtenata, ignoro de dosiero: %s"

 msgid "Source Vim script"
 msgstr "Ruli Vim-skripton"
@ -1466,7 +1464,6 @@ msgstr "E189: \"%s\" ekzistas (aldonu ! por transpasi)"
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Ne eblas malfermi \"%s\" por skribi"

-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Argumento devas esti litero, citilo aŭ retrocitilo"

@ -1508,13 +1505,15 @@ msgstr "E500: Liveras malplenan ĉenon"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"

+msgid "Untitled"
+msgstr "Sen titolo"
+
 msgid "E196: No digraphs in this version"
 msgstr "E196: Neniu duliteraĵo en tiu versio"

 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Ne eblas lanĉi (:throw) escepton kun prefikso 'Vim'"

-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Escepto lanĉita: %s"
@ -1531,7 +1530,6 @@ msgstr "Escepto ne konservita: %s"
 msgid "%s, line %ld"
 msgstr "%s, linio %ld"

-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Kaptis escepton: %s"
@ -1557,7 +1555,6 @@ msgstr "Eraro kaj interrompo"
 msgid "Error"
 msgstr "Eraro"

-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr "Interrompo"

@ -1600,15 +1597,12 @@ msgstr "E601: \":try\" ingita tro profunde"
 msgid "E603: :catch without :try"
 msgstr "E603: \":catch\" sen \":try\""

-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: \":catch\" malantaŭ \":finally\""

 msgid "E606: :finally without :try"
 msgstr "E606: \":finally\" sen \":try\""

-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607: pluraj \":finally\""

@ -1701,7 +1695,6 @@ msgstr "Vim: Legado el stdin...\n"
 msgid "Reading from stdin..."
 msgstr "Legado el stdin..."

-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverto igis la dosieron nelegebla!"

@ -1907,9 +1900,6 @@ msgstr "[sen EOL]"
 msgid "[Incomplete last line]"
 msgstr "[Nekompleta lasta linio]"

-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "AVERTO: La dosiero estas ŝanĝita de post kiam ĝi estis legita!!!"

@ -1988,7 +1978,6 @@ msgstr "--Forviŝita--"
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"

-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
@ -2011,7 +2000,6 @@ msgstr "E216: Ne estas tia evento: %s"
 msgid "E216: No such group or event: %s"
 msgstr "E216: Ne ekzistas tia grupo aŭ evento: %s"

-#. Highlight title
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@ -2195,18 +2183,15 @@ msgstr "Serĉi kion:"
 msgid "Replace with:"
 msgstr "Anstataŭigi per:"

-#. whole word only button
 msgid "Match whole word only"
 msgstr "Kongrui kun nur plena vorto"

-#. match case button
 msgid "Match case"
 msgstr "Uskleca kongruo"

 msgid "Direction"
 msgstr "Direkto"

-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr "Supren"

@ -2285,8 +2270,6 @@ msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
 msgid "Find & Replace (use '\\\\' to find  a '\\')"
 msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"

-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
 msgid "Not Used"
 msgstr "Ne uzata"

@ -2360,7 +2343,6 @@ msgstr "Vim - Elektilo de tiparo"
 msgid "Name:"
 msgstr "Nomo:"

-#. create toggle button
 msgid "Show size in Points"
 msgstr "Montri grandon en punktoj"

@ -2606,7 +2588,6 @@ msgstr "E261: konekto cscope %s netrovita"
 msgid "cscope connection %s closed"
 msgstr "konekto cscope %s fermita"

-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: neriparebla eraro en cs_manage_matches"

@ -2768,7 +2749,6 @@ msgstr "nevalida numero de bufro"
 msgid "not implemented yet"
 msgstr "ankoraŭ ne realigita"

-#. ???
 msgid "cannot set line(s)"
 msgstr "ne eblas meti la linio(j)n"

@ -2809,7 +2789,6 @@ msgid ""
 msgstr ""
 "ne eblas registri postalvokan komandon: bufro/fenestro estas jam forviŝiĝanta"

-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@ -2913,7 +2892,6 @@ msgstr "Vim: Averto: Eligo ne estas al terminalo\n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Averto: Enigo ne estas el terminalo\n"

-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "komanda linio pre-vimrc"

@ -3179,6 +3157,9 @@ msgstr ""
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tUzi <viminfo> anstataŭ .viminfo"

+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible', defaŭltaj agordoj de Vim, neniu viminfo"
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  aŭ  --help\tAfiŝi Helpon (tiun mesaĝon) kaj eliri"

@ -3279,11 +3260,9 @@ msgstr "--windowid <HWND>\tMalfermi Vim en alia win32 fenestraĵo"
 msgid "No display"
 msgstr "Neniu ekrano"

-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr ": Sendo malsukcesis.\n"

-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr ": Sendo malsukcesis. Provo de loka plenumo\n"

@ -3304,7 +3283,6 @@ msgstr "Neniu marko"
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Neniu marko kongruas kun \"%s\""

-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@ -3312,7 +3290,6 @@ msgstr ""
 "\n"
 "mark linio kol dosiero/teksto"

-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@ -3320,7 +3297,6 @@ msgstr ""
 "\n"
 " salt linio kol dosiero/teksto"

-#. Highlight title
 msgid ""
 "\n"
 "change line  col text"
@ -3335,7 +3311,6 @@ msgstr ""
 "\n"
 "# Markoj de dosiero:\n"

-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@ -3405,7 +3380,6 @@ msgstr "E298: Ĉu ne akiris blokon n-ro 2?"
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843: Eraro dum ĝisdatigo de ĉifrada permutodosiero .swp"

-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ve, perdis la permutodosieron .swp!!!"

@ -3589,7 +3563,6 @@ msgid "Using crypt key from swap file for the text file.\n"
 msgstr ""
 "Uzas ŝlosilon de ĉifrado el permuto dosiero .swp por la teksta dosiero.\n"

-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Permutodosiero .swp trovita:"

@ -3759,8 +3732,6 @@ msgstr "Dum malfermo de dosiero \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLI NOVA ol permutodosiero .swp!\n"

-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@ -3850,7 +3821,6 @@ msgstr "E328: Menuo nur ekzistas en alia reĝimo"
 msgid "E329: No menu \"%s\""
 msgstr "E329: Neniu menuo \"%s\""

-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792: Malplena nomo de menuo"

@ -3863,8 +3833,6 @@ msgstr "E331: Aldono de menueroj direkte al menuzono estas malpermesita"
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Disigilo ne rajtas esti ero de vojo de menuo"

-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@ -3875,6 +3843,10 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "Disigi tiun menuon"

+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: Menuo ne estas difinita por reĝimo %s"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Vojo de menuo devas konduki al menuero"

@ -3882,10 +3854,6 @@ msgstr "E333: Vojo de menuo devas konduki al menuero"
 msgid "E334: Menu not found: %s"
 msgstr "E334: Menuo netrovita: %s"

-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Menuo ne estas difinita por reĝimo %s"
-
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Vojo de menuo devas konduki al sub-menuo"

@ -3957,7 +3925,6 @@ msgstr "Dialogujo de dosiera konservo"
 msgid "Open File dialog"
 msgstr "Dialogujo de dosiera malfermo"

-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"

@ -4125,7 +4092,9 @@ msgid "E663: At end of changelist"
 msgstr "E663: Ĉe fino de ŝanĝlisto"

 msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
-msgstr "Tajpu  :qa!  kaj premu <Enenklavon> por forlasi ĉiujn ŝanĝojn kaj eliri el Vim"
+msgstr ""
+"Tajpu  :qa!  kaj premu <Enenklavon> por forlasi ĉiujn ŝanĝojn kaj eliri el "
+"Vim"

 #, c-format
 msgid "1 line %sed 1 time"
@ -4157,7 +4126,6 @@ msgstr "%ld linioj krommarĝenitaj "
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"

-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "ne eblas kopii; tamen forviŝi"

@ -4172,25 +4140,30 @@ msgstr "%ld linioj ŝanĝitaj"
 msgid "freeing %ld lines"
 msgstr "malokupas %ld liniojn"

-msgid "block of 1 line yanked"
-msgstr "bloko de 1 linio kopiita"
-
-msgid "1 line yanked"
-msgstr "1 linio kopiita"
+#, c-format
+msgid " into \"%c"
+msgstr " en \"%c"

 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloko de %ld linioj kopiita"
+msgid "block of 1 line yanked%s"
+msgstr "bloko de 1 linio kopiita%s"

 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld linioj kopiitaj"
+msgid "1 line yanked%s"
+msgstr "1 linio kopiita%s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "bloko de %ld linioj kopiita%s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld linioj kopiitaj%s"

 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Nenio en reĝistro %s"

-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@ -4251,9 +4224,6 @@ msgstr ""
 msgid "(+%ld for BOM)"
 msgstr "(+%ld por BOM)"

-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Folio %N"
-
 msgid "Thanks for flying Vim"
 msgstr "Dankon pro flugi per Vim"

@ -4361,6 +4331,9 @@ msgstr "E541: tro da elementoj"
 msgid "E542: unbalanced groups"
 msgstr "E542: misekvilibraj grupoj"

+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: Ne eblas igi modifebla terminalon kun aktiva tasko"
+
 msgid "E590: A preview window already exists"
 msgstr "E590: Antaŭvida fenestro jam ekzistas"

@ -4379,9 +4352,6 @@ msgstr "E594: Bezonas almenaŭ %d kolumnojn"
 msgid "E355: Unknown option: %s"
 msgstr "E355: Nekonata opcio: %s"

-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Nombro bezonata: &%s = '%s'"
@ -4454,7 +4424,6 @@ msgstr "ne eblas ŝanĝi reĝimon de konzolo?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize: ne estas konzolo??\n"

-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: Ne eblas plenumi ŝelon kun opcio -f"

@ -4680,7 +4649,6 @@ msgstr "E376: Nevalida %%%c en prefikso de formata ĉeno"
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: Nevalida %%%c en formata ĉeno"

-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' enhavas neniun ŝablonon"

@ -4719,9 +4687,6 @@ msgstr "E381: Ĉe la supro de stako de rapidriparo"
 msgid "No entries"
 msgstr "Neniu ano"

-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
-
 msgid "Error file"
 msgstr "Erara Dosiero"

@ -4869,7 +4834,6 @@ msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) Nekonata operatoro '\\%%%c'"

-#. should never happen
 msgid "E868: Error building NFA with equivalence class!"
 msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!"

@ -4880,13 +4844,11 @@ msgstr "E869: (NFA) Nekonata operatoro '\\@%c'"
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto"

-#. Can't have a multi follow a multi.
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr ""
 "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-"
 "selekto!"

-#. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA-regulesprimo) tro da '('"

@ -4907,7 +4869,7 @@ msgstr ""
 "statoj en la staplo"

 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi la tutan NFA "
+msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmemorigi la tutan NFA "

 msgid "E878: (NFA) Could not allocate memory for branch traversal!"
 msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
@ -4994,7 +4956,6 @@ msgstr "E386: Atendis '?' aŭ '/' malantaŭ ';'"
 msgid " (includes previously listed match)"
 msgstr " (enhavas antaŭe listigitajn kongruojn)"

-#. cursor at status line
 msgid "--- Included files "
 msgstr "--- Inkluzivitaj dosieroj "

@ -5071,8 +5032,6 @@ msgstr "Bedaŭrinde ne estas sugestoj"
 msgid "Sorry, only %ld suggestions"
 msgstr "Bedaŭrinde estas nur %ld sugestoj"

-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Anstataŭigi \"%.*s\" per:"
@ -5354,10 +5313,6 @@ msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
 msgid "Reading back spell file..."
 msgstr "Relegas la dosieron de literumo..."

-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "Fonetika analizado..."

@ -5412,8 +5367,6 @@ msgstr "Vorto '%.*s' aldonita al %s"
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj"

-#. This should have been checked when generating the .spl
-#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: ripetita signo en rikordo MAP"

@ -5443,7 +5396,8 @@ msgid "syntax spell notoplevel"
 msgstr "sen literumado en teksto sen sintaksa grupo"

 msgid "syntax spell default"
-msgstr "literumado en teksto sen sintaksa grupo, nur se ne estas @Spell aŭ @NoSpell"
+msgstr ""
+"literumado en teksto sen sintaksa grupo, nur se ne estas @Spell aŭ @NoSpell"

 msgid "syntax iskeyword "
 msgstr "sintakso iskeyword "
@ -5680,7 +5634,6 @@ msgstr "E428: Ne eblas iri preter lastan kongruan etikedon"
 msgid "File \"%s\" does not exist"
 msgstr "La dosiero \"%s\" ne ekzistas"

-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "etikedo %d de %d%s"
@ -5695,7 +5648,6 @@ msgstr "  Uzo de etikedo kun malsama uskleco!"
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Dosiero \"%s\" ne ekzistas"

-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@ -5726,7 +5678,6 @@ msgstr "Antaŭ bajto %ld"
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Etikeda dosiero ne estas ordigita: %s"

-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433: Neniu etikeda dosiero"

@ -5762,7 +5713,6 @@ msgstr "E436: Neniu rikordo \"%s\" en termcap"
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: kapablo de terminalo \"cm\" bezonata"

-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@ -5773,6 +5723,21 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Ne povas malfermi $VIMRUNTIME/rgb.txt"

+msgid "Terminal"
+msgstr "Terminalo"
+
+msgid "Terminal-finished"
+msgstr "Terminalo-finiĝis"
+
+msgid "active"
+msgstr "aktiva"
+
+msgid "running"
+msgstr "ruliĝas"
+
+msgid "finished"
+msgstr "finiĝis"
+
 msgid "new shell started\n"
 msgstr "nova ŝelo lanĉita\n"

@ -5782,12 +5747,9 @@ msgstr "Vim: Eraro dum legado de eniro, elironta...\n"
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon"

-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: Nombro de linioj ŝanĝiĝis neatendite"

-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "Malfaro neebla; tamen daŭrigi"

@ -6421,7 +6383,6 @@ msgstr "Kompari per Vim"
 msgid "Edit with &Vim"
 msgstr "Redakti per &Vim"

-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "Redakti per ekzistanta Vim - "

@ -6440,10 +6401,6 @@ msgstr "Serĉvojo estas tro longa!"
 msgid "--No lines in buffer--"
 msgstr "--Neniu linio en bufro--"

-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470: komando ĉesigita"

@ -6629,12 +6586,6 @@ msgstr "E484: Ne eblas malfermi dosieron %s"
 msgid "E485: Can't read file %s"
 msgstr "E485: Ne eblas legi dosieron %s"

-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
-
-msgid "E37: No write since last change"
-msgstr "E37: Neniu skribo de post lasta ŝanĝo"
-
 msgid "E38: Null argument"
 msgstr "E38: Nula argumento"

@ -6914,7 +6865,6 @@ msgstr "konstruilo de listo ne akceptas ŝlosilvortajn argumentojn"
 msgid "list index out of range"
 msgstr "indekso de listo ekster limoj"

-#. No more suitable format specifications in python-2.3
 #, c-format
 msgid "internal error: failed to get vim list item %d"
 msgstr "interna eraro: obteno de vim-a listero %d malsukcesis"
--- a/src/po/fi.po
+++ b/src/po/fi.po
--- a/src/po/fr.po
+++ b/src/po/fr.po
@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran<61>ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-11 23:10+0200\n"
-"PO-Revision-Date: 2017-01-12 05:16+0200\n"
+"POT-Creation-Date: 2017-10-04 23:32+0200\n"
+"PO-Revision-Date: 2017-10-04 23:44+0200\n"
 "Last-Translator: Dominique Pell<6C> <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@ -100,7 +100,6 @@ msgstr "E90: Impossible de d
 msgid "E84: No modified buffer found"
 msgstr "E84: Aucun tampon n'est modifi<66>"

-#. back where we started, didn't find anything.
 msgid "E85: There is no listed buffer"
 msgstr "E85: Aucun tampon n'est list<73>"

@ -117,6 +116,18 @@ msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
 "E89: Le tampon %ld n'a pas <20>t<EFBFBD> enregistr<74> (ajoutez ! pour passer outre)"

+msgid "E948: Job still running (add ! to end the job)"
+msgstr "E948: T<>che en cours d'ex<65>cution (ajouter ! pour terminer la t<>che)"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Modifications non enregistr<74>es (ajoutez ! pour passer outre)"
+
+msgid "E948: Job still running"
+msgstr "E948: T<>che en cours d'ex<65>cution"
+
+msgid "E37: No write since last change"
+msgstr "E37: Modifications non enregistr<74>es"
+
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Alerte : La liste des noms de fichier d<>borde"

@ -183,7 +194,6 @@ msgstr "ligne %ld sur %ld --%d%%-- col "
 msgid "[No Name]"
 msgstr "[Aucun nom]"

-#. must be a help buffer
 msgid "help"
 msgstr "aide"

@ -214,6 +224,9 @@ msgstr ""
 "\n"
 "# Liste des tampons :\n"

+msgid "E382: Cannot write, 'buftype' option is set"
+msgstr "E382: <20>criture impossible, l'option 'buftype' est activ<69>e"
+
 msgid "[Scratch]"
 msgstr "[Brouillon]"

@ -392,7 +405,6 @@ msgid " Keyword completion (^N^P)"
 msgstr " Compl<70>tement de mot-cl<63> (^N^P)"

 # DB - todo : Faut-il une majuscule <20> "mode" ?
-#. ctrl_x_mode == 0, ^P/^N compl.
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " mode ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"

@ -487,10 +499,6 @@ msgstr "correspondance dans le fichier"
 msgid " Adding"
 msgstr " Ajout"

-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
 msgid "-- Searching..."
 msgstr "-- Recherche en cours..."

@ -521,7 +529,6 @@ msgstr "Correspondance %d sur %d"
 msgid "match %d"
 msgstr "Correspondance %d"

-#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caract<63>res inattendus avant '='"

@ -583,8 +590,6 @@ msgstr "E690: \"in\" manquant apr
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variable inexistante : %s"

-#. For historic reasons this error is not given for a list or dict.
-#. * E.g., the b: dict could be locked/unlocked.
 #, c-format
 msgid "E940: Cannot lock or unlock variable %s"
 msgstr "E940: Impossible de (d<>)verrouiler la variable %s"
@ -770,11 +775,6 @@ msgstr "E785: complete() n'est utilisable que dans le mode Insertion"

 # AB - Texte par d<>faut du bouton de la bo<62>te de dialogue affich<63>e par la
 #      fonction confirm().
-#.
-#. * Yes this is ugly, I don't particularly like it either.  But doing it
-#. * this way has the compelling advantage that translations need not to
-#. * be touched at all.  See below what 'ok' and 'ync' are used for.
-#.
 msgid "&Ok"
 msgstr "&Ok"

@ -968,7 +968,6 @@ msgstr "
 #      ses droits d'acc<63>s.
 # AB - Le mot "viminfo" a <20>t<EFBFBD> retir<69> pour que le message ne d<>passe pas 80
 #      caract<63>res dans le cas courant o<> %s = /home/12345678/.viminfo
-#. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: L'<27>criture dans le fichier %s est interdite"
@ -993,7 +992,6 @@ msgstr "
 msgid "E886: Can't rename viminfo file to %s!"
 msgstr "E886: Impossible de renommer viminfo en %s"

-#. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Ce fichier viminfo a <20>t<EFBFBD> g<>n<EFBFBD>r<EFBFBD> par Vim %s.\n"
@ -1140,7 +1138,6 @@ msgstr " sur %ld lignes"

 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r<>f<EFBFBD>rence <20> :vglobal.
-#. will increment global_busy to break out of the loop
 msgid "E147: Cannot do :global recursive with a range"
 msgstr "E147: :global ne peut pas ex<65>cuter :global avec une plage"

@ -1321,10 +1318,9 @@ msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
 msgid "Save changes to \"%s\"?"
 msgstr "Enregistrer \"%s\" ?"

-# AB - Si les parenth<74>ses posent probl<62>me, il faudra remettre les guillemets
-#      ci-dessus.
-msgid "Untitled"
-msgstr "(sans titre)"
+#, c-format
+msgid "E947: Job still running in buffer \"%s\""
+msgstr "E947: T<>che en cours d'ex<65>cution dans le buffer \"%s\""

 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message est similaire au message E89.
@ -1470,7 +1466,8 @@ msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"

 msgid "E943: Command table needs to be updated, run 'make cmdidxs'"
-msgstr "E943: La table des commandes doit <20>tre mise <20> jour, lancez 'make cmdidxs'"
+msgstr ""
+"E943: La table des commandes doit <20>tre mise <20> jour, lancez 'make cmdidxs'"

 msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: D<>sol<6F>, cette commande n'est pas disponible dans cette version"
@ -1637,7 +1634,6 @@ msgstr "E189: \"%s\" existe (ajoutez ! pour passer outre)"
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Impossible d'ouvrir \"%s\" pour y <20>crire"

-#. set mark
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: L'argument doit <20>tre une lettre ou une (contre-)apostrophe"

@ -1675,13 +1671,17 @@ msgstr "E500:
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Impossible d'ouvrir le viminfo en lecture"

+# AB - Si les parenth<74>ses posent probl<62>me, il faudra remettre les guillemets
+#      ci-dessus.
+msgid "Untitled"
+msgstr "(sans titre)"
+
 msgid "E196: No digraphs in this version"
 msgstr "E196: Pas de digraphes dans cette version"

 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Impossible d'<27>mettre des exceptions avec 'Vim' comme pr<70>fixe"

-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Exception <20>mise : %s"
@ -1698,7 +1698,6 @@ msgstr "Exception
 msgid "%s, line %ld"
 msgstr "%s, ligne %ld"

-#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Exception intercept<70>e : %s"
@ -1725,7 +1724,6 @@ msgstr "Erreur et interruption"
 msgid "Error"
 msgstr "Erreur"

-#. if (pending & CSTP_INTERRUPT)
 msgid "Interrupt"
 msgstr "Interruption"

@ -1768,15 +1766,12 @@ msgstr "E601: Imbrication de :try trop importante"
 msgid "E603: :catch without :try"
 msgstr "E603: :catch sans :try"

-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch apr<70>s :finally"

 msgid "E606: :finally without :try"
 msgstr "E606: :finally sans :try"

-#. Give up for a multiple ":finally" and ignore it.
 msgid "E607: multiple :finally"
 msgstr "E607: Il ne peut y avoir qu'un seul :finally"

@ -1877,7 +1872,6 @@ msgstr "Vim : Lecture de stdin...\n"
 msgid "Reading from stdin..."
 msgstr "Lecture de stdin..."

-#. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: La conversion a rendu le fichier illisible !"

@ -2092,9 +2086,6 @@ msgstr "[noeol]"
 msgid "[Incomplete last line]"
 msgstr "[Derni<6E>re ligne incompl<70>te]"

-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ALERTE : Le fichier a <20>t<EFBFBD> modifi<66> depuis que Vim l'a lu !"

@ -2176,7 +2167,6 @@ msgstr "--Effac
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marqu<71>es pour auto-suppression : %s <tampon=%d>"

-#. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
@ -2199,7 +2189,6 @@ msgstr "E216: Aucun
 msgid "E216: No such group or event: %s"
 msgstr "E216: Aucun <20>v<EFBFBD>nement ou groupe %s"

-#. Highlight title
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@ -2386,18 +2375,15 @@ msgstr "Rechercher :"
 msgid "Replace with:"
 msgstr "Remplacer par :"

-#. whole word only button
 msgid "Match whole word only"
 msgstr "Mots entiers seulement"

-#. match case button
 msgid "Match case"
 msgstr "Respecter la casse"

 msgid "Direction"
 msgstr "Direction"

-#. 'Up' and 'Down' buttons
 msgid "Up"
 msgstr "Haut"

@ -2481,8 +2467,6 @@ msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
 # DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
 #      param<61>trage bidon afin de s<>lectionner un r<>pertoire plut<75>t qu'un
 #      fichier.
-#. We fake this: Use a filter that doesn't select anything and a default
-#. * file name that won't be used.
 msgid "Not Used"
 msgstr "Non utilis<69>"

@ -2563,7 +2547,6 @@ msgstr "Choisir une police - Vim"
 msgid "Name:"
 msgstr "Nom :"

-#. create toggle button
 msgid "Show size in Points"
 msgstr "Afficher la taille en Points"

@ -2814,7 +2797,6 @@ msgstr "E261: Connexion cscope %s introuvable"
 msgid "cscope connection %s closed"
 msgstr "connexion cscope %s ferm<72>e"

-#. should not reach here
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: erreur fatale dans cs_manage_matches"

@ -2979,7 +2961,6 @@ msgid "not implemented yet"
 msgstr "pas encore impl<70>ment<6E>"

 # DB - TODO : le contexte est celui d'une annulation.
-#. ???
 msgid "cannot set line(s)"
 msgstr "Impossible de remettre la/les ligne(s)"

@ -3020,7 +3001,6 @@ msgid ""
 msgstr ""
 "Impossible d'inscrire la commande de rappel : tampon/fen<65>tre en effacement"

-#. This should never happen.  Famous last word?
 msgid ""
 "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
 "org"
@ -3123,7 +3103,6 @@ msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n"
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim : Alerte : L'entr<74>e ne se fait pas sur un terminal\n"

-#. just in case..
 msgid "pre-vimrc command line"
 msgstr "ligne de commande pre-vimrc"

@ -3390,6 +3369,9 @@ msgstr ""
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tUtiliser <viminfo> au lieu du viminfo habituel"

+msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
+msgstr "--clean\t\t'nocompatible', r<>glages par d<>faut, aucun greffon ni viminfo"
+
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h ou --help\t\tAfficher l'aide (ce message) puis quitter"

@ -3492,11 +3474,9 @@ msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
 msgid "No display"
 msgstr "Aucun display"

-#. Failed to send, abort.
 msgid ": Send failed.\n"
 msgstr " : L'envoi a <20>chou<6F>.\n"

-#. Let vim start normally.
 msgid ": Send failed. Trying to execute locally\n"
 msgstr " : L'envoi a <20>chou<6F>. Tentative d'ex<65>cution locale\n"

@ -3517,7 +3497,6 @@ msgstr "Aucune marque positionn
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Aucune marque ne correspond <20> \"%s\""

-#. Highlight title
 msgid ""
 "\n"
 "mark line  col file/text"
@ -3525,7 +3504,6 @@ msgstr ""
 "\n"
 "marq ligne col fichier/texte"

-#. Highlight title
 msgid ""
 "\n"
 " jump line  col file/text"
@ -3533,7 +3511,6 @@ msgstr ""
 "\n"
 " saut ligne col fichier/texte"

-#. Highlight title
 msgid ""
 "\n"
 "change line  col text"
@ -3548,7 +3525,6 @@ msgstr ""
 "\n"
 "# Marques dans le fichier :\n"

-#. Write the jumplist with -'
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@ -3620,7 +3596,6 @@ msgstr "E298: Bloc n
 msgid "E843: Error while updating swap file crypt"
 msgstr "E843: Erreur lors de la mise <20> jour du fichier d'<27>change crypt<70>"

-#. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Oups, le fichier d'<27>change a disparu !"

@ -3809,7 +3784,6 @@ msgstr ""
 "Utilisation de la cl<63> de chiffrement du fichier d'<27>change pour le fichier "
 "texte.\n"

-#. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Fichiers d'<27>change trouv<75>s :"

@ -3979,8 +3953,6 @@ msgstr "Lors de l'ouverture du fichier \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLUS R<>CENT que le fichier d'<27>change !\n"

-#. Some of these messages are long to allow translation to
-#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@ -4071,7 +4043,6 @@ msgstr "E328: Le menu n'existe que dans un autre mode"
 msgid "E329: No menu \"%s\""
 msgstr "E329: Aucun menu \"%s\""

-#. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
 msgstr "E792: Nom de menu vide"

@ -4084,8 +4055,6 @@ msgstr "E331: Ajout d'
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Un s<>parateur ne peut faire partie d'un chemin de menu"

-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
 msgid ""
 "\n"
 "--- Menus ---"
@ -4096,6 +4065,10 @@ msgstr ""
 msgid "Tear off this menu"
 msgstr "D<>tacher ce menu"

+#, c-format
+msgid "E335: Menu not defined for %s mode"
+msgstr "E335: Le menu n'est pas d<>fini pour le mode %s"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Le chemin du menu doit conduire <20> un <20>l<EFBFBD>ment de menu"

@ -4103,10 +4076,6 @@ msgstr "E333: Le chemin du menu doit conduire
 msgid "E334: Menu not found: %s"
 msgstr "E334: Menu introuvable : %s"

-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Le menu n'est pas d<>fini pour le mode %s"
-
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Le chemin du menu doit conduire <20> un sous-menu"

@ -4180,7 +4149,6 @@ msgstr "Enregistrer un fichier"
 msgid "Open File dialog"
 msgstr "Ouvrir un fichier"

-#. TODO: non-GUI file selector here
 msgid "E338: Sorry, no file browser in console mode"
 msgstr "E338: D<>sol<6F>, pas de s<>lecteur de fichiers en mode console"

@ -4347,7 +4315,9 @@ msgid "E663: At end of changelist"
 msgstr "E663: <20> la fin de la liste des modifications"

 msgid "Type  :qa!  and press <Enter> to abandon all changes and exit Vim"
-msgstr "Tapez  :qa!  puis <Entr<74>e> pour abandonner tous les changements et quitter Vim"
+msgstr ""
+"Tapez  :qa!  puis <Entr<74>e> pour abandonner tous les changements et quitter "
+"Vim"

 #, c-format
 msgid "1 line %sed 1 time"
@ -4380,7 +4350,6 @@ msgid "E748: No previously used register"
 msgstr "E748: Aucun registre n'a <20>t<EFBFBD> pr<70>c<EFBFBD>demment utilis<69>"

 # DB - Question O/N.
-#. must display the prompt
 msgid "cannot yank; delete anyway"
 msgstr "impossible de r<>aliser une copie ; effacer tout de m<>me"

@ -4395,25 +4364,30 @@ msgstr "%ld lignes modifi
 msgid "freeing %ld lines"
 msgstr "lib<69>ration de %ld lignes"

-msgid "block of 1 line yanked"
-msgstr "bloc de 1 ligne copi<70>"
-
-msgid "1 line yanked"
-msgstr "1 ligne copi<70>e"
+#, c-format
+msgid " into \"%c"
+msgstr " dans \"%c"

 #, c-format
-msgid "block of %ld lines yanked"
-msgstr "bloc de %ld lignes copi<70>"
+msgid "block of 1 line yanked%s"
+msgstr "bloc de 1 ligne copi<70>%s"

 #, c-format
-msgid "%ld lines yanked"
-msgstr "%ld lignes copi<70>es"
+msgid "1 line yanked%s"
+msgstr "1 ligne copi<70>e%s"
+
+#, c-format
+msgid "block of %ld lines yanked%s"
+msgstr "bloc de %ld lignes copi<70>%s"
+
+#, c-format
+msgid "%ld lines yanked%s"
+msgstr "%ld lignes copi<70>es%s"

 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Le registre %s est vide"

-#. Highlight title
 msgid ""
 "\n"
 "--- Registers ---"
@ -4477,9 +4451,6 @@ msgstr ""
 msgid "(+%ld for BOM)"
 msgstr "(+%ld pour le BOM)"

-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Page %N"
-
 msgid "Thanks for flying Vim"
 msgstr "Merci d'avoir choisi Vim"

@ -4590,6 +4561,9 @@ msgstr "E541: trop d'
 msgid "E542: unbalanced groups"
 msgstr "E542: parenth<74>ses non <20>quilibr<62>es"

+msgid "E946: Cannot make a terminal with running job modifiable"
+msgstr "E946: terminal avec t<>che en cours d'ex<65>cution ne peut pas <20>tre modifiable"
+
 msgid "E590: A preview window already exists"
 msgstr "E590: Il existe d<>j<EFBFBD> une fen<65>tre de pr<70>visualisation"

@ -4608,9 +4582,6 @@ msgstr "E594: Au moins %d colonnes sont n
 msgid "E355: Unknown option: %s"
 msgstr "E355: Option inconnue : %s"

-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Nombre requis : &%s = '%s'"
@ -4683,7 +4654,6 @@ msgstr "Impossible de modifier le mode de la console ?!\n"
 msgid "mch_get_shellsize: not a console??\n"
 msgstr "mch_get_shellsize : pas une console ?!\n"

-#. if Vim opened a window: Executing a shell may cause crashes
 msgid "E360: Cannot execute shell with -f option"
 msgstr "E360: Impossible d'ex<65>cuter un shell avec l'option -f"

@ -4910,7 +4880,6 @@ msgstr "E376: %%%c invalide dans le pr
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: %%%c invalide dans la cha<68>ne de format"

-#. nothing found
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ne contient aucun motif"

@ -4949,9 +4918,6 @@ msgstr "E381: Au sommet de la pile quickfix"
 msgid "No entries"
 msgstr "Aucune entr<74>e"

-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: <20>criture impossible, l'option 'buftype' est activ<69>e"
-
 msgid "Error file"
 msgstr "Fichier d'erreurs"

@ -5098,7 +5064,6 @@ msgstr "E867: (NFA) Op
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) Op<4F>rateur inconnu '\\%%%c'"

-#. should never happen
 msgid "E868: Error building NFA with equivalence class!"
 msgstr "E868: Erreur lors de la construction du NFA avec classe d'<27>quivalence"

@ -5109,11 +5074,9 @@ msgstr "E869: (NFA) Op
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (regexp NFA) Erreur <20> la lecture des limites de r<>p<EFBFBD>tition"

-#. Can't have a multi follow a multi.
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !"

-#. Too many `('
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (regexp NFA) Trop de '('"

@ -5223,7 +5186,6 @@ msgstr "E386: '?' ou '/' attendu apr
 msgid " (includes previously listed match)"
 msgstr " (inclut des correspondances list<73>es pr<70>c<EFBFBD>demment)"

-#. cursor at status line
 msgid "--- Included files "
 msgstr "--- Fichiers inclus "

@ -5300,8 +5262,6 @@ msgstr "D
 msgid "Sorry, only %ld suggestions"
 msgstr "D<>sol<6F>, seulement %ld suggestions"

-#. for when 'cmdheight' > 1
-#. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Remplacer \"%.*s\" par :"
@ -5588,10 +5548,6 @@ msgstr "%d noeuds compress
 msgid "Reading back spell file..."
 msgstr "Relecture du fichier orthographique"

-#.
-#. * Go through the trie of good words, soundfold each word and add it to
-#. * the soundfold trie.
-#.
 msgid "Performing soundfolding..."
 msgstr "Analyse phon<6F>tique en cours..."

@ -5648,8 +5604,6 @@ msgid "E763: Word characters differ between spell files"
 msgstr ""
 "E763: Les caract<63>res de mots diff<66>rent entre les fichiers orthographiques"

-#. This should have been checked when generating the .spl
-#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: caract<63>re dupliqu<71> dans l'entr<74>e MAP"

@ -5679,7 +5633,9 @@ msgid "syntax spell notoplevel"
 msgstr "pas de contr<74>le orthographique dans le texte sans groupe syntaxique"

 msgid "syntax spell default"
-msgstr "contr<EFBFBD>le orthographique dans le texte sans groupe syntaxique, sauf si @Spell/@NoSpell"
+msgstr ""
+"contr<74>le orthographique dans le texte sans groupe syntaxique, sauf si @Spell/"
+"@NoSpell"

 msgid "syntax iskeyword "
 msgstr "syntaxe iskeyword "
@ -5920,7 +5876,6 @@ msgstr "E428: Impossible d'aller au-del
 msgid "File \"%s\" does not exist"
 msgstr "Le fichier \"%s\" n'existe pas"

-#. Give an indication of the number of matching tags
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "marqueur %d sur %d%s"
@ -5935,7 +5890,6 @@ msgstr "  Utilisation d'un marqueur avec une casse diff
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Le fichier \"%s\" n'existe pas"

-#. Highlight title
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@ -5966,7 +5920,6 @@ msgstr "Avant l'octet %ld"
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Le fichier de marqueurs %s n'est pas ordonn<6E>"

-#. never opened any tags file
 msgid "E433: No tags file"
 msgstr "E433: Aucun fichier de marqueurs"

@ -6003,7 +5956,6 @@ msgstr "E436: Aucune entr
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: capacit<69> de terminal \"cm\" requise"

-#. Highlight title
 msgid ""
 "\n"
 "--- Terminal keys ---"
@ -6014,6 +5966,21 @@ msgstr ""
 msgid "Cannot open $VIMRUNTIME/rgb.txt"
 msgstr "Impossible d'ouvrir $VIMRUNTIME/rgb.txt"

+msgid "Terminal"
+msgstr "Terminal"
+
+msgid "Terminal-finished"
+msgstr "Terminal-fini"
+
+msgid "active"
+msgstr "actif"
+
+msgid "running"
+msgstr "en cours"
+
+msgid "finished"
+msgstr "fini"
+
 msgid "new shell started\n"
 msgstr "nouveau shell d<>marr<72>\n"

@ -6024,13 +5991,10 @@ msgstr "Vim : Erreur lors de la lecture de l'entr
 msgid "Used CUT_BUFFER0 instead of empty selection"
 msgstr "CUT_BUFFER0 utilis<69> plut<75>t qu'une s<>lection vide"

-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: Le nombre de lignes a <20>t<EFBFBD> chang<6E> inopin<69>ment"

 # DB - Question O/N.
-#. must display the prompt
 msgid "No undo possible; continue anyway"
 msgstr "Annulation impossible ; continuer"

@ -6679,7 +6643,6 @@ msgstr "&Comparer avec Vim"
 msgid "Edit with &Vim"
 msgstr "<22>diter dans &Vim"

-#. Now concatenate
 msgid "Edit with existing Vim - "
 msgstr "<22>diter dans le Vim existant - "

@ -6703,10 +6666,6 @@ msgstr "Le chemin est trop long !"
 msgid "--No lines in buffer--"
 msgstr "--Le tampon est vide--"

-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
 msgid "E470: Command aborted"
 msgstr "E470: Commande annul<75>e"

@ -6893,12 +6852,6 @@ msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
 msgid "E485: Can't read file %s"
 msgstr "E485: Impossible de lire le fichier %s"

-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Modifications non enregistr<74>es (ajoutez ! pour passer outre)"
-
-msgid "E37: No write since last change"
-msgstr "E37: Modifications non enregistr<74>es"
-
 msgid "E38: Null argument"
 msgstr "E38: Argument null"

@ -7190,7 +7143,6 @@ msgstr "le constructeur de liste n'accepte pas les arguments nomm
 msgid "list index out of range"
 msgstr "index de liste hors limites"

-#. No more suitable format specifications in python-2.3
 #, c-format
 msgid "internal error: failed to get vim list item %d"
 msgstr "erreur interne : acc<63>s <20> un <20>l<EFBFBD>ment %d de liste a <20>chou<6F>"