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
index 4da7b431fc6cf0276b5ffe2a753db0c186bbc9ab..4c4a1b24cb1972c7bf4436727adb403b1f3d4697 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -1100,8 +1100,11 @@ swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED)
     // 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
index b769499328fba3a4fbb3a8b5b4d597d1eadf6016..108c52854d7f33d43e43311bb7b7aeec215407b1 100644 (file)
--- 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
index 83f2c1923c1300614a2b4455bc293eb7eea1329f..f54e6f2c509d2a5178d8c2c1849f968cdeb909f0 100644 (file)
--- 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
index df8d2f917b219c0927a910ab0db0fa6654440052..4d693c45f0489833f9d249531949172ed13dac5c 100644 (file)
--- 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 */
+/**/
+    2588,
 /**/
     2587,
 /**/