diff --git a/src/fileio.c b/src/fileio.c
index 1fcf0d983a..5b5699d65c 100644
--- 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 69707fcd5c..4a1b0388e1 100644
--- 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,
 /**/