aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.0329: ":highlight" hangs when 'cmdheight' is zero

Browse Source 
Problem:    ":highlight" hangs when 'cmdheight' is zero.
Solution:   Add to msg_col when using the message window. (closes #11014)
This commit is contained in:
Bram Moolenaar 2022-08-30 15:44:22 +01:00
parent e27d6e6382
commit 24735f2a19
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/highlight.c
View File

@ -1429,6 +1429,7 @@ do_highlight(
// If no argument, list current highlighting. // If no argument, list current highlighting.
if (!init && ends_excmd2(line - 1, line)) if (!init && ends_excmd2(line - 1, line))
{ {
dont_use_message_window();
for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i) for (i = 1; i <= highlight_ga.ga_len && !got_int; ++i)
// TODO: only call when the group has attributes set // TODO: only call when the group has attributes set
highlight_list_one((int)i); highlight_list_one((int)i);

4
src/message.c
View File

@ -2261,7 +2261,7 @@ msg_puts_attr_len(char *str, int maxlen, int attr)
#ifdef HAS_MESSAGE_WINDOW #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. * "where" specifies where to put the text.
*/ */
static void static void
@ -2308,7 +2308,7 @@ put_msg_win(win_T *wp, int where, char_u *t_s, char_u *end, linenr_T lnum)
redraw_win_later(wp, UPD_NOT_VALID); redraw_win_later(wp, UPD_NOT_VALID);
// set msg_col so that a newline is written if needed // set msg_col so that a newline is written if needed
msg_col = (int)STRLEN(t_s); msg_col += (int)(end - t_s);
} }
#endif #endif

2
src/version.c
View File

@ -707,6 +707,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
329,
/**/ /**/
328, 328,
/**/ /**/