diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim index d688a8671e..2113feddfc 100644 --- a/src/testdir/test_buffer.vim +++ b/src/testdir/test_buffer.vim @@ -230,6 +230,7 @@ func Test_bwipe_during_save() set charconvert=execute('%bw!') call assert_fails('write ++enc=lmao boom', 'E937:') + set charconvert& %bwipe endfunc diff --git a/src/version.c b/src/version.c index 43bb41282c..a461d58c96 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1974, /**/ 1973, /**/