OSDN > 브라 우즈 소프트웨어 > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

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.

diff -r 8eeda3ed1a8d -r 2715448db31c runtime/makemenu.vim

--- a/runtime/makemenu.vim Tue Jun 28 00:00:19 2022 +0200

+++ b/runtime/makemenu.vim Tue Jun 28 00:15:03 2022 +0200

		@@ -2,7 +2,7 @@
2	2
3	3	# Script to define the syntax menu in synmenu.vim
4	4	# Maintainer: Bram Moolenaar <Bram@vim.org>
5		-# Last Change: 2022 Feb 04
	5	+# Last Change: 2022 Jun 27
6	6
7	7	# This is used by "make menu" in the src directory.
8	8	edit <sfile>:p:h/synmenu.vim

		@@ -39,13 +39,13 @@
39	39	else
40	40	# When starting a new letter, insert a menu separator.
41	41	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>'
44	44	cur_menu_item += 10
45	45	cur_menu_char = c
46	46	endif
47	47	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>')
49	49	cur_menu_item += 10
50	50	lnum += 1
51	51	enddef

diff -r 8eeda3ed1a8d -r 2715448db31c src/version.c

--- a/src/version.c Tue Jun 28 00:00:19 2022 +0200

+++ b/src/version.c Tue Jun 28 00:15:03 2022 +0200

		@@ -736,6 +736,8 @@
736	736	static int included_patches[] =
737	737	{ /* Add new patch number below this line */
738	738	/**/
	739	+ 5172,
	740	+/**/
739	741	5171,
740	742	/**/
741	743	5170,