diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-24 16:46:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-24 16:46:01 +0200 |
| commit | 8239c62067c8d40720560496b25a82662126f2a2 (patch) | |
| tree | fdea52ee222440a10e2ee7c3e938d50d557f3f81 | |
| parent | 701ff0a3e53d253d7300c385e582659bbff7860d (diff) | |
| download | vim-git-8239c62067c8d40720560496b25a82662126f2a2.tar.gz | |
patch 8.1.1379: filechanged test hangsv8.1.1379
Problem: Filechanged test hangs.
Solution: Do not check 'autoread'.
| -rw-r--r-- | src/fileio.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_filechanged.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/fileio.c b/src/fileio.c index b6a37f522..57c5f47fc 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -6774,9 +6774,8 @@ buf_check_timestamp( // FileChangedShell autocmd) if (stat_res < 0) { - // When 'autoread' is set we'll check the file again to see if it - // re-appears. - buf->b_mtime = (buf->b_p_ar >= 0 ? buf->b_p_ar : p_ar); + // Check the file again later to see if it re-appears. + buf->b_mtime = -1; buf->b_orig_size = 0; buf->b_orig_mode = 0; } diff --git a/src/testdir/test_filechanged.vim b/src/testdir/test_filechanged.vim index ce786092f..a937bb8d1 100644 --- a/src/testdir/test_filechanged.vim +++ b/src/testdir/test_filechanged.vim @@ -115,8 +115,9 @@ func Test_file_changed_dialog() call assert_match('E211:', v:warningmsg) call assert_equal(2, line('$')) call assert_equal('extra line', getline(2)) + let v:warningmsg = 'empty' - " Recreate buffer and reload + " change buffer, recreate the file and reload call setline(1, 'buffer is changed') silent !echo 'new line' >Xchanged_d call feedkeys('L', 'L') diff --git a/src/version.c b/src/version.c index e544f9bd3..60e6c82f4 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1379, +/**/ 1378, /**/ 1377, |