aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-03-24 18:30:35 +0100
committerGitHub <noreply@github.com>2017-03-24 18:30:35 +0100
commit38274051c066ff0a28582aae5c2edf47825d9f57 (patch)
tree19fba05c7d751fd3ee9aaa20b6a65675a6001c3e /src/nvim/screen.c
parenta62ec4eb989f41ace8e6b7f085349a2bce964d68 (diff)
parent7214d0bc846179a862e8d3061d00270a6caa0d7b (diff)
downloadrneovim-38274051c066ff0a28582aae5c2edf47825d9f57.tar.gz
rneovim-38274051c066ff0a28582aae5c2edf47825d9f57.tar.bz2
rneovim-38274051c066ff0a28582aae5c2edf47825d9f57.zip
Merge pull request #6323 from justinmk/vimpatches
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index b98e59ed06..baec18dd6f 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2922,7 +2922,6 @@ win_line (
}
} else if (v == (long)shl->endcol) {
shl->attr_cur = 0;
- prev_syntax_id = 0;
next_search_hl(wp, shl, lnum, (colnr_T)v,
shl == &search_hl ? NULL : cur);
@@ -6885,7 +6884,10 @@ static void draw_tabline(void)
int use_sep_chars = (t_colors < 8
);
- redraw_tabline = FALSE;
+ if (ScreenLines == NULL) {
+ return;
+ }
+ redraw_tabline = false;
if (tabline_height() < 1)