diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-30 15:44:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-30 15:44:22 +0100 |
| commit | 24735f2a19c666f545330a267a32ae5df72db25c (patch) | |
| tree | 17d9cdc996658963dd038241d9a4e6cc771fcdcd | |
| parent | e27d6e6382795e86ea4dd3a86396350a4c29b6fb (diff) | |
patch 9.0.0329: ":highlight" hangs when 'cmdheight' is zerov9.0.0329
Problem: ":highlight" hangs when 'cmdheight' is zero.
Solution: Add to msg_col when using the message window. (closes #11014)
| -rw-r--r-- | src/highlight.c | 1 | ||||
| -rw-r--r-- | src/message.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/highlight.c b/src/highlight.c index 95cdb46b5a..3a12312fc5 100644 --- a/src/highlight.c +++ b/src/highlight.c @@ -1429,6 +1429,7 @@ do_highlight( // 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 f92c454854..0c8280ec05 100644 --- a/src/message.c +++ b/src/message.c @@ -2261,7 +2261,7 @@ msg_puts_attr_len(char *str, int maxlen, int attr) #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 @@ 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); // 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 5107549360..e9c925017a 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 329, +/**/ 328, /**/ 327, |