patch 9.0.0839: test may fail depending on sequence of events
Problem: Test may fail depending on sequence of events.
Solution: Accept error codes in either order. (Yee Cheng Chin,
closes #11510)
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index ac86512..b6e1a89 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -4087,7 +4087,8 @@
endfor
END
writefile(lines, 'Xdef', 'D')
- assert_fails('so Xdef', ['E684:', 'E1012:'])
+ # Either the exit or out callback is called first, accept them in any order
+ assert_fails('so Xdef', ['E684:\|E1012:', 'E1012:\|E684:'])
enddef
def InvokeNormal()
diff --git a/src/version.c b/src/version.c
index 6aef2c1..c454557 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 839,
+/**/
838,
/**/
837,