To: vim_dev@googlegroups.com Subject: Patch 9.0.0352 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0352 Problem: using :echowindow in a timer clears part of message Solution: Do not use msg_clr_eos(). Files: src/message.c, src/testdir/dumps/Test_echowindow_2.dump, src/testdir/dumps/Test_echowindow_4.dump *** ../vim-9.0.0351/src/message.c 2022-08-31 14:46:07.907016957 +0100 --- src/message.c 2022-09-01 16:56:43.214610270 +0100 *************** *** 1443,1449 **** } #ifdef FEAT_EVAL ! if (need_clr_eos || in_echowindow) { // Halfway an ":echo" command and getting an (error) message: clear // any text from the command. --- 1443,1449 ---- } #ifdef FEAT_EVAL ! if (need_clr_eos) { // Halfway an ":echo" command and getting an (error) message: clear // any text from the command. *************** *** 3646,3651 **** --- 3646,3655 ---- void msg_clr_eos_force(void) { + #ifdef HAS_MESSAGE_WINDOW + if (in_echowindow) + return; // messages go into a popup + #endif if (msg_use_printf()) { if (full_screen) // only when termcap codes are valid *** ../vim-9.0.0351/src/testdir/dumps/Test_echowindow_2.dump 2022-08-29 18:16:11.578636822 +0100 --- src/testdir/dumps/Test_echowindow_2.dump 2022-09-01 16:58:38.907539974 +0100 *************** *** 5,8 **** |═+0#e000002&@74 |f|i|r|s|t| |l|i|n|e| @64 |s|e|c|o|n|d| |l|i|n|e| @63 ! | +0#0000000&@56|1|,|1| @10|A|l@1| --- 5,8 ---- |═+0#e000002&@74 |f|i|r|s|t| |l|i|n|e| @64 |s|e|c|o|n|d| |l|i|n|e| @63 ! |:+0#0000000&|c|a|l@1| |S|h|o|w|M|e|s@1|a|g|e|(|'|s|e|c|o|n|d| |l|i|n|e|'|)| @24|1|,|1| @10|A|l@1| *** ../vim-9.0.0351/src/testdir/dumps/Test_echowindow_4.dump 2022-09-01 16:42:59.931897217 +0100 --- src/testdir/dumps/Test_echowindow_4.dump 2022-09-01 16:58:40.175549099 +0100 *************** *** 5,8 **** |l|i|n|e| |1|7| @67 |l|i|n|e| |1|8| @67 |l|i|n|e| |1|9| @67 ! | +0#0000000&@56|1|,|1| @10|A|l@1| --- 5,8 ---- |l|i|n|e| |1|7| @67 |l|i|n|e| |1|8| @67 |l|i|n|e| |1|9| @67 ! |:+0#0000000&|c|a|l@1| |M|a|n|y|M|e|s@1|a|g|e|s|(|)| @36|1|,|1| @10|A|l@1| *** ../vim-9.0.0351/src/version.c 2022-09-01 16:42:59.931897217 +0100 --- src/version.c 2022-09-01 17:00:22.148217471 +0100 *************** *** 709,710 **** --- 709,712 ---- { /* Add new patch number below this line */ + /**/ + 352, /**/ -- A village. Sound of chanting of Latin canon, punctuated by short, sharp cracks. It comes nearer. We see it is a line of MONKS ala SEVENTH SEAL flagellation scene, chanting and banging themselves on the foreheads with wooden boards. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///