diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-27 17:14:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 17:14:31 -0500 |
| commit | a58c5509d94f01f4a4edd6b4784f8d00b70af5b3 (patch) | |
| tree | b3cadc41e6fd4c747de5635dc0fb7556ec5e6e13 /src/nvim/ex_cmds2.c | |
| parent | f2be59d8f80f2a1a68d5976b9cec3fa55da3700e (diff) | |
| parent | cff4cad25a1236bd869843f9578b7f276518d9b8 (diff) | |
| download | rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.gz rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.tar.bz2 rneovim-a58c5509d94f01f4a4edd6b4784f8d00b70af5b3.zip | |
Merge pull request #13607 from janlazo/vim-8.2.2221
vim-patch:8.1.2227,8.2.{315,928,1007,1052,1121,1580,2221,2229,2231,2232}
Diffstat (limited to 'src/nvim/ex_cmds2.c')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 3b9c44c3cd..bde584d27e 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -3392,7 +3392,7 @@ void ex_checktime(exarg_T *eap) } else { buf = buflist_findnr((int)eap->line2); if (buf != NULL) { // cannot happen? - (void)buf_check_timestamp(buf, false); + (void)buf_check_timestamp(buf); } } no_check_timestamps = save_no_check_timestamps; @@ -3790,6 +3790,14 @@ void ex_drop(exarg_T *eap) if (wp->w_buffer == buf) { goto_tabpage_win(tp, wp); curwin->w_arg_idx = 0; + if (!bufIsChanged(curbuf)) { + const int save_ar = curbuf->b_p_ar; + + // reload the file if it is newer + curbuf->b_p_ar = 1; + buf_check_timestamp(curbuf); + curbuf->b_p_ar = save_ar; + } return; } } |