To: vim_dev@googlegroups.com
Subject: Patch 9.0.0306
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0306
Problem:    Buffer write message is two lines in message popup window.
Solution:   Overwrite message if "msg_scroll" is off.
Files:      src/message.c, src/testdir/test_messages.vim,
            src/testdir/dumps/Test_cmdheight_zero_5.dump


*** ../vim-9.0.0305/src/message.c	2022-08-28 17:53:20.563251522 +0100
--- src/message.c	2022-08-28 20:03:54.152618476 +0100
***************
*** 1470,1479 ****
  #ifdef HAS_MESSAGE_WINDOW
      if (use_message_window())
      {
! 	if (popup_message_win_visible() && msg_col > 0)
  	{
  	    win_T *wp = popup_get_message_win();
  
  	    curbuf = wp->w_buffer;
  	    ml_append(wp->w_buffer->b_ml.ml_line_count,
  					      (char_u *)"", (colnr_T)0, FALSE);
--- 1470,1481 ----
  #ifdef HAS_MESSAGE_WINDOW
      if (use_message_window())
      {
! 	if (popup_message_win_visible() && msg_col > 0
! 					       && (msg_scroll || !full_screen))
  	{
  	    win_T *wp = popup_get_message_win();
  
+ 	    // start a new line
  	    curbuf = wp->w_buffer;
  	    ml_append(wp->w_buffer->b_ml.ml_line_count,
  					      (char_u *)"", (colnr_T)0, FALSE);
*** ../vim-9.0.0305/src/testdir/test_messages.vim	2022-08-28 14:39:34.355253105 +0100
--- src/testdir/test_messages.vim	2022-08-28 20:02:47.772623716 +0100
***************
*** 494,506 ****
    call VerifyScreenDump(buf, 'Test_cmdheight_zero_3', {})
  
    " Message for CTRL-C is in the popup window
-   "call term_sendkeys(buf, ":call popup_clear()\<CR>")
    call term_sendkeys(buf, "\<C-C>")
    call VerifyScreenDump(buf, 'Test_cmdheight_zero_4', {})
  
    " clean up
    call StopVimInTerminal(buf)
    call delete('XtestCmdheight')
  endfunc
  
  func Test_cmdheight_zero_shell()
--- 494,510 ----
    call VerifyScreenDump(buf, 'Test_cmdheight_zero_3', {})
  
    " Message for CTRL-C is in the popup window
    call term_sendkeys(buf, "\<C-C>")
    call VerifyScreenDump(buf, 'Test_cmdheight_zero_4', {})
  
+   " file write message is one line
+   call term_sendkeys(buf, ":w XsomeText\<CR>")
+   call VerifyScreenDump(buf, 'Test_cmdheight_zero_5', {})
+ 
    " clean up
    call StopVimInTerminal(buf)
    call delete('XtestCmdheight')
+   call delete('XsomeText')
  endfunc
  
  func Test_cmdheight_zero_shell()
*** ../vim-9.0.0305/src/testdir/dumps/Test_cmdheight_zero_5.dump	2022-08-28 20:58:01.355751758 +0100
--- src/testdir/dumps/Test_cmdheight_zero_5.dump	2022-08-28 20:02:51.352623507 +0100
***************
*** 0 ****
--- 1,6 ----
+ |s+0&#ffffff0|o|m|e| >t|e|x|t| @65
+ |~+0#4040ff13&| @73
+ |~| @73
+ |~| @73
+ |═+0#e000002&@74
+ |"|X|s|o|m|e|T|e|x|t|"| |[|N|e|w|]| |1|L|,| |1|0|B| |w|r|i|t@1|e|n| @41
*** ../vim-9.0.0305/src/version.c	2022-08-28 19:41:32.971011211 +0100
--- src/version.c	2022-08-28 19:59:37.060618740 +0100
***************
*** 709,710 ****
--- 709,712 ----
  {   /* Add new patch number below this line */
+ /**/
+     306,
  /**/

-- 
Corn oil comes from corn and olive oil comes from olives, so where
does baby oil come from?

 /// 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    ///