To: vim_dev@googlegroups.com Subject: Patch 8.1.1997 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1997 Problem: No redraw after a popup window filter is invoked. Solution: Redraw if needed. Files: src/popupwin.c, src/testdir/test_popupwin.vim src/testdir/dumps/Test_popupwin_menu_filter_5.dump *** ../vim-8.1.1996/src/popupwin.c 2019-09-03 22:08:13.673035035 +0200 --- src/popupwin.c 2019-09-07 14:05:18.188421566 +0200 *************** *** 2802,2807 **** --- 2802,2809 ---- && (wp->w_filter_mode & state) != 0) res = invoke_popup_filter(wp, c); + if (must_redraw) + redraw_after_callback(FALSE); recursive = FALSE; KeyTyped = save_KeyTyped; return res; *** ../vim-8.1.1996/src/testdir/test_popupwin.vim 2019-09-06 21:34:25.362847408 +0200 --- src/testdir/test_popupwin.vim 2019-09-07 14:02:48.596786460 +0200 *************** *** 2159,2167 **** call win_execute(a:winid, "call setpos('.', [0, line('.') - 1, 1, 0])") return 1 endif ! if a:key == 'x' call popup_close(a:winid) ! return 1 endif return 0 endfunction --- 2159,2167 ---- call win_execute(a:winid, "call setpos('.', [0, line('.') - 1, 1, 0])") return 1 endif ! if a:key == ':' call popup_close(a:winid) ! return 0 endif return 0 endfunction *************** *** 2185,2191 **** call term_sendkeys(buf, "0") call VerifyScreenDump(buf, 'Test_popupwin_menu_filter_4', {}) ! call term_sendkeys(buf, "x") " clean up call StopVimInTerminal(buf) --- 2185,2194 ---- call term_sendkeys(buf, "0") call VerifyScreenDump(buf, 'Test_popupwin_menu_filter_4', {}) ! " check that when the popup is closed in the filter the screen is redrawn ! call term_sendkeys(buf, ":") ! call VerifyScreenDump(buf, 'Test_popupwin_menu_filter_5', {}) ! call term_sendkeys(buf, "\") " clean up call StopVimInTerminal(buf) *** ../vim-8.1.1996/src/testdir/dumps/Test_popupwin_menu_filter_5.dump 2019-09-07 14:06:11.928303858 +0200 --- src/testdir/dumps/Test_popupwin_menu_filter_5.dump 2019-09-07 14:02:58.208761148 +0200 *************** *** 0 **** --- 1,10 ---- + | +0&#ffffff0@74 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |~| @73 + |:+0#0000000&> @73 *** ../vim-8.1.1996/src/version.c 2019-09-06 22:45:47.578271556 +0200 --- src/version.c 2019-09-07 13:17:41.100148499 +0200 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 1997, /**/ -- hundred-and-one symptoms of being an internet addict: 203. You're an active member of more than 20 newsgroups. /// 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 ///