diff options
| -rw-r--r-- | src/testdir/test_winfixbuf.vim | 24 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/testdir/test_winfixbuf.vim b/src/testdir/test_winfixbuf.vim index ba44b42cca..462554b112 100644 --- a/src/testdir/test_winfixbuf.vim +++ b/src/testdir/test_winfixbuf.vim @@ -1239,30 +1239,34 @@ endfunc func Test_edit_same_buffer_in_memory() call s:reset_all_buffers() - let l:current = bufnr() + let current = bufnr() file same_buffer - call assert_equal(l:current, bufnr()) + call assert_equal(current, bufnr()) set winfixbuf edit same_buffer - call assert_equal(l:current, bufnr()) + call assert_equal(current, bufnr()) + set nowinfixbuf endfunc " Allow :e selecting the current buffer as a full path func Test_edit_same_buffer_on_disk_absolute_path() + " This fails on CI (Windows builds), why? + CheckNotMSWindows call s:reset_all_buffers() - let l:file = tempname() - let l:current = bufnr() - execute "edit " . l:file + let file = tempname() + let current = bufnr() + execute "edit " . file write! - call assert_equal(l:current, bufnr()) + call assert_equal(current, bufnr()) set winfixbuf - execute "edit " l:file - call assert_equal(l:current, bufnr()) + execute "edit " file + call assert_equal(current, bufnr()) - call delete(l:file) + call delete(file) + set nowinfixbuf endfunc " Fail :enew but :enew! is allowed diff --git a/src/version.c b/src/version.c index 6341259724..1ea07b334b 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 212, +/**/ 211, /**/ 210, |