Mercurial > vim
diff src/syntax.c @ 12572:31737ff54115 v8.0.1164
patch 8.0.1164: changing StatusLine highlight does not always work
commit https://github.com/vim/vim/commit/65ed136844fbaffdd473903ed841c944600234dc
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 30 16:00:14 2017 +0200
patch 8.0.1164: changing StatusLine highlight does not always work
Problem: Changing StatusLine highlight while evaluating 'statusline' may
not change the status line color.
Solution: When changing highlighting while redrawing don't cause another
redraw. (suggested by Ozaki Kiichi, closes #2171, closes #2120)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 30 Sep 2017 16:15:04 +0200 |
| parents | 1c049248e9ca |
| children | 895da0cbb16e |
line wrap: on
line diff
--- a/src/syntax.c +++ b/src/syntax.c @@ -7378,6 +7378,7 @@ do_highlight( int id; int idx; struct hl_group item_before; + int did_change = FALSE; int dodefault = FALSE; int doclear = FALSE; int dolink = FALSE; @@ -7787,6 +7788,7 @@ do_highlight( /* GUI not started yet, always accept the name. */ vim_free(HL_TABLE()[idx].sg_font_name); HL_TABLE()[idx].sg_font_name = vim_strsave(arg); + did_change = TRUE; } else { @@ -7815,6 +7817,7 @@ do_highlight( gui_mch_free_fontset(temp_sg_fontset); vim_free(HL_TABLE()[idx].sg_font_name); HL_TABLE()[idx].sg_font_name = vim_strsave(arg); + did_change = TRUE; } else HL_TABLE()[idx].sg_fontset = temp_sg_fontset; @@ -7826,6 +7829,7 @@ do_highlight( gui_mch_free_font(temp_sg_font); vim_free(HL_TABLE()[idx].sg_font_name); HL_TABLE()[idx].sg_font_name = vim_strsave(arg); + did_change = TRUE; } else HL_TABLE()[idx].sg_font = temp_sg_font; @@ -7991,6 +7995,7 @@ do_highlight( *namep = vim_strsave(arg); else *namep = NULL; + did_change = TRUE; } # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) # ifdef FEAT_GUI_X11 @@ -8041,6 +8046,7 @@ do_highlight( *namep = vim_strsave(arg); else *namep = NULL; + did_change = TRUE; } # if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) # ifdef FEAT_GUI_X11 @@ -8090,6 +8096,7 @@ do_highlight( *namep = vim_strsave(arg); else *namep = NULL; + did_change = TRUE; } # ifdef FEAT_GUI } @@ -8259,13 +8266,18 @@ do_highlight( /* Only call highlight_changed() once, after a sequence of highlight * commands, and only if an attribute actually changed. */ - if (memcmp(&HL_TABLE()[idx], &item_before, sizeof(item_before)) != 0 + if ((did_change + || memcmp(&HL_TABLE()[idx], &item_before, sizeof(item_before)) != 0) #if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS) && !did_highlight_changed #endif ) { - redraw_all_later(NOT_VALID); + /* Do not trigger a redraw when highlighting is changed while + * redrawing. This may happen when evaluating 'statusline' changes the + * StatusLine group. */ + if (!updating_screen) + redraw_all_later(NOT_VALID); need_highlight_changed = TRUE; } }