diff --git a/runtime/syntax/generator/gen_syntax_vim.vim b/runtime/syntax/generator/gen_syntax_vim.vim
index a6604e5..222c891 100644
--- a/runtime/syntax/generator/gen_syntax_vim.vim
+++ b/runtime/syntax/generator/gen_syntax_vim.vim
@@ -1,7 +1,7 @@
 " Vim syntax file generator
 " Language: Vim script
 " Maintainer: Hirohito Higashi (h_east)
-" Last Change: 2024 Aug 30
+" Last Change: 2024 Sep 14
 
 let s:keepcpo= &cpo
 set cpo&vim
@@ -296,12 +296,14 @@
 		echomsg
 		echon
 		echowindow
+		elseif
 		enddef
 		endfunction
 		execute
 		final
 		for
 		function
+		if
 		insert
 		let
 		loadkeymap
@@ -312,6 +314,7 @@
 		new
 		normal
 		popup
+		return
 		set
 		setglobal
 		setlocal
@@ -325,6 +328,7 @@
 		unmap
 		var
 		vim9script
+		while
 	EOL
 	" Required for original behavior
 	" \	'global', 'vglobal'
diff --git a/runtime/syntax/generator/vim.vim.base b/runtime/syntax/generator/vim.vim.base
index 30e6bc3..1681e47 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 <dougkearns@gmail.com>
-" Last Change:	   2024 Aug 30
+" Last Change:	   2024 Sep 14
 " Former Maintainer: Charles E. Campbell
 
 " DO NOT CHANGE DIRECTLY.
@@ -688,7 +688,7 @@
  syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
 endif
 
-syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<retu\%[rn]\>\|\<while\>"	skipwhite nextgroup=vimOper,vimOperParen,vimVar,vimFunc,vimNotation
+syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<retu\%[rn]\>\|\<while\>"	skipwhite nextgroup=@vimExprList,vimNotation
 
 " Match: {{{2
 " =====