To: vim_dev@googlegroups.com Subject: Patch 8.2.4142 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4142 Problem: Build failure with normal features without persistent undo. Solution: Adjust #ifdef. (closes #9557) Files: src/fileio.c *** ../vim-8.2.4141/src/fileio.c 2022-01-08 16:19:18.501639918 +0000 --- src/fileio.c 2022-01-19 11:19:57.570065914 +0000 *************** *** 1300,1306 **** cryptkey = check_for_cryptkey(cryptkey, ptr, &size, &filesize, newfile, sfname, &did_ask_for_key); ! # ifdef CRYPT_NOT_INPLACE if (curbuf->b_cryptstate != NULL && !crypt_works_inplace(curbuf->b_cryptstate)) // reading undo file requires crypt_decode_inplace() --- 1300,1306 ---- cryptkey = check_for_cryptkey(cryptkey, ptr, &size, &filesize, newfile, sfname, &did_ask_for_key); ! # 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() *** ../vim-8.2.4141/src/version.c 2022-01-18 21:42:33.836745971 +0000 --- src/version.c 2022-01-19 11:22:02.410613674 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4142, /**/ -- -rwxr-xr-x 1 root 24 Oct 29 1929 /bin/ed -rwxr-xr-t 4 root 131720 Jan 1 1970 /usr/ucb/vi -rwxr-xr-x 1 root 5.89824e37 Oct 22 1990 /usr/bin/emacs /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///