IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7027 from lonerover/vim-8.0.0003

Browse Source 
vim-patch:8.0.0003
This commit is contained in:
James McCoy 2017-07-19 06:48:16 -04:00 committed by GitHub
commit c40093f47a
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/option.c
View File

@ -7039,8 +7039,11 @@ dict_T *get_winbuf_options(const int bufopt)
if (opt->flags & P_STRING) { if (opt->flags & P_STRING) {
tv_dict_add_str(d, opt->fullname, strlen(opt->fullname), tv_dict_add_str(d, opt->fullname, strlen(opt->fullname),
*(const char **)varp); *(const char **)varp);
} else if (opt->flags & P_NUM) {
tv_dict_add_nr(d, opt->fullname, strlen(opt->fullname),
*(long *)varp);
} else { } else {
tv_dict_add_nr(d, opt->fullname, strlen(opt->fullname), *varp); tv_dict_add_nr(d, opt->fullname, strlen(opt->fullname), *(int *)varp);
} }
} }
} }

13
src/nvim/testdir/test_bufwintabinfo.vim
View File

@ -87,9 +87,17 @@ function Test_get_buf_options()
endfunc endfunc
function Test_get_win_options() function Test_get_win_options()
if has('folding')
set foldlevel=999
endif
set list
let opts = getwinvar(1, '&') let opts = getwinvar(1, '&')
call assert_equal(v:t_dict, type(opts)) call assert_equal(v:t_dict, type(opts))
call assert_equal(0, opts.linebreak) 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') if has('signs')
call assert_equal('auto', opts.signcolumn) call assert_equal('auto', opts.signcolumn)
endif endif
@ -97,7 +105,12 @@ function Test_get_win_options()
let opts = gettabwinvar(1, 1, '&') let opts = gettabwinvar(1, 1, '&')
call assert_equal(v:t_dict, type(opts)) call assert_equal(v:t_dict, type(opts))
call assert_equal(0, opts.linebreak) call assert_equal(0, opts.linebreak)
call assert_equal(1, opts.list)
if has('signs') if has('signs')
call assert_equal('auto', opts.signcolumn) call assert_equal('auto', opts.signcolumn)
endif endif
set list&
if has('folding')
set foldlevel=0
endif
endfunc endfunc

2
src/nvim/version.c
View File

@ -726,7 +726,7 @@ static const int included_patches[] = {
6, 6,
// 5 NA // 5 NA
4, 4,
// 3, 3,
2, 2,
1, 1,
0 0