Mercurial > vim
changeset 23376:0d79d18f1c69 v8.2.2231
patch 8.2.2231: when "--remote file" is used "file" is not reloaded
Commit: https://github.com/vim/vim/commit/e4862a0fe62261754daf476866ef2aa8586b716c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 27 19:00:24 2020 +0100
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 #7560)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Dec 2020 19:15:03 +0100 |
| parents | d1e50afeccb8 |
| children | 9ab713bd803a |
| files | src/ex_cmds.c src/testdir/test_clientserver.vim src/version.c |
| diffstat | 3 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -5171,6 +5171,15 @@ ex_drop(exarg_T *eap) { goto_tabpage_win(tp, wp); curwin->w_arg_idx = 0; + if (!bufIsChanged(curbuf)) + { + int save_ar = curbuf->b_p_ar; + + // reload the file if it is newer + curbuf->b_p_ar = TRUE; + buf_check_timestamp(curbuf, FALSE); + curbuf->b_p_ar = save_ar; + } return; } }
--- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -73,6 +73,15 @@ func Test_client_server() call assert_fails('call remote_send("XXX", ":let testvar = ''yes''\<CR>")', 'E241:') + call writefile(['one'], 'Xclientfile') + let cmd = GetVimProg() .. ' --servername ' .. name .. ' --remote Xclientfile' + call system(cmd) + call WaitForAssert({-> assert_equal('Xclientfile', remote_expr(name, "bufname()", "", 2))}) + call WaitForAssert({-> assert_equal('one', remote_expr(name, "getline(1)", "", 2))}) + call writefile(['one', 'two'], 'Xclientfile') + call system(cmd) + call WaitForAssert({-> assert_equal('two', remote_expr(name, "getline(2)", "", 2))}) + " Expression evaluated locally. if v:servername == '' eval 'MYSELF'->remote_startserver()