# HG changeset patch # User Bram Moolenaar # Date 1656368103 -7200 # Node ID 2715448db31c7f16e3b1cde6cd3ecea0ed7e5875 # Parent 8eeda3ed1a8d5ade791e521a8a99a2f3fc6e367d patch 8.2.5172: "make menu" still uses legacy script Commit: https://github.com/vim/vim/commit/c19f1a3488c1bb6fe5707dc6338b13cb9f598670 Author: Bram Moolenaar Date: Mon Jun 27 23:13:04 2022 +0100 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 --- 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 -# Last Change: 2022 Feb 04 +# Last Change: 2022 Jun 27 # This is used by "make menu" in the src directory. edit :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 .. '- ' + if c != cur_menu_char + exe 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- ' 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 .. '")') + append(lnum, 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")') cur_menu_item += 10 lnum += 1 enddef diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5172, +/**/ 5171, /**/ 5170,