diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-21 19:16:26 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-03-22 18:43:00 +0100 |
| commit | 9c8540edfd52c77678eac84e48beb56171487b3f (patch) | |
| tree | 9a54fcc4f4252d943e47a6ad5b9310d215204ee2 | |
| parent | f06a6913260a320ec6b8ede5860edb1829c4f8ba (diff) | |
| download | rneovim-9c8540edfd52c77678eac84e48beb56171487b3f.tar.gz rneovim-9c8540edfd52c77678eac84e48beb56171487b3f.tar.bz2 rneovim-9c8540edfd52c77678eac84e48beb56171487b3f.zip | |
vim-patch:8.0.0159
References #5406
Problem: Using a NULL pointer when using feedkeys() to trigger drawing a
tabline.
Solution: Skip drawing a tabline if TabPageIdxs is NULL. (Dominique Pelle)
Also fix recursing into getcmdline() from the cmd window.
https://github.com/vim/vim/commit/c695cec4698b41d7b9555efdd47dda9b1945d3ae
| -rw-r--r-- | src/nvim/ex_getln.c | 2 | ||||
| -rw-r--r-- | src/nvim/screen.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index d99c8d02f7..d6e003a82f 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -698,7 +698,9 @@ static int command_line_execute(VimState *state, int key) if (s->c == cedit_key || s->c == K_CMDWIN) { if (ex_normal_busy == 0 && got_int == false) { // Open a window to edit the command line (and history). + save_cmdline(&s->save_ccline); s->c = ex_window(); + restore_cmdline(&s->save_ccline); s->some_key_typed = true; } } else { diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 280b8c65fe..baec18dd6f 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -6884,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) |