diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-09-29 18:08:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-09-29 18:08:33 +0200 |
| commit | 74b738d414b2895b3365e26ae3b7792eb82ccf47 (patch) | |
| tree | 1e994c8150bce1b362359effc6853c32aa4919ae /src | |
| parent | ba117c23dfd1146aca3235bea172df17a48bccee (diff) | |
| download | vim-git-74b738d414b2895b3365e26ae3b7792eb82ccf47.tar.gz | |
patch 7.4.889v7.4.889
Problem: Triggering OptionSet from setwinvar() isn't tested.
Solution: Add a test. (Christian Brabandt)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_autocmd_option.in | 6 | ||||
| -rw-r--r-- | src/testdir/test_autocmd_option.ok | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/testdir/test_autocmd_option.in b/src/testdir/test_autocmd_option.in index 1ccfe8c51..1e43d4b02 100644 --- a/src/testdir/test_autocmd_option.in +++ b/src/testdir/test_autocmd_option.in @@ -59,14 +59,18 @@ STARTTEST :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 e98c651c9..2c0e1898f 100644 --- a/src/testdir/test_autocmd_option.ok +++ b/src/testdir/test_autocmd_option.ok @@ -56,4 +56,9 @@ Autocmd Option: <backspace>, OldVal: <>, NewVal: <eol,indent,start>, Scope: <glo 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 32c4d14d0..d3ea2d3ce 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 889, +/**/ 888, /**/ 887, |