From bfd36036700ab2d4c9de48e37f222f4a4dd7b3b0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 30 Mar 2019 12:33:13 +0100 Subject: [PATCH] patch 8.1.1074: Python test doesn't wipe out hidden buffer Problem: Python test doesn't wipe out hidden buffer. Solution: Wipe out the buffer. (Ben Jackson, closes #4189) --- src/testdir/test_python2.vim | 13 +++++++++---- src/testdir/test_python3.vim | 13 +++++++++---- src/version.c | 2 ++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim index 97b44f2eb..632f7a872 100644 --- a/src/testdir/test_python2.vim +++ b/src/testdir/test_python2.vim @@ -89,32 +89,37 @@ func _SetUpHiddenBuffer() call assert_equal( line( '.' ), 11 ) endfunc +func _CleanUpHiddenBuffer() + bwipe! hidden + bwipe! +endfunc + func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ] call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test' call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine() call _SetUpHiddenBuffer() py vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func _SetUpVisibleBuffer() diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim index bc05f68ce..514661ee2 100644 --- a/src/testdir/test_python3.vim +++ b/src/testdir/test_python3.vim @@ -89,32 +89,37 @@ func _SetUpHiddenBuffer() call assert_equal( line( '.' ), 11 ) endfunc +func _CleanUpHiddenBuffer() + bwipe! hidden + bwipe! +endfunc + func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Clear() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_List() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][:] = [ 'test' ] call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_Str() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = 'test' call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func Test_Write_To_HiddenBuffer_Does_Not_Fix_Cursor_ClearLine() call _SetUpHiddenBuffer() py3 vim.buffers[ int( vim.eval( 'bufnr("hidden")' ) ) ][0] = None call assert_equal( line( '.' ), 11 ) - bwipe! + call _CleanUpHiddenBuffer() endfunc func _SetUpVisibleBuffer() diff --git a/src/version.c b/src/version.c index 192113192..01268b1e2 100644 --- a/src/version.c +++ b/src/version.c @@ -775,6 +775,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1074, /**/ 1073, /**/ -- 2.40.0