Commit496e786

authored

Merge pull requestneovim#18534 from neovim/backport-18480-to-release-0.7

[Backport release-0.7] fix(runtime/genvimvim): omit s[ubstitute] from vimCommand

2 parents35075dc +0377973 commit496e786Copy full SHA for 496e786

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,6 @@ else`
`120`	`120`	`com! -nargs=*VimFoldt<args>`
`121`	`121`	`endif`
`122`	`122`
`123`		`-" commands not picked up by the generator (due to non-standard format) {{{2`
`124`		`-synkeywordvimCommandcontainedpy3`
`125`		`-`
`126`	`123`	`" Deprecated variable options {{{2`
`127`	`124`	`ifexists("g:vim_minlines")`
`128`	`125`	`letg:vimsyn_minlines=g:vim_minlines`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,13 @@ local function cmd_kw(prev_cmd, cmd)`
`44`	`44`	`end`
`45`	`45`
`46`	`46`	`-- Exclude these from the vimCommand keyword list, they are handled specially`
`47`		`--- in syntax/vim.vim (vimAugroupKey, vimAutoCmd). #9327`
`48`		`-localfunctionis_autocmd_cmd(cmd)`
	`47`	`+-- in syntax/vim.vim (vimAugroupKey, vimAutoCmd, vimSubst). #9327`
	`48`	`+localfunctionis_special_cased_cmd(cmd)`
`49`	`49`	`return (cmd=='augroup'`
`50`	`50`	`orcmd=='autocmd'`
`51`	`51`	`orcmd=='doautocmd'`
`52`		`-orcmd=='doautoall')`
	`52`	`+orcmd=='doautoall'`
	`53`	`+orcmd=='substitute')`
`53`	`54`	`end`
`54`	`55`
`55`	`56`	`localvimcmd_start='syn keyword vimCommand contained'`
`@@ -60,7 +61,7 @@ for _, cmd_desc in ipairs(ex_cmds.cmds) do`
`60`	`61`	`w('\n'..vimcmd_start)`
`61`	`62`	`end`
`62`	`63`	`localcmd=cmd_desc.command`
`63`		`-ifcmd:match('%w')andcmd~='z'andnotis_autocmd_cmd(cmd)then`
	`64`	`+ifcmd:match('%w')andcmd~='z'andnotis_special_cased_cmd(cmd)then`
`64`	`65`	`w(''..cmd_kw(prev_cmd,cmd))`
`65`	`66`	`end`
`66`	`67`	`prev_cmd=cmd`

Comments

(0)