From 884ac811355fc4e16bb73798bc5329f41499e3cd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 29 Oct 2018 09:32:54 +0100
Subject: vim-patch:675e8d6adb88

Update runtime files.
https://github.com/vim/vim/commit/675e8d6adb88d5b38087870dfda51c0205070741

---

NA:
vim-patch:ffd112edc6a8
Fix missing patch number.
https://github.com/vim/vim/commit/ffd112edc6a8f72b66c06207bff4431f6aec7b6f
---
 runtime/doc/autocmd.txt      |  2 +-
 runtime/doc/eval.txt         |  2 ++
 runtime/doc/quickref.txt     |  2 ++
 runtime/syntax/php.vim       |  6 +++---
 runtime/syntax/sqloracle.vim | 31 ++++++++++++++++++-------------
 5 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'runtime')

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index bacd0e7cf1..045dd9a32a 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -4,7 +4,7 @@
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
-Automatic commands					*autocmd* *autocommand*
+Automatic commands			*autocmd* *autocommand* *autocommand*
 
 For a basic explanation, see section |40.3| in the user manual.
 
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 7a5b90c88d..a3d43dab11 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6612,6 +6612,8 @@ searchpair({start}, {middle}, {end} [, {flags} [, {skip}
 		When {skip} is omitted or empty, every match is accepted.
 		When evaluating {skip} causes an error the search is aborted
 		and -1 returned.
+ 		{skip} can be a string, a lambda, a funcref or a partial.
+		Anything else makes the function fail.
 
 		For {stopline} and {timeout} see |search()|.
 
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index fa770b4a61..2de667ef1c 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -908,6 +908,8 @@ Short explanation of each option:		*option-list*
 'undoreload'	  'ur'	    max nr of lines to save for undo on a buffer reload
 'updatecount'	  'uc'	    after this many characters flush swap file
 'updatetime'	  'ut'	    after this many milliseconds flush swap file
+'varsofttabstop'  'vsts'    a list of number of spaces when typing <Tab>
+'vartabstop'	  'vts'	    a list of number of spaces for <Tab>s
 'verbose'	  'vbs'     give informative messages
 'verbosefile'	  'vfile'   file to write messages in
 'viewdir'	  'vdir'    directory where to store files with :mkview
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index 6a81b8c631..5a7a2c3794 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5/7
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Jul 14, 2017
+" Last Change: Jun 20, 2018
 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -446,7 +446,7 @@ if exists("php_folding") && php_folding==1
   syn match phpException "\(\s\|^\)catch\(\s\+.*}\)\@=" contained
   syn match phpException "\(\s\|^\)finally\(\s\+.*}\)\@=" contained
 
-  set foldmethod=syntax
+  setlocal foldmethod=syntax
   syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop
   syn region phpFoldFunction matchgroup=Storageclass start="^\z(\s*\)\(abstract\s\+\|final\s\+\|private\s\+\|protected\s\+\|public\s\+\|static\s\+\)*function\s\([^};]*$\)\@="rs=e-9 matchgroup=Delimiter end="^\z1}" contains=@phpClFunction,phpFoldHtmlInside,phpFCKeyword contained transparent fold extend
   syn region phpFoldFunction matchgroup=Define start="^function\s\([^};]*$\)\@=" matchgroup=Delimiter end="^}" contains=@phpClFunction,phpFoldHtmlInside contained transparent fold extend
@@ -460,7 +460,7 @@ else
   syn keyword phpException catch throw try finally contained
   syn keyword phpStorageClass final global private protected public static contained
   if exists("php_folding") && php_folding==2
-    set foldmethod=syntax
+    setlocal foldmethod=syntax
     syn region phpFoldHtmlInside matchgroup=Delimiter start="?>" end="<?\(php\)\=" contained transparent contains=@htmlTop
     syn region phpParent matchgroup=Delimiter start="{" end="}" contained contains=@phpClFunction,phpFoldHtmlInside transparent fold
   endif
diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim
index 3989b1f997..0907b48f0e 100644
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -4,13 +4,15 @@
 " Repository:   https://github.com/chrisbra/vim-sqloracle-syntax
 " License:      Vim
 " Previous Maintainer:	Paul Moore
-" Last Change:	2018 May 13
+" Last Change:	2018 June 24
 
 " Changes:
 " 02.04.2016: Support for when keyword
 " 03.04.2016: Support for join related keywords
 " 22.07.2016: Support Oracle Q-Quote-Syntax
 " 25.07.2016: Support for Oracle N'-Quote syntax
+" 22.06.2018: Remove skip part for sqlString (do not escape strings)
+" (https://web.archive.org/web/20150922065035/https://mariadb.com/kb/en/sql-99/character-string-literals/)
 
 if exists("b:current_syntax")
   finish
@@ -50,12 +52,14 @@ syn keyword sqlStatement truncate
 " next ones are contained, so folding works.
 syn keyword sqlStatement create update alter select insert contained
 
-syn keyword sqlType	boolean char character date float integer long
-syn keyword sqlType	mlslabel number raw rowid varchar varchar2 varray
+syn keyword sqlType	bfile blob boolean char character clob date datetime
+syn keyword sqlType	dec decimal float int integer long mlslabel nchar
+syn keyword sqlType	nclob number numeric nvarchar2 precision raw rowid
+syn keyword sqlType	smallint real timestamp urowid varchar varchar2 varray
 
 " Strings:
-syn region sqlString	matchgroup=Quote start=+n\?"+  skip=+\\\\\|\\"+  end=+"+
-syn region sqlString	matchgroup=Quote start=+n\?'+  skip=+\\\\\|\\'+  end=+'+
+syn region sqlString	matchgroup=Quote start=+n\?"+     end=+"+
+syn region sqlString	matchgroup=Quote start=+n\?'+     end=+'+
 syn region sqlString	matchgroup=Quote start=+n\?q'\z([^[(<{]\)+    end=+\z1'+
 syn region sqlString	matchgroup=Quote start=+n\?q'<+   end=+>'+
 syn region sqlString	matchgroup=Quote start=+n\?q'{+   end=+}'+
@@ -68,6 +72,7 @@ syn match sqlNumber	"-\=\<\d*\.\=[0-9_]\>"
 " Comments:
 syn region sqlComment	start="/\*"  end="\*/" contains=sqlTodo,@Spell fold 
 syn match sqlComment	"--.*$" contains=sqlTodo,@Spell
+syn match sqlComment "^rem.*$" contains=sqlTodo,@Spell
 
 " Setup Folding:
 " this is a hack, to get certain statements folded.
@@ -129,15 +134,15 @@ syn keyword sqlFunction	xmlparse xmlpatch xmlpi xmlquery xmlroot xmlsequence xml
 syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
-hi def link Quote            Special
-hi def link sqlComment	Comment
-hi def link sqlFunction	Function
-hi def link sqlKeyword	sqlSpecial
-hi def link sqlNumber	Number
-hi def link sqlOperator	sqlStatement
-hi def link sqlSpecial	Special
+hi def link Quote		Special
+hi def link sqlComment		Comment
+hi def link sqlFunction		Function
+hi def link sqlKeyword		sqlSpecial
+hi def link sqlNumber		Number
+hi def link sqlOperator		sqlStatement
+hi def link sqlSpecial		Special
 hi def link sqlStatement	Statement
-hi def link sqlString	String
+hi def link sqlString		String
 hi def link sqlType		Type
 hi def link sqlTodo		Todo
 
-- 
cgit