vim-patch:d473c8c10126

Update runtime files. https://github.com/vim/vim/commit/d473c8c101262702ea9eeb14907ee20a786942b2
author: Justin M. Keyes <justinkz@gmail.com> 2018-10-29 09:57:50 +0100
committer: Justin M. Keyes <justinkz@gmail.com> 2018-10-29 10:01:44 +0100
commit: 228bc4c416092eb2601329aa881915a565ee64d2 (patch)
tree: 6dc3b62a9a0edcf475ecad10f182b3929bfe066c
parent: 4f67f5ba6e5c9c1a8483e2b1f5faaa48bfb221ad (diff)
download: rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.gz
rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.bz2
rneovim-228bc4c416092eb2601329aa881915a565ee64d2.zip
53 files changed, 353 insertions, 219 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 17a46f6cda..ec122d3a13 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1373,7 +1373,7 @@ to the name of an external program for Vim to use for text formatting.  The
 program.
 
                                                         *format-formatexpr*
-The 'formatexpr' option can be set to a Vim Script function that performs
+The 'formatexpr' option can be set to a Vim script function that performs
 reformatting of the buffer.  This should usually happen in an |ftplugin|,
 since formatting is highly dependent on the type of file.  It makes
 sense to use an |autoload| script, so the corresponding script is only loaded
@@ -1407,7 +1407,7 @@ text.  Put it in your autoload directory, e.g. ~/.vim/autoload/format.vim: >
 
 You can then enable the formatting by executing: >
   setlocal formatexpr=format#Format()
->
+
 Note: this function explicitly returns non-zero when called from insert mode
 (which basically means, text is inserted beyond the 'textwidth' limit).  This
 causes Vim to fall back to reformat the text by using the internal formatter.
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index b83fddd845..766240dfb0 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -372,12 +372,16 @@ Example (this does almost the same as 'diffexpr' being empty): >
 	   endif
 	   silent execute "!diff -a --binary " . opt . v:fname_in . " " . v:fname_new .
 		\  " > " . v:fname_out
+	   redraw!
 	endfunction
 
 The "-a" argument is used to force comparing the files as text, comparing as
 binaries isn't useful.  The "--binary" argument makes the files read in binary
 mode, so that a CTRL-Z doesn't end the text on DOS.
 
+The `redraw!` command may not be needed, depending on whether executing a
+shell command shows something on the display or not.
+
 						*E810* *E97*
 Vim will do a test if the diff output looks alright.  If it doesn't, you will
 get an error message.  Possible causes:
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2743f24a78..20c0ce0876 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2339,7 +2339,7 @@ tolower({expr})			String	the String {expr} switched to lowercase
 toupper({expr})			String	the String {expr} switched to uppercase
 tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
 					to chars in {tostr}
-trim({text}[, {mask}])		String	trim characters in {mask} from {text}
+trim({text} [, {mask}])		String	trim characters in {mask} from {text}
 trunc({expr})			Float	truncate Float {expr}
 type({name})			Number	type of variable {name}
 undofile({name})		String	undo file name for {name}
@@ -3890,7 +3890,7 @@ getbufinfo([{dict}])
 			endfor
 <
 		To get buffer-local options use: >
-			getbufvar({bufnr}, '&')
+			getbufvar({bufnr}, '&option_name')
 
 <
 							*getbufline()*
@@ -8028,7 +8028,7 @@ tr({src}, {fromstr}, {tostr})				*tr()*
 			echo tr("<blob>", "<>", "{}")
 <		returns "{blob}"
 
-trim({text}[, {mask}])						*trim()*
+trim({text} [, {mask}])						*trim()*
 		Return {text} as a String where any character in {mask} is
 		removed from the beginning and  end of {text}.
 		If {mask} is not given, {mask} is all characters up to 0x20,
diff --git a/runtime/doc/ft_rust.txt b/runtime/doc/ft_rust.txt
index b94e1f8f75..ff2e0ca56f 100644
--- a/runtime/doc/ft_rust.txt
+++ b/runtime/doc/ft_rust.txt
@@ -236,4 +236,4 @@ It also has a few other mappings:
 			Note: This binding is only available in MacVim.
 
 ==============================================================================
- vim:tw=78:sw=4:noet:ts=8:ft=help:norl:
+ vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index a2ddbf1011..bf2e86ae46 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -559,9 +559,9 @@ Virtual Replace mode	Virtual Replace mode is similar to Replace mode, but
 			If the 'showmode' option is on "-- VREPLACE --" is
 			shown at the bottom of the window.
 
