summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-27 23:13:04 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-27 23:13:04 +0100
commitc19f1a3488c1bb6fe5707dc6338b13cb9f598670 (patch)
tree0faf2a34481cb45910a7a765c24370adc6c05735
parentd21e5bde7c74eab8b10fddc30d12a313c7e7dcd0 (diff)
downloadvim-git-8.2.5172.tar.gz
patch 8.2.5172: "make menu" still uses legacy scriptv8.2.5172
Problem: "make menu" still uses legacy script. Solution: make menu generation script use Vim9 script, fix errors.
-rw-r--r--runtime/makemenu.vim8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim
index 43f2eb610..b9cd8cb7b 100644
--- 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 5d6fc91e0..73ebc9e39 100644
--- 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,