summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-16 10:59:36 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-16 10:59:36 +0200
commitb90ac5e96e40706ffb039db64b92fcd16fa78c04 (patch)
tree8407bea43915c17fbe43f10b0950030af33ee485
parent55b6b60b691eca7058535006113a1adffda4cabf (diff)
downloadvim-git-b90ac5e96e40706ffb039db64b92fcd16fa78c04.tar.gz
patch 8.2.3009: startup test may hangv8.2.3009
Problem: Startup test may hang. Solution: Do not run the test in the GUI.
-rw-r--r--src/testdir/test_startup.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 7e98591ba..a6e52ce57 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -1302,6 +1302,8 @@ func Test_write_in_vimrc()
endfunc
func Test_echo_true_in_cmd()
+ CheckNotGui
+
let lines =<< trim END
echo v:true
call writefile(['done'], 'Xresult')
@@ -1313,7 +1315,6 @@ func Test_echo_true_in_cmd()
endif
call delete('Xscript')
call delete('Xresult')
-
endfunc
" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index f3b34037d..1c680f2f0 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 */
/**/
+ 3009,
+/**/
3008,
/**/
3007,