patch 9.0.0329: ":highlight" hangs when 'cmdheight' is zero
Problem: ":highlight" hangs when 'cmdheight' is zero.
Solution: Add to msg_col when using the message window. (closes #11014)
diff --git a/src/highlight.c b/src/highlight.c
index 95cdb46..3a12312 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -1429,6 +1429,7 @@
// 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);
diff --git a/src/message.c b/src/message.c
index f92c454..0c8280e 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2261,7 +2261,7 @@
#ifdef HAS_MESSAGE_WINDOW
/*
- * Put text "t_s" until "s" in the message window.
+ * Put text "t_s" until "end" in the message window.
* "where" specifies where to put the text.
*/
static void
@@ -2308,7 +2308,7 @@
redraw_win_later(wp, UPD_NOT_VALID);
// set msg_col so that a newline is written if needed
- msg_col = (int)STRLEN(t_s);
+ msg_col += (int)(end - t_s);
}
#endif
diff --git a/src/version.c b/src/version.c
index 5107549..e9c9250 100644
--- a/src/version.c
+++ b/src/version.c
@@ -708,6 +708,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 329,
+/**/
328,
/**/
327,