To: vim_dev@googlegroups.com Subject: Patch 8.2.4401 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4401 Problem: Map listing does not clear the rest of the command line. Solution: Call msg_clear_eos(). (closes #5623, closes #5962) Files: src/map.c, src/testdir/test_mapping.vim, src/testdir/dumps/Test_map_list_1.dump *** ../vim-8.2.4400/src/map.c 2022-01-31 14:59:33.518943700 +0000 --- src/map.c 2022-02-16 18:24:18.347704375 +0000 *************** *** 204,209 **** --- 204,210 ---- if (p_verbose > 0) last_set_msg(mp->m_script_ctx); #endif + msg_clr_eos(); out_flush(); // show one line at a time } *** ../vim-8.2.4400/src/testdir/test_mapping.vim 2022-02-10 14:03:56.030129442 +0000 --- src/testdir/test_mapping.vim 2022-02-16 18:24:34.787682238 +0000 *************** *** 540,546 **** END call writefile(lines, 'XtestExprMap') let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10}) - call TermWait(buf) call term_sendkeys(buf, "\") call VerifyScreenDump(buf, 'Test_map_expr_1', {}) --- 540,545 ---- *************** *** 549,554 **** --- 548,569 ---- call delete('XtestExprMap') endfunc + func Test_map_listing() + CheckScreendump + + let lines =<< trim END + nmap a b + END + call writefile(lines, 'XtestMapList') + let buf = RunVimInTerminal('-S XtestMapList', #{rows: 6}) + call term_sendkeys(buf, ": nmap a\") + call VerifyScreenDump(buf, 'Test_map_list_1', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XtestMapList') + endfunc + func Test_expr_map_error() CheckScreendump *************** *** 565,571 **** END call writefile(lines, 'XtestExprMap') let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10}) - call TermWait(buf) call term_sendkeys(buf, "\") call TermWait(buf) call term_sendkeys(buf, "\") --- 580,585 ---- *** ../vim-8.2.4400/src/testdir/dumps/Test_map_list_1.dump 2022-02-16 18:24:47.199665461 +0000 --- src/testdir/dumps/Test_map_list_1.dump 2022-02-16 18:23:41.143754153 +0000 *************** *** 0 **** --- 1,6 ---- + > +0&#ffffff0@74 + |~+0#4040ff13&| @73 + |~| @73 + |~| @73 + |~| @73 + |n+0#0000000&| @1|a| @12|b| @38|0|,|0|-|1| @8|A|l@1| *** ../vim-8.2.4400/src/version.c 2022-02-16 17:51:43.778583423 +0000 --- src/version.c 2022-02-16 18:20:10.676024600 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4401, /**/ -- Never go to the toilet in a paperless office. /// 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 ///