To: vim_dev@googlegroups.com Subject: Patch 9.0.0964 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0964 Problem: Status line of other window not redrawn when dragging it when 'splitkeep' is set to "screen". Solution: Set w_redr_status earlier. (Luuk van Baal, closes #11635, closes #11632) Files: src/window.c, src/testdir/test_window_cmd.vim, src/testdir/dumps/Test_splitkeep_status_1.dump *** ../vim-9.0.0963/src/window.c 2022-11-25 13:03:28.200437332 +0000 --- src/window.c 2022-11-28 16:48:24.478941623 +0000 *************** *** 6832,6837 **** --- 6832,6838 ---- wp->w_height = height; wp->w_skipcol = 0; + wp->w_redr_status = TRUE; win_comp_scroll(wp); // There is no point in adjusting the scroll position when exiting. Some *************** *** 6958,6964 **** wp->w_prev_fraction_row = wp->w_wrow; redraw_win_later(wp, UPD_SOME_VALID); - wp->w_redr_status = TRUE; invalidate_botline_win(wp); } --- 6959,6964 ---- *** ../vim-9.0.0963/src/testdir/test_window_cmd.vim 2022-11-02 13:30:37.546314580 +0000 --- src/testdir/test_window_cmd.vim 2022-11-28 16:46:18.611132171 +0000 *************** *** 1895,1898 **** --- 1895,1916 ---- call VerifyScreenDump(buf, 'Test_splitkeep_fold_4', {}) endfunction + function Test_splitkeep_status() + CheckScreendump + + let lines =<< trim END + call setline(1, ['a', 'b', 'c']) + set nomodified + set splitkeep=screen + let win = winnr() + wincmd s + wincmd j + END + call writefile(lines, 'XTestSplitkeepStatus', 'D') + let buf = RunVimInTerminal('-S XTestSplitkeepStatus', #{rows: 10}) + + call term_sendkeys(buf, ":call win_move_statusline(win, 1)\") + call VerifyScreenDump(buf, 'Test_splitkeep_status_1', {}) + endfunction + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-9.0.0963/src/testdir/dumps/Test_splitkeep_status_1.dump 2022-11-28 16:49:13.110875503 +0000 --- src/testdir/dumps/Test_splitkeep_status_1.dump 2022-11-28 16:46:32.295109941 +0000 *************** *** 0 **** --- 1,10 ---- + |a+0&#ffffff0| @73 + |b| @73 + |c| @73 + |~+0#4040ff13&| @73 + |~| @73 + |[+1#0000000&|N|o| |N|a|m|e|]| @47|1|,|1| @11|A|l@1 + >b+0&&| @73 + |c| @73 + |[+3&&|N|o| |N|a|m|e|]| @47|2|,|1| @11|B|o|t + |:+0&&|c|a|l@1| |w|i|n|_|m|o|v|e|_|s|t|a|t|u|s|l|i|n|e|(|w|i|n|,| |1|)| @41 *** ../vim-9.0.0963/src/version.c 2022-11-28 11:36:46.299659897 +0000 --- src/version.c 2022-11-28 16:41:34.163703797 +0000 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 964, /**/ -- hundred-and-one symptoms of being an internet addict: 170. You introduce your wife as "my_lady@home.wife" and refer to your children as "forked processes." /// 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 ///