Commit: runtime(vim): Update base-syntax, fix missing luaParenError error

1 view
Skip to first unread message

Christian Brabandt

unread,
May 22, 2025, 5:00:14 PM5/22/25
to vim...@googlegroups.com
runtime(vim): Update base-syntax, fix missing luaParenError error

Commit: https://github.com/vim/vim/commit/f4b2fce71c3b5a4f1cada0e852393efbd493e331
Author: Doug Kearns <dougk...@gmail.com>
Date: Thu May 22 22:48:11 2025 +0200

runtime(vim): Update base-syntax, fix missing luaParenError error

We shouldn't assume that the luaParenError syntax group is present in
the, possibly custom, included file or that it hasn't already been
removed. However, issue #11277 has been fixed so it no longer needs to
be cleared.

Fixes comment https://github.com/vim/vim/pull/15375#issuecomment-2899791944

related: #15375
closes: #17357

Signed-off-by: Doug Kearns <dougk...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index 99d0480dc..7ee8e71aa 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 <dougk...@gmail.com>
-" Last Change: 2025 May 17
+" Last Change: 2025 May 22
" Former Maintainer: Charles E. Campbell

" DO NOT CHANGE DIRECTLY.
@@ -1551,7 +1551,6 @@ let s:interfaces = get(g:, "vimsyn_embed", "lP")
if s:interfaces =~# 'l'
syn include @vimLuaScript syntax/lua.vim
unlet b:current_syntax
- syn clear luaParenError " See issue #11277
endif

syn keyword vimLua lua skipwhite nextgroup=vimLuaHeredoc,vimLuaStatement
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index d0f320262..0181a9027 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 <dougk...@gmail.com>
-" Last Change: 2025 May 17
+" Last Change: 2025 May 22
" Former Maintainer: Charles E. Campbell

" DO NOT CHANGE DIRECTLY.
@@ -1612,7 +1612,6 @@ let s:interfaces = get(g:, "vimsyn_embed", "lP")
if s:interfaces =~# 'l'
syn include @vimLuaScript syntax/lua.vim
unlet b:current_syntax
- syn clear luaParenError " See issue #11277
endif

syn keyword vimLua lua skipwhite nextgroup=vimLuaHeredoc,vimLuaStatement
Reply all
Reply to author
Forward
0 new messages