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 8.1.0481: when "Terminal" highlight is reverted cursor doesn't show

Browse Source 
Problem:    When "Terminal" highlight is reverted cursor doesn't show.
Solution:   Get the colors of the "Terminal" group. (closes #3546)
This commit is contained in:
Bram Moolenaar 2018-10-16 22:13:00 +02:00
parent b361db077f
commit 29e7fe55be
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/terminal.c
View File

@ -1953,6 +1953,8 @@ term_get_cursor_shape(guicolor_T *fg, guicolor_T *bg)
{ {
term_T *term = in_terminal_loop; term_T *term = in_terminal_loop;
static cursorentry_T entry; static cursorentry_T entry;
int id;
guicolor_T term_fg, term_bg;
vim_memset(&entry, 0, sizeof(entry)); vim_memset(&entry, 0, sizeof(entry));
entry.shape = entry.mshape = entry.shape = entry.mshape =
@ -1966,9 +1968,24 @@ term_get_cursor_shape(guicolor_T *fg, guicolor_T *bg)
entry.blinkon = 400; entry.blinkon = 400;
entry.blinkoff = 250; entry.blinkoff = 250;
} }
*fg = gui.back_pixel;
/* The "Terminal" highlight group overrules the defaults. */
id = syn_name2id((char_u *)"Terminal");
if (id != 0)
{
syn_id2colors(id, &term_fg, &term_bg);
*fg = term_bg;
}
else
*fg = gui.back_pixel;
if (term->tl_cursor_color == NULL) if (term->tl_cursor_color == NULL)
*bg = gui.norm_pixel; {
if (id != 0)
*bg = term_fg;
else
*bg = gui.norm_pixel;
}
else else
*bg = color_name2handle(term->tl_cursor_color); *bg = color_name2handle(term->tl_cursor_color);
entry.name = "n"; entry.name = "n";

2
src/version.c
View File

@ -792,6 +792,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 */
/**/
481,
/**/ /**/
480, 480,
/**/ /**/