From: Doug Kearns Date: Fri, 20 Jun 2025 16:59:21 +0000 (+0200) Subject: runtime(vim): Update base-syntax, fix Vim9 :import expression comment handling X-Git-Tag: v9.1.1474~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99b9847bd8c9146b2ccc3c1403752755650ee4c6;p=thirdparty%2Fvim.git runtime(vim): Update base-syntax, fix Vim9 :import expression comment handling The required space in Vim9 continuation comments (#\ comment) was accidentally removed in commit 6acca4b as trailing whitespace. closes: #17573 Signed-off-by: Doug Kearns Signed-off-by: Christian Brabandt --- diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base index dcd57cde5a..fabf808e11 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 18 +" Last Change: 2025 Jun 20 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -338,7 +338,7 @@ if s:vim9script \\| \\%(^\s*#.*\)\@<=$ \\| - \\n\s*\\\|\n\s*#\\ + \\n\s*\%(\\\|#\\ \) \+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" @@ -350,7 +350,7 @@ if s:vim9script else syn region vimImportFilename contained \ start="\S" - \ skip=+\n\s*\\\|\n\s*"\\ + + \ skip=+\n\s*\%(\\\|"\\ \)+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" \ matchgroup=NONE diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim index 10cefd332b..71d7f37ef6 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 18 +" Last Change: 2025 Jun 20 " Former Maintainer: Charles E. Campbell " DO NOT CHANGE DIRECTLY. @@ -391,7 +391,7 @@ if s:vim9script \\| \\%(^\s*#.*\)\@<=$ \\| - \\n\s*\\\|\n\s*#\\ + \\n\s*\%(\\\|#\\ \) \+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" @@ -403,7 +403,7 @@ if s:vim9script else syn region vimImportFilename contained \ start="\S" - \ skip=+\n\s*\\\|\n\s*"\\ + + \ skip=+\n\s*\%(\\\|"\\ \)+ \ matchgroup=vimCommand \ end="\s\+\zsas\ze\s\+\h" \ matchgroup=NONE