# HG changeset patch # User Bram Moolenaar # Date 1642591805 -3600 # Node ID 6ce83b3745c0bf4c9335f6d92993ee071e2c06d5 # Parent 1fa8aefced2ef9f5be109fbf770f2a9faa0450b9 patch 8.2.4142: build failure with normal features without persistent undo Commit: https://github.com/vim/vim/commit/b4868eddd9cdc7086c88a7a3699dd435d34ae904 Author: Bram Moolenaar 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 --git a/src/fileio.c b/src/fileio.c --- 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 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4142, +/**/ 4141, /**/ 4140,