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

Vim
Fork

vim: Commit

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

patch 9.0.0160: some diff mode tests fail

Commit: https://github.com/vim/vim/commit/83bf11a1ffc5a7bc4a5ba81747df606d69c1465a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 6 22:23:40 2022 +0100

patch 9.0.0160: some diff mode tests fail

Problem: Some diff mode tests fail.
Solution: Only advance "ptr" when a text property follows.

diff -r e580b15a240d -r 0fc188347f8a src/drawline.c

--- a/src/drawline.c Sat Aug 06 23:15:05 2022 +0200

+++ b/src/drawline.c Sat Aug 06 23:30:03 2022 +0200

		@@ -3473,7 +3473,7 @@
3473	3473	) \|\| lcs_eol_one == -1)
3474	3474	break;
3475	3475	#ifdef FEAT_PROP_POPUP
3476		- if (!wp->w_p_wrap)
	3476	+ if (!wp->w_p_wrap && text_prop_follows)
3477	3477	{
3478	3478	// do not output more of the line, only the "below" prop
3479	3479	ptr += STRLEN(ptr);

diff -r e580b15a240d -r 0fc188347f8a src/version.c

--- a/src/version.c Sat Aug 06 23:15:05 2022 +0200

+++ b/src/version.c Sat Aug 06 23:30: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	+ 160,
	740	+/**/
739	741	159,
740	742	/**/
741	743	158,