To: vim_dev@googlegroups.com Subject: Patch 8.2.2588 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2588 (after 8.2.2586) Problem: Build failure with tiny features. Solution: Add #ifdef. Run recover test separately. Files: src/memline.c, src/testdir/Make_all.mak, src/testdir/test_alot.vim *** ../vim-8.2.2587/src/memline.c 2021-03-10 21:26:34.148867591 +0100 --- src/memline.c 2021-03-10 21:52:00.273815839 +0100 *************** *** 1100,1107 **** // 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)) return FALSE; #endif return mch_process_running(char_to_long(b0p->b0_pid)); --- 1100,1110 ---- // process can't be running now. if (mch_stat((char *)swap_fname, &st) != -1 && sysinfo(&sinfo) == 0 ! && 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)); *** ../vim-8.2.2587/src/testdir/Make_all.mak 2021-01-16 20:20:59.650487081 +0100 --- src/testdir/Make_all.mak 2021-03-10 21:54:42.037560722 +0100 *************** *** 459,464 **** --- 459,465 ---- test_quickfix.res \ test_quotestar.res \ test_random.res \ + test_recover.res \ test_regex_char_classes.res \ test_registers.res \ test_rename.res \ *** ../vim-8.2.2587/src/testdir/test_alot.vim 2020-04-13 18:25:05.614342830 +0200 --- src/testdir/test_alot.vim 2021-03-10 21:54:16.497602508 +0100 *************** *** 21,27 **** 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 --- 21,26 ---- *** ../vim-8.2.2587/src/version.c 2021-03-10 21:46:35.502399349 +0100 --- src/version.c 2021-03-10 21:55:27.437485326 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2588, /**/ -- "The future's already arrived - it's just not evenly distributed yet." -- William Gibson /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///