patch 8.2.5172: "make menu" still uses legacy script

Problem:    "make menu" still uses legacy script.
Solution:   make menu generation script use Vim9 script, fix errors.

diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 43f2eb6107f65008b1b4c8c0fd6de6bb57843d34..b9cd8cb7b749e5a75598abd9512f7dfcc4073e02 100644 (file)
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -2,7 +2,7 @@ vim9script
 
 # Script to define the syntax menu in synmenu.vim
 # Maintainer:  Bram Moolenaar <Bram@vim.org>
-# Last Change: 2022 Feb 04
+# Last Change: 2022 Jun 27
 
 # This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -39,13 +39,13 @@ def Syn(arg: string)
   else
     # When starting a new letter, insert a menu separator.
     var c = submenu_name[0]
-    if c != s:cur_menu_char
-      exe 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- <nul>'
+    if c != cur_menu_char
+      exe 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- <nul>'
       cur_menu_item += 10
       cur_menu_char = c
     endif
   endif
-  append(lnum, 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")<CR>')
+  append(lnum, 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")<CR>')
   cur_menu_item += 10
   lnum += 1
 enddef

diff --git a/src/version.c b/src/version.c
index 5d6fc91e06c3aad3a5ac38c3173c86490a0cf063..73ebc9e394e244d15f720107cbb2af12af88dc46 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5172,
 /**/
     5171,
 /**/