summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-16 18:39:43 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-16 18:39:43 +0100
commit50dc3ecc642ee88348cb353cf85d08eac26c75dd (patch)
tree7f179b6a665b7e24681c328b18f81131f93893b3
parent4792a679f9e08fc6026a596be3d364cecb70b049 (diff)
downloadvim-git-50dc3ecc642ee88348cb353cf85d08eac26c75dd.tar.gz
patch 8.2.1993: occasional failure of the netbeans testv8.2.1993
Problem: Occasional failure of the netbeans test. Solution: Add "silent!". (Yegappan Lakshmanan, closes #7304)
-rw-r--r--src/testdir/test_netbeans.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 490e528c4..d56b4683f 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -36,7 +36,7 @@ func ReadXnetbeans()
let l = readfile("Xnetbeans")
" Xnetbeans may include '0:geometry=' messages in the GUI Vim if the window
" position, size, or z order are changed. Remove these messages because
- " these message will break the assert for the output.
+ " these messages will break the assert for the output.
return filter(l, 'v:val !~ "^0:geometry="')
endfunc
@@ -927,7 +927,7 @@ endfunc
" error.
func Test_nb_bwipe_buffer()
call s:run_server('Nb_bwipe_buffer')
- %bwipe!
+ silent! %bwipe!
sleep 100m
nbclose
endfunc
diff --git a/src/version.c b/src/version.c
index 0d9cf7007..3ab3ab4d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1993,
+/**/
1992,
/**/
1991,