-Insert Normal mode	Entered when CTRL-O given in Insert mode.  This is
-			like Normal mode, but after executing one command Vim
-			returns to Insert mode.
+Insert Normal mode	Entered when CTRL-O is typed in Insert mode (see
+			|i_CTRL-O|).  This is like Normal mode, but after
+			executing one command Vim returns to Insert mode.
 			If the 'showmode' option is on "-- (insert) --" is
 			shown at the bottom of the window.
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6c80ea8824..0076049b94 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3201,6 +3201,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	so far, matches.  The matched string is highlighted.  If the pattern
 	is invalid or not found, nothing is shown.  The screen will be updated
 	often, this is only useful on fast terminals.
+	Also applies to the `:s`, `:g` and `:v` commands.
 	Note that the match will be shown, but the cursor will return to its
 	original position when no match is found and when pressing <Esc>.  You
 	still need to finish the search command with <Enter> to move the
@@ -3213,9 +3214,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The |hl-IncSearch| highlight group determines the highlighting.
 	When 'hlsearch' is on, all matched strings are highlighted too while
 	typing a search command. See also: 'hlsearch'.
-	If you don't want turn 'hlsearch' on, but want to highlight all matches
-	while searching, you can turn on and off 'hlsearch' with autocmd.
-	Example: >
+	If you don't want to turn 'hlsearch' on, but want to highlight all
+	matches while searching, you can turn on and off 'hlsearch' with
+	autocmd.  Example: >
 		augroup vimrc-incsearch-highlight
 		  autocmd!
 		  autocmd CmdlineEnter /,\? :set hlsearch
@@ -4863,7 +4864,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   tabpages	all tab pages; without this only the current tab page
 			is restored, so that you can make a session for each
 			tab page separately
-	   terminal	include terminal windows where the command can be restored
+	   terminal	include terminal windows where the command can be
+			restored
 	   unix		with Unix end-of-line format (single <NL>), even when
 			on Windows or DOS
 	   winpos	position of the whole Vim window
@@ -5747,7 +5749,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line is displayed.  The current buffer and current window will be set
 	temporarily to that of the window (and buffer) whose statusline is
 	currently being drawn.  The expression will evaluate in this context.
-	The variable "actual_curbuf" is set to the 'bufnr()' number of the
+	The variable "g:actual_curbuf" is set to the `bufnr()` number of the
 	real current buffer.
 
 	The 'statusline' option will be evaluated in the |sandbox| if set from
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index 829e8227e1..084ad4e521 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -36,6 +36,8 @@ Note: If you have problems printing with |:hardcopy|, an alternative is to use
 			'printexpr' through |v:cmdarg|.  Otherwise [arguments]
 			is ignored.  'printoptions' can be used to specify
 			paper size, duplex, etc.
+			Note: If you want PDF, there are tools such as
+			"ps2pdf" that can convert the PostScript to PDF.
 
 :[range]ha[rdcopy][!] >{filename}
 			As above, but write the resulting PostScript in file
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 3378d5919c..a0459d27bc 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -231,8 +231,10 @@ REORDERING TAB PAGES:
 :tabm[ove] [N]						*:tabm* *:tabmove*
 :[N]tabm[ove]
 		Move the current tab page to after tab page N.  Use zero to
-		make the current tab page the first one.  Without N the tab
-		page is made the last one. >
+		make the current tab page the first one.  N is counted before
+		the move, thus if the second tab is the current one,
+		`:tabmove 1` and `:tabmove 2`  have no effect.
+		Without N the tab page is made the last one. >
 		    :.tabmove   " do nothing
 		    :-tabmove   " move the tab page to the left
 		    :+tabmove   " move the tab page to the right
