diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-09-23 18:51:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-23 18:51:39 +0200 |
| commit | f8f83579ff42ce01e9fe852ec7d9202c4891db87 (patch) | |
| tree | 5fbd8e27cd1e2fabfef672e8c3ec8045c5cdc75e /src | |
| parent | d3c90cbbb420dd9ea7fc0e1523e9c89a0f8476d0 (diff) | |
| parent | 990c147de39dfbe587927c9261cbb9f928cfd730 (diff) | |
| download | rneovim-f8f83579ff42ce01e9fe852ec7d9202c4891db87.tar.gz rneovim-f8f83579ff42ce01e9fe852ec7d9202c4891db87.tar.bz2 rneovim-f8f83579ff42ce01e9fe852ec7d9202c4891db87.zip | |
Merge #9034 'swapfile: always show dialog'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/memline.c | 1 | ||||
| -rw-r--r-- | src/nvim/normal.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 5602a29f50..ec0238e7c9 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -535,6 +535,7 @@ void ml_open_file(buf_T *buf) void check_need_swap(int newfile) { int old_msg_silent = msg_silent; // might be reset by an E325 message + msg_silent = 0; // If swap dialog prompts for input, user needs to see it! if (curbuf->b_may_swap && (!curbuf->b_p_ro || !newfile)) { ml_open_file(curbuf); diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 45620bfc54..f87de52a82 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -1269,7 +1269,8 @@ static void normal_redraw(NormalState *s) xfree(p); } - if (need_fileinfo) { // show file info after redraw + // show fileinfo after redraw + if (need_fileinfo && !shortmess(SHM_FILEINFO)) { fileinfo(false, true, false); need_fileinfo = false; } |