diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-27 14:24:54 -0500 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-27 14:37:19 -0500 |
commit | cff4cad25a1236bd869843f9578b7f276518d9b8 (patch) | |
tree | 2c87eac4aec90d17cf8448f9f3b2d58765454d06 /src/nvim/ex_cmds2.c | |
parent | 883114e8824ecf5094faa2c860bd1379228d209f (diff) | |
download | rneovim-cff4cad25a1236bd869843f9578b7f276518d9b8.tar.gz rneovim-cff4cad25a1236bd869843f9578b7f276518d9b8.tar.bz2 rneovim-cff4cad25a1236bd869843f9578b7f276518d9b8.zip |
vim-patch:8.2.2231: when "--remote file" is used "file" is not reloaded
Problem: When "--remote file" is used "file" is not reloaded.
Solution: When a :drop command is used for a file that is already displayed
in a window and it has not been changed, check if it needs to be
reloaded. (closes vim/vim#7560)
https://github.com/vim/vim/commit/e4862a0fe62261754daf476866ef2aa8586b716c
Remove unused "focus" parameter from "buf_check_timestamp()".
It was meant for removed GUI code.
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; } } |