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)

diff --git a/src/fileio.c b/src/fileio.c
index 1fcf0d983a968728464d5235d783f2f1f79c2bba..5b5699d65cdbe230bc13698938f7c44ab03d8752 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1300,7 +1300,7 @@ retry:
                    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()

diff --git a/src/version.c b/src/version.c
index 69707fcd5ccb1f21f0cc26b6f227d430f87d4c1e..4a1b0388e1b09df8c5deb7312aa3cdead653b868 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4142,
 /**/
     4141,
 /**/