mirror of
https://github.com/neovim/neovim.git
synced 2025-09-23 19:48:32 +00:00
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.
c695cec469
This commit is contained in:
@@ -698,7 +698,9 @@ static int command_line_execute(VimState *state, int key)
|
|||||||
if (s->c == cedit_key || s->c == K_CMDWIN) {
|
if (s->c == cedit_key || s->c == K_CMDWIN) {
|
||||||
if (ex_normal_busy == 0 && got_int == false) {
|
if (ex_normal_busy == 0 && got_int == false) {
|
||||||
// Open a window to edit the command line (and history).
|
// Open a window to edit the command line (and history).
|
||||||
|
save_cmdline(&s->save_ccline);
|
||||||
s->c = ex_window();
|
s->c = ex_window();
|
||||||
|
restore_cmdline(&s->save_ccline);
|
||||||
s->some_key_typed = true;
|
s->some_key_typed = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@@ -6884,7 +6884,10 @@ static void draw_tabline(void)
|
|||||||
int use_sep_chars = (t_colors < 8
|
int use_sep_chars = (t_colors < 8
|
||||||
);
|
);
|
||||||
|
|
||||||
redraw_tabline = FALSE;
|
if (ScreenLines == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
redraw_tabline = false;
|
||||||
|
|
||||||
|
|
||||||
if (tabline_height() < 1)
|
if (tabline_height() < 1)
|
||||||
|
Reference in New Issue
Block a user