To: vim_dev@googlegroups.com
Subject: Patch 9.0.0329
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.0329
Problem:    ":highlight" hangs when 'cmdheight' is zero.
Solution:   Add to msg_col when using the message window. (closes #11014)
Files:      src/message.c, src/highlight.c


*** ../vim-9.0.0328/src/message.c	2022-08-29 18:16:11.578636822 +0100
--- src/message.c	2022-08-30 15:42:12.512113330 +0100
***************
*** 2261,2267 ****
  #ifdef HAS_MESSAGE_WINDOW
  
  /*
!  * Put text "t_s" until "s" in the message window.
   * "where" specifies where to put the text.
   */
      static void
--- 2261,2267 ----
  #ifdef HAS_MESSAGE_WINDOW
  
  /*
!  * Put text "t_s" until "end" in the message window.
   * "where" specifies where to put the text.
   */
      static void
***************
*** 2308,2314 ****
      redraw_win_later(wp, UPD_NOT_VALID);
  
      // set msg_col so that a newline is written if needed
!     msg_col = (int)STRLEN(t_s);
  }
  #endif
  
--- 2308,2314 ----
      redraw_win_later(wp, UPD_NOT_VALID);
  
      // set msg_col so that a newline is written if needed
!     msg_col += (int)(end - t_s);
  }
  #endif
  
*** ../vim-9.0.0328/src/highlight.c	2022-08-26 16:58:46.139489368 +0100
--- src/highlight.c	2022-08-30 15:33:13.284109288 +0100
***************
*** 1429,1434 ****
--- 1429,1435 ----
      // If no argument, list current highlighting.
      if (!init && ends_excmd2(line - 1, line))
      {
+ 	dont_use_message_window();
  	for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i)
  	    // TODO: only call when the group has attributes set
  	    highlight_list_one((int)i);
*** ../vim-9.0.0328/src/version.c	2022-08-30 15:05:27.016802522 +0100
--- src/version.c	2022-08-30 15:27:44.371548232 +0100
***************
*** 709,710 ****
--- 709,712 ----
  {   /* Add new patch number below this line */
+ /**/
+     329,
  /**/

-- 
"I thought there was something different.  You no longer smell
of excrement.  It suits you!"  --  the Outpost

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