OSDN > Trouver un logiciel > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

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

Commit MetaInfo

Révision	eb0a1108f885628856811cde35b04466a71a55af (tree)
l'heure	2022-01-17 06:30:03
Auteur	Bram Moolenaar <Bram@vim....>
Commiter	Bram Moolenaar

Message de Log

patch 8.2.4117: Vim9: wrong white space error after using imported item

Commit: https://github.com/vim/vim/commit/47036b6bd7e5a0b38f093d9f0630f054b04fa68e
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 16 21:18:53 2022 +0000

patch 8.2.4117: Vim9: wrong white space error after using imported item

Problem: Vim9: wrong white space error after using imported item.
Solution: Don't skip over white space. (closes https://github.com/vim/vim/issues/9544)

Change Summary

modified: src/eval.c (diff)
modified: src/testdir/test_vim9_import.vim (diff)
modified: src/version.c (diff)

Modification

diff -r d58b66b0cb2b -r eb0a1108f885 src/eval.c

--- a/src/eval.c Sun Jan 16 22:00:04 2022 +0100

+++ b/src/eval.c Sun Jan 16 22:30:03 2022 +0100

		@@ -6001,7 +6001,6 @@
6001	6001	idx = find_exported(rettv->vval.v_number, exp_name, &ufunc, &type,
6002	6002	evalarg->eval_cctx, verbose);
6003	6003	**arg = cc;
6004		- arg = skipwhite(arg);
6005	6004
6006	6005	if (idx < 0 && ufunc == NULL)
6007	6006	{

diff -r d58b66b0cb2b -r eb0a1108f885 src/testdir/test_vim9_import.vim

--- a/src/testdir/test_vim9_import.vim Sun Jan 16 22:00:04 2022 +0100

+++ b/src/testdir/test_vim9_import.vim Sun Jan 16 22:30:03 2022 +0100

		@@ -69,6 +69,7 @@
69	69
70	70	g:imported_name = expo.exp_name
71	71	expo.exp_name ..= ' Doe'
	72	+ expo.exp_name = expo.exp_name .. ' Maar'
72	73	g:imported_name_appended = expo.exp_name
73	74	g:exported_later = expo.exported
74	75

		@@ -97,7 +98,7 @@
97	98	assert_equal('Exported', g:imported_func)
98	99	assert_equal('Exported', g:funcref_result)
99	100	assert_equal('John', g:imported_name)
100		- assert_equal('John Doe', g:imported_name_appended)
	101	+ assert_equal('John Doe Maar', g:imported_name_appended)
101	102	assert_false(exists('g:name'))
102	103
103	104	Undo_export_script_lines()

diff -r d58b66b0cb2b -r eb0a1108f885 src/version.c

--- a/src/version.c Sun Jan 16 22:00:04 2022 +0100

+++ b/src/version.c Sun Jan 16 22:30:03 2022 +0100

		@@ -751,6 +751,8 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 4117,
	755	+/**/
754	756	4116,
755	757	/**/
756	758	4115,

Afficher sur ancien navigateur de dépôt.