diff --git a/runtime/doc/uganda.txt b/runtime/doc/uganda.txt
index cdd677cbd5..97a67befb9 100644
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -281,4 +281,4 @@ Address to send checks to:
 
 This address is expected to be valid for a long time.
 
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index f8f6049119..a500e87e35 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -383,4 +383,4 @@ if it is not what you want do 'u.'.  This will remove the contents of the
 first put, and repeat the put command for the second register.  Repeat the
 'u.' until you got what you want.
 
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_01.txt b/runtime/doc/usr_01.txt
index bc55e7cdce..f96043c409 100644
--- a/runtime/doc/usr_01.txt
+++ b/runtime/doc/usr_01.txt
@@ -109,4 +109,4 @@ donate part of the profit to help AIDS victims in Uganda.  See |iccf|.
 
 Next chapter: |usr_02.txt|  The first steps in Vim
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index a1e3d606ec..9ebbd11ac7 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -687,4 +687,4 @@ Summary: 					*help-summary*  >
 
 Next chapter: |usr_03.txt|  Moving around
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index 989914687f..2649534900 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -650,4 +650,4 @@ You will notice a few special marks.  These include:
 
 Next chapter: |usr_04.txt|  Making small changes
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_04.txt b/runtime/doc/usr_04.txt
index e02a50e494..a327a09a71 100644
--- a/runtime/doc/usr_04.txt
+++ b/runtime/doc/usr_04.txt
@@ -511,4 +511,4 @@ else:
 
 Next chapter: |usr_05.txt|  Set your settings
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index a5b5f8165c..38e858801b 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -610,4 +610,4 @@ This does mean there is less room to edit text, thus it's a compromise.
 
 Next chapter: |usr_06.txt|  Using syntax highlighting
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
index 48f672be78..beffb92877 100644
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -274,4 +274,4 @@ others look at the colored text.
 
 Next chapter: |usr_07.txt|  Editing more than one file
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_07.txt b/runtime/doc/usr_07.txt
index 683c9879a7..c44a54d76c 100644
--- a/runtime/doc/usr_07.txt
+++ b/runtime/doc/usr_07.txt
@@ -476,4 +476,4 @@ This protects you from accidentally overwriting another file.
 
 Next chapter: |usr_08.txt|  Splitting windows
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_08.txt b/runtime/doc/usr_08.txt
index ef91bf9c0a..559ca6f1ef 100644
--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -597,4 +597,4 @@ For more information about tab pages see |tab-page|.
 
 Next chapter: |usr_09.txt|  Using the GUI
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt
index 9359ce02c1..757d13e0f3 100644
--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -283,4 +283,4 @@ You can tune the way Select mode works with the 'selectmode' option.
 
 Next chapter: |usr_10.txt|  Making big changes
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_10.txt b/runtime/doc/usr_10.txt
index 044cb1582b..3646786052 100644
--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -820,4 +820,4 @@ has written.  To tell Vim to redraw the screen: >
 
 Next chapter: |usr_11.txt|  Recovering from a crash
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_11.txt b/runtime/doc/usr_11.txt
index 8a6b74bb8b..ad3c0de541 100644
--- a/runtime/doc/usr_11.txt
+++ b/runtime/doc/usr_11.txt
@@ -299,4 +299,4 @@ If you really don't want to see this message, you can add the 'A' flag to the
 
 Next chapter: |usr_12.txt|  Clever tricks
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index e87ed81c97..21efa36a25 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -343,4 +343,4 @@ matches and where they are.
 
 Next chapter: |usr_20.txt|  Typing command-line commands quickly
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_20.txt b/runtime/doc/usr_20.txt
index 3b8eeae175..8eee7aedb7 100644
--- a/runtime/doc/usr_20.txt
+++ b/runtime/doc/usr_20.txt
@@ -381,4 +381,4 @@ there can be only one.
 
 Next chapter: |usr_21.txt|  Go away and come back
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_21.txt b/runtime/doc/usr_21.txt
index cfb8c90027..99a78e7b05 100644
--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -488,4 +488,4 @@ For more details see |modeline|.
 
 Next chapter: |usr_22.txt|  Finding the file to edit
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 255211f668..96fc02aaa5 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -397,4 +397,4 @@ can't be editing nothing!
 
 Next chapter: |usr_23.txt|  Editing other files
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_23.txt b/runtime/doc/usr_23.txt
index cb776d2b5c..810da05ff8 100644
--- a/runtime/doc/usr_23.txt
+++ b/runtime/doc/usr_23.txt
@@ -256,4 +256,4 @@ decompression.  You might need to install the programs first.
 
 Next chapter: |usr_24.txt|  Inserting quickly
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
index 3157d6812d..3c4ff6f55e 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -603,4 +603,4 @@ This deletes up to the third word into register g.
 
 Next chapter: |usr_25.txt|  Editing formatted text
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index ae3d3c4422..3a58af6412 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -579,4 +579,4 @@ The "gR" command uses Virtual Replace mode.  This preserves the layout:
 
 Next chapter: |usr_26.txt|  Repeating
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_26.txt b/runtime/doc/usr_26.txt
index 7b0b940da2..4e8f1979f4 100644
--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -207,4 +207,4 @@ start all over, use the "-W" argument.  It overwrites any existing file.
 
 Next chapter: |usr_27.txt|  Search commands and patterns
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_27.txt b/runtime/doc/usr_27.txt
index d4d48af47e..cd01308c6e 100644
--- a/runtime/doc/usr_27.txt
+++ b/runtime/doc/usr_27.txt
@@ -560,4 +560,4 @@ and "\w" for "[0-9A-Za-z_]".
 
 Next chapter: |usr_28.txt|  Folding
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_28.txt b/runtime/doc/usr_28.txt
index 24e995d9ab..86aa20597e 100644
--- a/runtime/doc/usr_28.txt
+++ b/runtime/doc/usr_28.txt
@@ -423,4 +423,4 @@ the defined folds.  Then you can delete or add folds manually.
 
 Next chapter: |usr_29.txt|  Moving through programs
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index b0cb9d7e88..3381d1870c 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -608,4 +608,4 @@ for the identifier.  Example (cursor on "idx"):
 
 Next chapter: |usr_30.txt|  Editing programs
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_30.txt b/runtime/doc/usr_30.txt
index 786f2d1800..b729c7a263 100644
--- a/runtime/doc/usr_30.txt
+++ b/runtime/doc/usr_30.txt
@@ -640,4 +640,4 @@ For more details see |format-comments|.
 
 Next chapter: |usr_31.txt|  Exploiting the GUI
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index 2354e27b42..fb9a4fd223 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -269,4 +269,4 @@ another font size, for example.
 
 Next chapter: |usr_32.txt|  The undo tree
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_32.txt b/runtime/doc/usr_32.txt
index fca802872d..8b489ea1e0 100644
--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -177,4 +177,4 @@ use the |undotree()| function.  To see what it returns: >
 
 Next chapter: |usr_40.txt|  Make new commands
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_40.txt b/runtime/doc/usr_40.txt
index 4092af703e..e5d55fb857 100644
--- a/runtime/doc/usr_40.txt
+++ b/runtime/doc/usr_40.txt
@@ -654,4 +654,4 @@ To set it back to the normal behavior, make 'eventignore' empty: >
 
 Next chapter: |usr_41.txt|  Write a Vim script
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 346cf8b535..4adb69aaee 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -2514,4 +2514,4 @@ utility is recommended.
 
 Next chapter: |usr_42.txt|  Add new menus
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt
index ad04555f8c..501f02e745 100644
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -355,4 +355,4 @@ is...
 
 Next chapter: |usr_43.txt|  Using filetypes
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_43.txt b/runtime/doc/usr_43.txt
index 765a525692..04e9f9c000 100644
--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -175,4 +175,4 @@ and sources a script or executes a function to check the contents of the file.
 
 Next chapter: |usr_44.txt|  Your own syntax highlighted
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_44.txt b/runtime/doc/usr_44.txt
index b06557b950..722c3de26c 100644
--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -716,4 +716,4 @@ up scrolling backwards and CTRL-L.
 
 Next chapter: |usr_45.txt|  Select your language
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_45.txt b/runtime/doc/usr_45.txt
index 9bbbe82113..ae2aae7596 100644
--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -392,4 +392,4 @@ Don't type the spaces.  See |i_CTRL-V_digit| for the details.
 
 ==============================================================================
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index ed14d78d22..148dd161ac 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -335,4 +335,4 @@ Make Vim work as you like it.
 
 ==============================================================================
 
-Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index bf90fe1754..d908f484c6 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -363,4 +363,4 @@ Move cursor beyond lines.
 	and figures easily.
 
 
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 1731bbd030..252a1ca8b8 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -524,4 +524,4 @@ g CTRL-H		Start Select mode, blockwise.  This is like CTRL-V,
 			but starts Select mode instead of Visual mode.
 			Mnemonic: "get Highlighted".
 
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 5ca9986f40..44464c1cef 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1273,4 +1273,4 @@ unlisted	The buffer is not in the buffer list.  It is not used for
 			:setlocal nobuflisted
 <
 
- vim:tw=78:ts=8:ft=help:norl:
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index bd1b147f5c..6fdc02aaf0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -582,7 +582,7 @@ au BufNewFile,BufRead auto.master		setf conf
 au BufNewFile,BufRead *.mas,*.master		setf master
 
 " Forth
-au BufNewFile,BufRead *.fs,*.ft			setf forth
+au BufNewFile,BufRead *.fs,*.ft,*.fth		setf forth
 
 " Reva Forth
 au BufNewFile,BufRead *.frt			setf reva
@@ -1864,6 +1864,9 @@ au BufNewFile,BufRead */etc/xdg/menus/*.menu	setf xml
 " ATI graphics driver configuration
 au BufNewFile,BufRead fglrxrc			setf xml
 
+" Web Services Description Language (WSDL)
+au BufNewFile,BufRead *.wsdl			setf xml
+
 " XLIFF (XML Localisation Interchange File Format) is also XML
 au BufNewFile,BufRead *.xlf			setf xml
 au BufNewFile,BufRead *.xliff			setf xml
diff --git a/runtime/ftplugin/logtalk.dict b/runtime/ftplugin/logtalk.dict
index e3b9e6f2a4..3fcdfc6f6a 100644
--- a/runtime/ftplugin/logtalk.dict
+++ b/runtime/ftplugin/logtalk.dict
@@ -1,164 +1,262 @@
-encoding
+abolish
+abolish_category
+abolish_events
+abolish_object
+abolish_protocol
+abs
+acos
+acyclic_term
+after
+alias
+always_true_or_false_goals
+arg
+asin
+asserta
+assertz
+atan
+atan2
+atom
+atomic
+atom_chars
+atom_chars
+atom_codes
+atom_codes
+atom_concat
+atom_concat
+atom_length
+at_end_of_stream
+bagof
+before
+built_in
+call
+callable
 calls
+catch
 category
+category_property
+ceiling
+char_code
+char_conversion
+clause
+clean
+close
+code_prefix
+coinduction
+coinductive
+compare
+complements
+complements
+complements_object
+compound
+conforms_to_protocol
+context
+context_switching_calls
+copy_term
+cos
+create_category
+create_logtalk_flag
+create_object
+create_protocol
+current_category
+current_char_conversion
+current_event
+current_input
+current_logtalk_flag
+current_object
+current_op
+current_output
+current_predicate
+current_prolog_flag
+current_protocol
+debug
+define_events
+deprecated
+discontiguous
+div
+domain_error
+duplicated_directives
 dynamic
+dynamic_declarations
+elif
+else
+encoding
+encoding_directive
+endif
 end_category
 end_object
 end_protocol
-info
-initialization
-object
-protocol
-synchronized
-threaded
-uses
-alias
-discontiguous
-meta_predicate
-mode
-op
-private
-protected
-public
-current_object
-current_protocol
-current_category
-object_property
-protocol_property
-category_property
-create_object
-create_protocol
-create_category
-abolish_object
-abolish_protocol
-abolish_category
-complements
-complements_object
+engines
+ensure_loaded
+evaluation_error
+events
+existence_error
+exp
+expand_goal
+expand_term
+export
 extends
+extends_category
 extends_object
 extends_protocol
-extends_category
+fail
+false
+findall
+float
+float_fractional_part
+float_integer_part
+floor
+flush_output
+forall
+forward
+functor
+get_byte
+get_char
+get_code
+goal_expansion
+ground
+halt
+hook
+if
+ignore
 implements
 implements_protocol
 imports
 imports_category
+include
+info
+initialization
 instantiates
 instantiates_class
-specializes
-specializes_class
-abolish_events
-current_event
-define_events
-logtalk_load
+instantiation_error
+integer
+keysort
+lambda_variables
+log
 logtalk_compile
 logtalk_library_path
-current_logtalk_flag
-set_logtalk_flag
-threaded_call
-threaded_once
-threaded_ignore
-threaded_exit
-threaded_peek
-threaded_wait
-threaded_notify
-self
-this
-sender
-parameter
-before
-after
-phrase
-expand_term
-goal_expansion
-term_expansion
-true
-fail
-call
-catch
-throw
-unify_with_occurs_check
-var
-atom
-integer
-float
-atomic
-compound
+logtalk_load
+logtalk_load_context
+logtalk_make
+logtalk_make_target_action
+max
+meta_non_terminal
+meta_predicate
+min
+missing_directives
+mod
+mode
+modules
+multifile
+nl
 nonvar
 number
-arg
-copy_term
-functor
-current_predicate
-predicate_property
-abolish
-assertz
-asserta
-clause
-retract
-retractall
-bagof
-findall
-forall
-setof
-current_input
-current_output
-set_input
-set_output
+numbervars
+number_chars
+number_chars
+number_codes
+number_codes
+object
+object_property
+once
+op
 open
-close
-flush_output
-stream_property
-at_end_of_stream
-set_stream_position
-get_char
-get_code
+optimize
+parameter
+peek_byte
 peek_char
 peek_code
+permission_error
+phrase
+portability
+predicate_property
+private
+prolog_compatible_version
+prolog_compiler
+prolog_dialect
+prolog_loader
+prolog_version
+protected
+protocol
+protocol_property
+public
+put_byte
 put_char
 put_code
-nl
-get_byte
-peek_byte
-put_byte
 read
 read_term
-write
-writeq
-write_canonical
-atom_chars
-atom_codes
-atom_concat
-number_chars
-number_codes
-current_op
-char_conversion
-current_char_conversion
-once
-repeat
-atom_length
-atom_concat
-sub_atom
-atom_chars
-atom_codes
-char_code
-number_chars
-number_codes
-set_prolog_flag
-current_prolog_flag
-halt
-abs
-atan
-ceiling
-cos
-exp
-float_fractional_part
-float_integer_part
-floor
-log
-mod
+redefined_built_ins
+reexport
+reload
 rem
+repeat
+report
+representation_error
+resource_error
+retract
+retractall
 round
+scratch_directory
+self
+sender
+setof
+set_input
+set_logtalk_flag
+set_output
+set_prolog_flag
+set_stream_position
 sign
 sin
+singleton_variables
+sort
+source_data
+specializes
+specializes_class
 sqrt
+stream_property
+subsumes_term
+sub_atom
+suspicious_calls
+synchronized
+syntax_error
+system_error
+tabling
+tan
+term_expansion
+term_variables
+this
+threaded
+threaded_call
+threaded_engine
+threaded_engine_create
+threaded_engine_destroy
+threaded_engine_fetch
+threaded_engine_next
+threaded_engine_next_reified
+threaded_engine_post
+threaded_engine_self
+threaded_engine_yield
+threaded_exit
+threaded_ignore
+threaded_notify
+threaded_once
+threaded_peek
+threaded_wait
+threads
+throw
+trivial_goal_fails
+true
 truncate
+type_error
+undefined_predicates
+underscore_variables
+unify_with_occurs_check
+unknown_entities
+unknown_predicates
+uses
+use_module
+var
+version
+write
+writeq
+write_canonical
+xor
diff --git a/runtime/ftplugin/logtalk.vim b/runtime/ftplugin/logtalk.vim
index e71307a399..667907ce5f 100644
--- a/runtime/ftplugin/logtalk.vim
+++ b/runtime/ftplugin/logtalk.vim
@@ -1,7 +1,7 @@
 " Logtalk filetype plugin file
 " Language:         Logtalk
 " Maintainer:       Paulo Moura <pmoura@logtalk.org>
-" Latest Revision:  2007-07-06
+" Latest Revision:  2018-08-03
 
 if exists("b:did_ftplugin")
   finish
@@ -10,9 +10,10 @@ let b:did_ftplugin = 1
 
 let b:undo_ftplugin = "setl ts< sw< fdm< fdc< ai< dict<"
 
-"setlocal ts=4
+setlocal ts=4
 setlocal sw=4
 setlocal fdm=syntax
+setlocal fdn=10
 setlocal fdc=2
 setlocal autoindent
 setlocal dict=$VIMRUNTIME/ftplugin/logtalk.dict
diff --git a/runtime/ftplugin/vim.vim b/runtime/ftplugin/vim.vim
index da27e35faf..eb8061d84f 100644
--- a/runtime/ftplugin/vim.vim
+++ b/runtime/ftplugin/vim.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Dec 05
+" Last Change:	2018 Aug 07
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -17,20 +17,20 @@ set cpo-=C
 if !exists('*VimFtpluginUndo')
   func VimFtpluginUndo()
     setl fo< isk< com< tw< commentstring< keywordprg<
-    if exists(b:did_add_maps)
-      silent! nunmap <buffer> [['
-      silent! vunmap <buffer> [['
-      silent! nunmap <buffer> ]]'
-      silent! vunmap <buffer> ]]'
-      silent! nunmap <buffer> []'
-      silent! vunmap <buffer> []'
-      silent! nunmap <buffer> ]['
-      silent! vunmap <buffer> ]['
-      silent! nunmap <buffer> ]"'
-      silent! vunmap <buffer> ]"'
-      silent! nunmap <buffer> ["'
-      silent! vunmap <buffer> ["'
-    endif
+    if exists('b:did_add_maps')
+      silent! nunmap <buffer> [[
+      silent! vunmap <buffer> [[
+      silent! nunmap <buffer> ]]
+      silent! vunmap <buffer> ]]
+      silent! nunmap <buffer> []
+      silent! vunmap <buffer> []
+      silent! nunmap <buffer> ][
+      silent! vunmap <buffer> ][
+      silent! nunmap <buffer> ]"
+      silent! vunmap <buffer> ]"
+      silent! nunmap <buffer> ["
+      silent! vunmap <buffer> ["
+     endif
     unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps
   endfunc
 endif
diff --git a/runtime/indent/logtalk.vim b/runtime/indent/logtalk.vim
index 5b69663e1d..8e36f86115 100644
--- a/runtime/indent/logtalk.vim
+++ b/runtime/indent/logtalk.vim
@@ -1,5 +1,5 @@
 "  Maintainer:	Paulo Moura <pmoura@logtalk.org>
-"  Revised on:	2008.06.02
+"  Revised on:	2018.08.04
 "  Language:	Logtalk
 
 " This Logtalk indent file is a modified version of the Prolog
@@ -42,6 +42,9 @@ function! GetLogtalkIndent()
 	" Check for clause head on previous line
 	elseif pline =~ ':-\s*\(%.*\)\?$'
 		let ind = ind + shiftwidth()
+	" Check for grammar rule head on previous line
+	elseif pline =~ '-->\s*\(%.*\)\?$'
+		let ind = ind + shiftwidth()
 	" Check for entity closing directive on previous line
 	elseif pline =~ '^\s*:-\send_\(object\|protocol\|category\)\.\(%.*\)\?$'
 		let ind = ind - shiftwidth()
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index e630373c70..9085cd01d5 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2018 May 31
+" Last Change: 2018 Aug 11
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -30,7 +30,7 @@ let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd
 let s:archs = [
       \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa'
       \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips'
-      \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 's390x', 's390', 'sh3eb'
+      \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb'
       \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32'
       \ ]
 let s:pairs = [
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index c7960c161b..74e8d42d1c 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2018 May 03
+" Last Change: 2018 Aug 11
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'artful', 'bionic', 'cosmic', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'cosmic', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -34,7 +34,7 @@ let s:unsupported = [
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty'
+      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful'
       \ ]
 let &cpo=s:cpo
 
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index 532f83d3bf..a7fe9ce925 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -2,7 +2,7 @@
 "
 " Language:	Logtalk
 " Maintainer:	Paulo Moura <pmoura@logtalk.org>
-" Last Change:	February 4, 2012
+" Last Change:	August 3, 2018
 
 
 " quit when a syntax file was already loaded
@@ -79,13 +79,13 @@ syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- elif("		matchgroup=log
 syn match	logtalkDirTag		":- else\."
 syn match	logtalkDirTag		":- endif\."
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- alias("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
-syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- calls("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- coinductive("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- encoding("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- initialization("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- info("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- mode("		matchgroup=logtalkDirTag	end=")\."	contains=logtalkOperator, logtalkAtom
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- dynamic("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn match	logtalkDirTag		":- built_in\."
 syn match	logtalkDirTag		":- dynamic\."
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- discontiguous("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- multifile("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
@@ -131,17 +131,20 @@ syn match	logtalkBuiltIn		"\<\(instantiat\|specializ\)es_class\ze("
 syn match	logtalkBuiltIn		"\<\(abolish\|define\)_events\ze("
 syn match	logtalkBuiltIn		"\<current_event\ze("
 
-syn match	logtalkBuiltIn		"\<\(curren\|se\)t_logtalk_flag\ze("
+syn match	logtalkBuiltIn		"\<\(create\|current\|set\)_logtalk_flag\ze("
 
-syn match	logtalkBuiltIn		"\<logtalk_\(compile\|l\(ibrary_path\|oad\|oad_context\)\)\ze("
+syn match	logtalkBuiltIn		"\<logtalk_\(compile\|l\(ibrary_path\|oad\|oad_context\)\|make\(_target_action\)\?\)\ze("
+syn match	logtalkBuiltIn		"\<logtalk_make\>"
 
 syn match	logtalkBuiltIn		"\<\(for\|retract\)all\ze("
 
 syn match	logtalkBuiltIn		"\<threaded\(_\(call\|once\|ignore\|exit\|peek\|wait\|notify\)\)\?\ze("
+syn match	logtalkBuiltIn		"\<threaded_engine\(_\(create\|destroy\|self\|next\|next_reified\|yield\|post\|fetch\)\)\?\ze("
 
 
 " Logtalk built-in methods
 
+syn match	logtalkBuiltInMethod	"\<context\ze("
 syn match	logtalkBuiltInMethod	"\<parameter\ze("
 syn match	logtalkBuiltInMethod	"\<se\(lf\|nder\)\ze("
 syn match	logtalkBuiltInMethod	"\<this\ze("
@@ -159,6 +162,8 @@ syn match	logtalkBuiltInMethod	"\<f\(ind\|or\)all\ze("
 syn match	logtalkBuiltInMethod	"\<before\ze("
 syn match	logtalkBuiltInMethod	"\<after\ze("
 
+syn match	logtalkBuiltInMethod	"\<forward\ze("
+
 syn match	logtalkBuiltInMethod	"\<expand_\(goal\|term\)\ze("
 syn match	logtalkBuiltInMethod	"\<\(goal\|term\)_expansion\ze("
 syn match	logtalkBuiltInMethod	"\<phrase\ze("
@@ -174,6 +179,7 @@ syn match	logtalkOperator		"@"
 
 syn match	logtalkKeyword		"\<true\>"
 syn match	logtalkKeyword		"\<fail\>"
+syn match	logtalkKeyword		"\<false\>"
 syn match	logtalkKeyword		"\<ca\(ll\|tch\)\ze("
 syn match	logtalkOperator		"!"
 " syn match	logtalkOperator		","
@@ -181,11 +187,14 @@ syn match	logtalkOperator		";"
 syn match	logtalkOperator		"-->"
 syn match	logtalkOperator		"->"
 syn match	logtalkKeyword		"\<throw\ze("
+syn match	logtalkKeyword		"\<\(instantiation\|system\)_error\>"
+syn match	logtalkKeyword		"\<\(type\|domain\|existence\|permission\|representation\|evaluation\|resource\|syntax\)_error\ze("
 
 
 " Term unification
 
 syn match	logtalkOperator		"="
+syn match	logtalkKeyword		"\<subsumes_term\ze("
 syn match	logtalkKeyword		"\<unify_with_occurs_check\ze("
 syn match	logtalkOperator		"\\="
 
@@ -199,6 +208,7 @@ syn match	logtalkKeyword		"\<float\ze("
 syn match	logtalkKeyword		"\<c\(allable\|ompound\)\ze("
 syn match	logtalkKeyword		"\<n\(onvar\|umber\)\ze("
 syn match	logtalkKeyword		"\<ground\ze("
+syn match	logtalkKeyword		"\<acyclic_term\ze("
 
 
 " Term comparison
@@ -219,14 +229,20 @@ syn match	logtalkKeyword		"\<arg\ze("
 syn match	logtalkOperator		"=\.\."
 syn match	logtalkKeyword		"\<copy_term\ze("
 syn match	logtalkKeyword		"\<numbervars\ze("
+syn match	logtalkKeyword		"\<term_variables\ze("
+
+
+" Predicate aliases
+
+syn match	logtalkOperator		"\<as\>"
 
 
-" Arithemtic evaluation
+" Arithmetic evaluation
 
 syn match	logtalkOperator		"\<is\>"
 
 
-" Arithemtic comparison
+" Arithmetic comparison
 
 syn match	logtalkOperator		"=:="
 syn match	logtalkOperator		"=\\="
@@ -299,16 +315,18 @@ syn match	logtalkOperator		"-"
 syn match	logtalkOperator		"\*"
 syn match	logtalkOperator		"//"
 syn match	logtalkOperator		"/"
+syn match	logtalkKeyword		"\<div\ze("
 syn match	logtalkKeyword		"\<r\(ound\|em\)\ze("
 syn match	logtalkKeyword		"\<e\>"
 syn match	logtalkKeyword		"\<pi\>"
+syn match	logtalkKeyword		"\<div\>"
 syn match	logtalkKeyword		"\<rem\>"
-syn match	logtalkKeyword		"\<mod\ze("
+syn match	logtalkKeyword		"\<m\(ax\|in\|od\)\ze("
 syn match	logtalkKeyword		"\<mod\>"
 syn match	logtalkKeyword		"\<abs\ze("
 syn match	logtalkKeyword		"\<sign\ze("
 syn match	logtalkKeyword		"\<flo\(or\|at\(_\(integer\|fractional\)_part\)\?\)\ze("
-syn match	logtalkKeyword		"\<truncate\ze("
+syn match	logtalkKeyword		"\<t\(an\|runcate\)\ze("
 syn match	logtalkKeyword		"\<ceiling\ze("
 
 
@@ -317,7 +335,7 @@ syn match	logtalkKeyword		"\<ceiling\ze("
 syn match	logtalkOperator		"\*\*"
 syn match	logtalkKeyword		"\<s\(in\|qrt\)\ze("
 syn match	logtalkKeyword		"\<cos\ze("
-syn match	logtalkKeyword		"\<atan\ze("
+syn match	logtalkKeyword		"\<a\(cos\|sin\|tan\|tan2\)\ze("
 syn match	logtalkKeyword		"\<exp\ze("
 syn match	logtalkKeyword		"\<log\ze("
 
@@ -329,6 +347,7 @@ syn match	logtalkOperator		"<<"
 syn match	logtalkOperator		"/\\"
 syn match	logtalkOperator		"\\/"
 syn match	logtalkOperator		"\\"
+syn match	logtalkKeyword		"\<xor\ze("
 
 
 " Logtalk list operator
@@ -347,7 +366,7 @@ syn match	logtalkNumber		"\<\d\+\>"
 syn match	logtalkNumber		"\<\d\+\.\d\+\>"
 syn match	logtalkNumber		"\<\d\+[eE][-+]\=\d\+\>"
 syn match	logtalkNumber		"\<\d\+\.\d\+[eE][-+]\=\d\+\>"
-syn match	logtalkNumber		"\<0'.\|0''\|0'\"\>"
+syn match	logtalkNumber		"\<0'[\\]\?.\|0''\|0'\"\>"
 syn match	logtalkNumber		"\<0b[0-1]\+\>"
 syn match	logtalkNumber		"\<0o\o\+\>"
 syn match	logtalkNumber		"\<0x\x\+\>"
author	Justin M. Keyes <justinkz@gmail.com>	2018-10-29 09:57:50 +0100
committer	Justin M. Keyes <justinkz@gmail.com>	2018-10-29 10:01:44 +0100
commit	228bc4c416092eb2601329aa881915a565ee64d2 (patch)
tree	6dc3b62a9a0edcf475ecad10f182b3929bfe066c
parent	4f67f5ba6e5c9c1a8483e2b1f5faaa48bfb221ad (diff)
download	rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.gz rneovim-228bc4c416092eb2601329aa881915a565ee64d2.tar.bz2 rneovim-228bc4c416092eb2601329aa881915a565ee64d2.zip