0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

patch 8.1.1606: on a narrow screen ":hi" output is confusing

Problem:    On a narrow screen ":hi" output is confusing.
Solution:   Insert a space between highlight group name and "xxx". (Masato
            Nishihaga, closes #4599)
This commit is contained in:
Bram Moolenaar
2019-06-29 03:42:42 +02:00
parent 4340fc95d5
commit 548be7f126
3 changed files with 14 additions and 0 deletions

View File

@@ -9440,6 +9440,7 @@ syn_list_header(
{ {
int endcol = 19; int endcol = 19;
int newline = TRUE; int newline = TRUE;
int name_col = 0;
if (!did_header) if (!did_header)
{ {
@@ -9447,6 +9448,7 @@ syn_list_header(
if (got_int) if (got_int)
return TRUE; return TRUE;
msg_outtrans(HL_TABLE()[id - 1].sg_name); msg_outtrans(HL_TABLE()[id - 1].sg_name);
name_col = msg_col;
endcol = 15; endcol = 15;
} }
else if (msg_col + outlen + 1 >= Columns) else if (msg_col + outlen + 1 >= Columns)
@@ -9471,6 +9473,8 @@ syn_list_header(
/* Show "xxx" with the attributes. */ /* Show "xxx" with the attributes. */
if (!did_header) if (!did_header)
{ {
if (endcol == Columns - 1 && endcol <= name_col)
msg_putchar(' ');
msg_puts_attr("xxx", syn_id2attr(id)); msg_puts_attr("xxx", syn_id2attr(id));
msg_putchar(' '); msg_putchar(' ');
} }

View File

@@ -607,3 +607,11 @@ func Test_1_highlight_Normalgroup_exists()
call assert_match('hi Normal\s*clear', hlNormal) call assert_match('hi Normal\s*clear', hlNormal)
endif endif
endfunc endfunc
function Test_no_space_before_xxx()
let l:org_columns = &columns
set columns=17
let l:hi_StatusLineTermNC = join(split(execute('hi StatusLineTermNC')))
call assert_match('StatusLineTermNC xxx', l:hi_StatusLineTermNC)
let &columns = l:org_columns
endfunction

View File

@@ -777,6 +777,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 */
/**/
1606,
/**/ /**/
1605, 1605,
/**/ /**/