OSDN > ソフトウェアを探す > Vim > SCM > hg > vim > コミット

Vim
Fork

vim: コミット

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

patch 9.0.0038: 'listchars' test fails

Commit: https://github.com/vim/vim/commit/5ed26faace574f6b36744f9e17075d7e806aa877
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jul 4 18:05:51 2022 +0100

patch 9.0.0038: 'listchars' test fails

Problem: 'listchars' test fails.
Solution: Use window-local value after setting the global value

diff -r f85fcaede57f -r 73fb9c6efc6d src/optionstr.c

--- a/src/optionstr.c Mon Jul 04 19:00:04 2022 +0200

+++ b/src/optionstr.c Mon Jul 04 19:15:03 2022 +0200

		@@ -1313,15 +1313,16 @@
1313	1313	tabpage_T *tp;
1314	1314	win_T *wp;
1315	1315
1316		- // The current window is set to use the global 'listchars' value.
1317		- // So clear the window-local value.
	1316	+ // If the current window is set to use the global 'listchars'
	1317	+ // value, clear the window-local value.
1318	1318	if (!(opt_flags & OPT_GLOBAL))
1319	1319	clear_string_option(&curwin->w_p_lcs);
1320	1320	FOR_ALL_TAB_WINDOWS(tp, wp)
	1321	+ // If the current window has a local value need to apply it
	1322	+ // again, it was changed when setting the global value.
1321	1323	// If no error was returned above, we don't expect an error
1322	1324	// here, so ignore the return value.
1323		- if (*wp->w_p_lcs == NUL)
1324		- (void)set_chars_option(wp, &wp->w_p_lcs);
	1325	+ (void)set_chars_option(wp, &wp->w_p_lcs);
1325	1326
1326	1327	redraw_all_later(NOT_VALID);
1327	1328	}

		@@ -1339,15 +1340,16 @@
1339	1340	tabpage_T *tp;
1340	1341	win_T *wp;
1341	1342
1342		- // The current window is set to use the global 'fillchars' value.
1343		- // So clear the window-local value.
	1343	+ // If the current window is set to use the global 'fillchars'
	1344	+ // value clear the window-local value.
1344	1345	if (!(opt_flags & OPT_GLOBAL))
1345	1346	clear_string_option(&curwin->w_p_fcs);
1346	1347	FOR_ALL_TAB_WINDOWS(tp, wp)
	1348	+ // If the current window has a local value need to apply it
	1349	+ // again, it was changed when setting the global value.
1347	1350	// If no error was returned above, we don't expect an error
1348	1351	// here, so ignore the return value.
1349		- if (*wp->w_p_fcs == NUL)
1350		- (void)set_chars_option(wp, &wp->w_p_fcs);
	1352	+ (void)set_chars_option(wp, &wp->w_p_fcs);
1351	1353
1352	1354	redraw_all_later(NOT_VALID);
1353	1355	}

diff -r f85fcaede57f -r 73fb9c6efc6d src/version.c

--- a/src/version.c Mon Jul 04 19:00:04 2022 +0200

+++ b/src/version.c Mon Jul 04 19: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	+ 38,
	740	+/**/
739	741	37,
740	742	/**/
741	743	36,