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/fileio.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/fileio.c')
-rw-r--r-- | src/nvim/fileio.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 1568bf3fbb..e1e34bf24a 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -4675,7 +4675,6 @@ check_timestamps( ) { int didit = 0; - int n; /* Don't check timestamps while system() or another low-level function may * cause us to lose and gain focus. */ @@ -4703,7 +4702,7 @@ check_timestamps( if (buf->b_nwindows > 0) { bufref_T bufref; set_bufref(&bufref, buf); - n = buf_check_timestamp(buf, focus); + const int n = buf_check_timestamp(buf); if (didit < n) { didit = n; } @@ -4773,11 +4772,7 @@ static int move_lines(buf_T *frombuf, buf_T *tobuf) * return 2 if a message has been displayed. * return 0 otherwise. */ -int -buf_check_timestamp( - buf_T *buf, - int focus /* called for GUI focus event */ -) +int buf_check_timestamp(buf_T *buf) FUNC_ATTR_NONNULL_ALL { int retval = 0; |