Mercurial > vim

changeset 27227:6ce83b3745c0 v8.2.4142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Wed, 19 Jan 2022 12:30:05 +0100
parents 1fa8aefced2e
children 50d7f7e0cbd2
files src/fileio.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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,