changeset 29312:2715448db31c v8.2.5172

patch 8.2.5172: "make menu" still uses legacy script Commit: https://github.com/vim/vim/commit/c19f1a3488c1bb6fe5707dc6338b13cb9f598670 Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Tue, 28 Jun 2022 00:15:03 +0200
parents 8eeda3ed1a8d
children 4adb174f9e21
files runtime/makemenu.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,