diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-06-18 18:33:59 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-06-18 18:33:59 +0200 |
commit | ceb2e7751089bd417c6250d63e28616483b5796b (patch) | |
tree | 54eecb6c3439906c2b75e30a2910ad54c88ff99e | |
parent | 72abcf42d4b28719863c3bdf72b4c05d147a7d83 (diff) | |
download | vim-git-ceb2e7751089bd417c6250d63e28616483b5796b.tar.gz |
patch 8.2.1002: test may fail when run directlyv8.2.1002
Problem: Test may fail when run directly.
Solution: Check if g:run_nr exists. (Christian Brabandt, closes #6285)
-rw-r--r-- | src/testdir/term_util.vim | 10 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim index 7c071bb3f..7a73adbe0 100644 --- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -28,10 +28,12 @@ endfunc " The second argument is the minimum time to wait in msec, 10 if omitted. func TermWait(buf, ...) let wait_time = a:0 ? a:1 : 10 - if g:run_nr == 2 - let wait_time *= 4 - elseif g:run_nr > 2 - let wait_time *= 10 + if exists('g:run_nr') + if g:run_nr == 2 + let wait_time *= 4 + elseif g:run_nr > 2 + let wait_time *= 10 + endif endif call term_wait(a:buf, wait_time) diff --git a/src/version.c b/src/version.c index 5d69674a8..34bb99bb8 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1002, +/**/ 1001, /**/ 1000, |