Skip to content

Commit c19f1a3

Browse files
committed
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.
1 parent d21e5bd commit c19f1a3

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

runtime/makemenu.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ vim9script
22

33
# Script to define the syntax menu in synmenu.vim
44
# Maintainer: Bram Moolenaar <[email protected]>
5-
# Last Change: 2022 Feb 04
5+
# Last Change: 2022 Jun 27
66

77
# This is used by "make menu" in the src directory.
88
edit <sfile>:p:h/synmenu.vim
@@ -39,13 +39,13 @@ def Syn(arg: string)
3939
else
4040
# When starting a new letter, insert a menu separator.
4141
var c = submenu_name[0]
42-
if c != s:cur_menu_char
43-
exe 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- <nul>'
42+
if c != cur_menu_char
43+
exe 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. ".-" .. c .. '- <nul>'
4444
cur_menu_item += 10
4545
cur_menu_char = c
4646
endif
4747
endif
48-
append(lnum, 'an 50.' .. s:cur_menu_nr .. '.' .. s:cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")<CR>')
48+
append(lnum, 'an 50.' .. cur_menu_nr .. '.' .. cur_menu_item .. ' &Syntax.' .. menu_name .. "." .. submenu_name .. ' :cal SetSyn("' .. syntax_name .. '")<CR>')
4949
cur_menu_item += 10
5050
lnum += 1
5151
enddef

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,8 @@ static char *(features[]) =
735735

736736
static int included_patches[] =
737737
{ /* Add new patch number below this line */
738+
/**/
739+
5172,
738740
/**/
739741
5171,
740742
/**/

0 commit comments

Comments
 (0)