patch 7.4.889
Problem: Triggering OptionSet from setwinvar() isn't tested.
Solution: Add a test. (Christian Brabandt)
diff --git a/src/testdir/test_autocmd_option.in b/src/testdir/test_autocmd_option.in
index 1ccfe8c..1e43d4b 100644
--- a/src/testdir/test_autocmd_option.in
+++ b/src/testdir/test_autocmd_option.in
@@ -59,14 +59,18 @@
:call setbufvar(1, '&l:bk', 1)
: "should trigger, use correct option name
:call setbufvar(1, '&backup', 1)
+:let g:testcase="14: Setting number option using setwinvar\n"
+:let g:options=[['number', 0, 1, 'local']]
+:call setwinvar(0, '&number', 1)
:" Write register now, because next test shouldn't output anything.
:$put r
:let @r=''
-:let g:testcase="\n14: Setting key option, shouldn't trigger\n"
+:let g:testcase="\n15: Setting key option, shouldn't trigger\n"
:let g:options=[['key', 'invalid', 'invalid1', 'invalid']]
:setlocal key=blah
:setlocal key=
:$put =g:testcase
+:$put r
:/^dummy text/,$w! test.out
:qa!
ENDTEST
diff --git a/src/testdir/test_autocmd_option.ok b/src/testdir/test_autocmd_option.ok
index e98c651..2c0e189 100644
--- a/src/testdir/test_autocmd_option.ok
+++ b/src/testdir/test_autocmd_option.ok
@@ -56,4 +56,9 @@
Expected: Name: <backup>, Oldval: <>, NewVal: <1>, Scope: <local>
Autocmd Option: <backup>, OldVal: <0>, NewVal: <1>, Scope: <local>
-14: Setting key option, shouldn't trigger
+14: Setting number option using setwinvar
+Expected: Name: <number>, Oldval: <0>, NewVal: <1>, Scope: <local>
+Autocmd Option: <number>, OldVal: <0>, NewVal: <1>, Scope: <local>
+
+15: Setting key option, shouldn't trigger
+
diff --git a/src/version.c b/src/version.c
index 32c4d14..d3ea2d3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 889,
+/**/
888,
/**/
887,