commit b4868eddd9cdc7086c88a7a3699dd435d34ae904
author Bram Moolenaar <Bram@vim.org> Wed Jan 19 11:24:40 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Jan 19 11:24:40 2022 +0000
tree d1023860e83de3d3947850355ad29d2968219b99
parent 17dd51963367495f75b0f0a73139081dd7b25500

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 #9557)

src/fileio.c

diff --git a/src/fileio.c b/src/fileio.c
index 1fcf0d9..5b5699d 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1300,7 +1300,7 @@
 		    cryptkey = check_for_cryptkey(cryptkey, ptr, &size,
 						  &filesize, newfile, sfname,
 						  &did_ask_for_key);
-# ifdef CRYPT_NOT_INPLACE
+# if defined(CRYPT_NOT_INPLACE) && defined(FEAT_PERSISTENT_UNDO)
 		    if (curbuf->b_cryptstate != NULL
 				 && !crypt_works_inplace(curbuf->b_cryptstate))
 			// reading undo file requires crypt_decode_inplace()

src/version.c

diff --git a/src/version.c b/src/version.c
index 69707fc..4a1b038 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4142,
+/**/
     4141,
 /**/
     4140,