diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-06-13 04:33:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-13 04:33:30 -0400 |
| commit | 28cc5a06462090a0411201b2c44140c37a433a0f (patch) | |
| tree | 3d198c60f3f2021a5db89faa61c8ea7fa33e70f7 /src/nvim/option.c | |
| parent | 0ea01c15861eb6952b5db45f6a6b6ef507954e5b (diff) | |
| parent | c4da27095ccce52f9e2e7e0d80b5c1475c1fd66d (diff) | |
| download | rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.tar.gz rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.tar.bz2 rneovim-28cc5a06462090a0411201b2c44140c37a433a0f.zip | |
Merge #3745 from cacplate/ops_Wconversion
Enable -Wconversion in ops.c
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index c8a25e8b75..ac906d82ad 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4030,15 +4030,16 @@ set_num_option ( errmsg = e_invarg; curwin->w_p_fdc = 12; } - } - /* 'shiftwidth' or 'tabstop' */ - else if (pp == &curbuf->b_p_sw || pp == &curbuf->b_p_ts) { - if (foldmethodIsIndent(curwin)) + // 'shiftwidth' or 'tabstop' + } else if (pp == &curbuf->b_p_sw || pp == (long *)&curbuf->b_p_ts) { + if (foldmethodIsIndent(curwin)) { foldUpdateAll(curwin); - /* When 'shiftwidth' changes, or it's zero and 'tabstop' changes: - * parse 'cinoptions'. */ - if (pp == &curbuf->b_p_sw || curbuf->b_p_sw == 0) + } + // When 'shiftwidth' changes, or it's zero and 'tabstop' changes: + // parse 'cinoptions'. + if (pp == &curbuf->b_p_sw || curbuf->b_p_sw == 0) { parse_cino(curbuf); + } } /* 'maxcombine' */ else if (pp == &p_mco) { @@ -5657,7 +5658,7 @@ void buf_copy_options(buf_T *buf, int flags) buf->b_p_isk = save_p_isk; else { buf->b_p_isk = vim_strsave(p_isk); - did_isk = TRUE; + did_isk = true; buf->b_p_ts = p_ts; buf->b_help = false; if (buf->b_p_bt[0] == 'h') |