summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-18 21:10:44 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-18 21:10:44 +0100
commit30d53e2c11e670845830bdfc29bf8c1615df61a8 (patch)
tree8cabc16cff1ac6fa9c46fcd8cb232965450da3e6 /src
parent8dfcce3a78ccb520cc9d09081f998091494c50bf (diff)
downloadvim-git-30d53e2c11e670845830bdfc29bf8c1615df61a8.tar.gz
patch 8.2.0402: setting local instead of global flagv8.2.0402
Problem: Setting local instead of global flag. Solution: Prepend "g:" to "test_is_flaky".
Diffstat (limited to 'src')
-rw-r--r--src/testdir/screendump.vim2
-rw-r--r--src/testdir/term_util.vim4
-rw-r--r--src/testdir/test_autocmd.vim2
-rw-r--r--src/version.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 14863f9ae..8ea708a39 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -25,7 +25,7 @@ func VerifyScreenDump(buf, filename, options, ...)
let testfile = 'failed/' . a:filename . '.dump'
" Starting a terminal to make a screendump is always considered flaky.
- let test_is_flaky = 1
+ let g:test_is_flaky = 1
" Redraw to execute the code that updates the screen. Otherwise we get the
" text and attributes only from the internal buffer.
diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
index c9e0ac528..dd1f71dc0 100644
--- a/src/testdir/term_util.vim
+++ b/src/testdir/term_util.vim
@@ -94,7 +94,7 @@ func RunVimInTerminal(arguments, options)
endtry
" Starting a terminal to run Vim is always considered flaky.
- let test_is_flaky = 1
+ let g:test_is_flaky = 1
return buf
endfunc
@@ -102,7 +102,7 @@ endfunc
" Stop a Vim running in terminal buffer "buf".
func StopVimInTerminal(buf)
" Using a terminal to run Vim is always considered flaky.
- let test_is_flaky = 1
+ let g:test_is_flaky = 1
call assert_equal("running", term_getstatus(a:buf))
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 84c46cf91..e5dec890c 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -1869,7 +1869,7 @@ func Test_Changed_FirstTime()
CheckFeature terminal
CheckNotGui
" Starting a terminal to run Vim is always considered flaky.
- let test_is_flaky = 1
+ let g:test_is_flaky = 1
" Prepare file for TextChanged event.
call writefile([''], 'Xchanged.txt')
diff --git a/src/version.c b/src/version.c
index b18307b5e..c76d31269 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 402,
+/**/
401,
/**/
400,