Mercurial > vim
changeset 10205:22e97a250277 v8.0.0003
commit https://github.com/vim/vim/commit/789a5c0e3d27f09456678f0cfb6c1bd2d8ab4a35
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 12 19:51:11 2016 +0200
patch 8.0.0003
Problem: getwinvar() returns wrong Value of boolean and number options,
especially non big endian systems. (James McCoy)
Solution: Cast the pointer to long or int. (closes https://github.com/vim/vim/issues/1060)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 12 Sep 2016 20:00:09 +0200 |
| parents | f9673640b6aa |
| children | d5e814245456 |
| files | src/option.c src/testdir/test_bufwintabinfo.vim src/version.c |
| diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -12363,8 +12363,10 @@ get_winbuf_options(int bufopt) { if (opt->flags & P_STRING) dict_add_nr_str(d, opt->fullname, 0L, *(char_u **)varp); + else if (opt->flags & P_NUM) + dict_add_nr_str(d, opt->fullname, *(long *)varp, NULL); else - dict_add_nr_str(d, opt->fullname, *varp, NULL); + dict_add_nr_str(d, opt->fullname, *(int *)varp, NULL); } } }
--- a/src/testdir/test_bufwintabinfo.vim +++ b/src/testdir/test_bufwintabinfo.vim @@ -87,9 +87,17 @@ function Test_get_buf_options() endfunc function Test_get_win_options() + if has('folding') + set foldlevel=999 + endif + set list let opts = getwinvar(1, '&') call assert_equal(v:t_dict, type(opts)) call assert_equal(0, opts.linebreak) + call assert_equal(1, opts.list) + if has('folding') + call assert_equal(999, opts.foldlevel) + endif if has('signs') call assert_equal('auto', opts.signcolumn) endif @@ -97,7 +105,12 @@ function Test_get_win_options() let opts = gettabwinvar(1, 1, '&') call assert_equal(v:t_dict, type(opts)) call assert_equal(0, opts.linebreak) + call assert_equal(1, opts.list) if has('signs') call assert_equal('auto', opts.signcolumn) endif + set list& + if has('folding') + set foldlevel=0 + endif endfunc