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 8.2.4142: build failure with normal features without persistent undo

Commit: https://github.com/vim/vim/commit/b4868eddd9cdc7086c88a7a3699dd435d34ae904
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 19 11:24:40 2022 +0000

patch 8.2.4142: build failure with normal features without persistent undo

Problem: Build failure with normal features without persistent undo.
Solution: Adjust #ifdef. (closes https://github.com/vim/vim/issues/9557)

diff -r 1fa8aefced2e -r 6ce83b3745c0 src/fileio.c

--- a/src/fileio.c Tue Jan 18 22:45:04 2022 +0100

+++ b/src/fileio.c Wed Jan 19 12:30:05 2022 +0100

		@@ -1300,7 +1300,7 @@
1300	1300	cryptkey = check_for_cryptkey(cryptkey, ptr, &size,
1301	1301	&filesize, newfile, sfname,
1302	1302	&did_ask_for_key);
1303		-# ifdef CRYPT_NOT_INPLACE
	1303	+# if defined(CRYPT_NOT_INPLACE) && defined(FEAT_PERSISTENT_UNDO)
1304	1304	if (curbuf->b_cryptstate != NULL
1305	1305	&& !crypt_works_inplace(curbuf->b_cryptstate))
1306	1306	// reading undo file requires crypt_decode_inplace()

diff -r 1fa8aefced2e -r 6ce83b3745c0 src/version.c

--- a/src/version.c Tue Jan 18 22:45:04 2022 +0100

+++ b/src/version.c Wed Jan 19 12:30:05 2022 +0100

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