diff options
| author | Jit <jityao+github@gmail.com> | 2019-06-02 21:38:34 +0200 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2019-06-02 21:38:34 +0200 |
| commit | b65a7b7f6692da9c9b18a1fb68817644a119fbed (patch) | |
| tree | 3ea7c873f8a2fd72153f3e41dbfd8a7fc7e2e6c4 /src | |
| parent | cbe45a303e289ae5a09446a0eac3313b08e20b99 (diff) | |
| download | rneovim-b65a7b7f6692da9c9b18a1fb68817644a119fbed.tar.gz rneovim-b65a7b7f6692da9c9b18a1fb68817644a119fbed.tar.bz2 rneovim-b65a7b7f6692da9c9b18a1fb68817644a119fbed.zip | |
[RDY] Fix wildmode=list,full and display+=msgsep interaction (#10103)
* Fix wildmode=list and display+=msgsep interaction
* Add test to check ext_messages behaviour is unchanged
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 2 | ||||
| -rw-r--r-- | src/nvim/screen.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 7498091ade..882fce504b 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2053,7 +2053,7 @@ int msg_scrollsize(void) /* * Scroll the screen up one line for displaying the next message line. */ -static void msg_scroll_up(void) +void msg_scroll_up(void) { if (!msg_did_scroll) { ui_call_win_scroll_over_start(); diff --git a/src/nvim/screen.c b/src/nvim/screen.c index fe9fba7af6..a20c91845d 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -4765,12 +4765,12 @@ win_redr_status_matches ( row = cmdline_row - 1; if (row >= 0) { - if (wild_menu_showing == 0) { + if (wild_menu_showing == 0 || wild_menu_showing == WM_LIST) { if (msg_scrolled > 0) { /* Put the wildmenu just above the command line. If there is * no room, scroll the screen one line up. */ if (cmdline_row == Rows - 1) { - grid_del_lines(&default_grid, 0, 1, (int)Rows, 0, (int)Columns); + msg_scroll_up(); msg_scrolled++; } else { cmdline_row++; |