runtime(vim): Update base-syntax, improve :syn-sync line defaults
Commit:
https://github.com/vim/vim/commit/a5b744ef9366a4b694ce7f31783f3be266f5e3cf
Author: Doug Kearns <[email protected]>
Date: Mon Jun 30 20:22:38 2025 +0200
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 <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/syntax/generator/vim.vim.base
b/runtime/syntax/generator/vim.vim.base
index 031cbc9e3..c49486e48 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 <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
-" 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
"\<aug\%[roup]\>\s\+[eE][nN][dD]"
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 92927c42a..d2aa2b6c9 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -2,7 +2,7 @@
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <[email protected]>
-" 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
"\<aug\%[roup]\>\s\+[eE][nN][dD]"
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uWJGd-00CtlM-SZ%40256bit.org.
