# HG changeset patch # User Bram Moolenaar # Date 1615410004 -3600 # Node ID 5dfee9b1eabee748ec6cb98dfccb34d5db7abc77 # Parent f6482a5454ab539b33b1f15487faa561d23ee484 patch 8.2.2588: build failure with tiny features Commit: https://github.com/vim/vim/commit/23b32a8d6bd9ec83c0c6632b7a8bfa544ac0a2f1 Author: Bram Moolenaar Date: Wed Mar 10 21:55:46 2021 +0100 patch 8.2.2588: build failure with tiny features Problem: Build failure with tiny features. Solution: Add #ifdef. Run recover test separately. diff --git a/src/memline.c b/src/memline.c --- a/src/memline.c +++ b/src/memline.c @@ -1100,8 +1100,11 @@ swapfile_process_running(ZERO_BL *b0p, c // process can't be running now. if (mch_stat((char *)swap_fname, &st) != -1 && sysinfo(&sinfo) == 0 - && st.st_mtime < time(NULL) - (override_sysinfo_uptime >= 0 - ? override_sysinfo_uptime : sinfo.uptime)) + && st.st_mtime < time(NULL) - ( +# ifdef FEAT_EVAL + override_sysinfo_uptime >= 0 ? override_sysinfo_uptime : +# endif + sinfo.uptime)) return FALSE; #endif return mch_process_running(char_to_long(b0p->b0_pid)); diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -459,6 +459,7 @@ NEW_TESTS_RES = \ test_quickfix.res \ test_quotestar.res \ test_random.res \ + test_recover.res \ test_regex_char_classes.res \ test_registers.res \ test_rename.res \ diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -21,7 +21,6 @@ source test_jumps.vim source test_lispwords.vim source test_move.vim source test_put.vim -source test_recover.vim source test_reltime.vim source test_scroll_opt.vim source test_searchpos.vim 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 */ /**/ + 2588, +/**/ 2587, /**/ 2586,