From a5b744ef9366a4b694ce7f31783f3be266f5e3cf Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Mon, 30 Jun 2025 20:22:38 +0200 Subject: [PATCH] runtime(vim): Update base-syntax, improve :syn-sync line defaults Set minlines and maxlines to 100 and 200 respectively. Set these after the script interface syntax files have been loaded to ensure the values set in those are overridden. fixes #17580 closes: #17614 Signed-off-by: Doug Kearns Signed-off-by: Christian Brabandt --- runtime/syntax/generator/vim.vim.base | 17 +++++------------ runtime/syntax/vim.vim | 17 +++++------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index 031cbc9e39..c49486e482 100644 --- a/runtime/syntax/generator/vim.vim.base +++ b/runtime/syntax/generator/vim.vim.base @@ -2,7 +2,7 @@ " Language: Vim script " Maintainer: Hirohito Higashi " Doug Kearns -" Last Change: 2025 Jun 25 +" Last Change: 2025 Jun 30 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -205,13 +205,6 @@ if exists("g:vimsyntax_noerror") let g:vimsyn_noerror= g:vimsyntax_noerror endif -" Variable options {{{2 -if exists("g:vim_maxlines") - let s:vimsyn_maxlines= g:vim_maxlines -else - let s:vimsyn_maxlines= 60 -endif - " Nulls {{{2 " ===== Vim9 syn keyword vim9Null null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string @@ -2108,10 +2101,10 @@ endif " Synchronize (speed) {{{2 "============ -if exists("g:vimsyn_minlines") - exe "syn sync minlines=".g:vimsyn_minlines -endif -exe "syn sync maxlines=".s:vimsyn_maxlines + +exe "syn sync minlines=" .. get(g:, "vimsyn_minlines", 100) +exe "syn sync maxlines=" .. get(g:, "vimsyn_maxlines", 200) + syn sync linecont "^\s\+\\" syn sync linebreaks=2 syn sync match vimAugroupSyncA groupthere NONE "\\s\+[eE][nN][dD]" diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 92927c42a7..d2aa2b6c94 100644 --- a/runtime/syntax/vim.vim +++ b/runtime/syntax/vim.vim @@ -2,7 +2,7 @@ " Language: Vim script " Maintainer: Hirohito Higashi " Doug Kearns -" Last Change: 2025 Jun 28 +" Last Change: 2025 Jun 30 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -258,13 +258,6 @@ if exists("g:vimsyntax_noerror") let g:vimsyn_noerror= g:vimsyntax_noerror endif -" Variable options {{{2 -if exists("g:vim_maxlines") - let s:vimsyn_maxlines= g:vim_maxlines -else - let s:vimsyn_maxlines= 60 -endif - " Nulls {{{2 " ===== Vim9 syn keyword vim9Null null null_blob null_channel null_class null_dict null_function null_job null_list null_object null_partial null_string @@ -2169,10 +2162,10 @@ endif " Synchronize (speed) {{{2 "============ -if exists("g:vimsyn_minlines") - exe "syn sync minlines=".g:vimsyn_minlines -endif -exe "syn sync maxlines=".s:vimsyn_maxlines + +exe "syn sync minlines=" .. get(g:, "vimsyn_minlines", 100) +exe "syn sync maxlines=" .. get(g:, "vimsyn_maxlines", 200) + syn sync linecont "^\s\+\\" syn sync linebreaks=2 syn sync match vimAugroupSyncA groupthere NONE "\\s\+[eE][nN][dD]"