diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-02-19 16:46:44 +0100 |
|---|---|---|
| committer | Björn Linse <bjorn.linse@gmail.com> | 2018-06-13 10:11:35 +0200 |
| commit | 050f3975f6b44da6316de189929625e1c382a6c8 (patch) | |
| tree | 511a6cb5b025f8aa5432554b98773ddbc8627015 /src | |
| parent | d8e18c96a904667ce60366be22dbdf248006ff2e (diff) | |
| download | rneovim-050f3975f6b44da6316de189929625e1c382a6c8.tar.gz rneovim-050f3975f6b44da6316de189929625e1c382a6c8.tar.bz2 rneovim-050f3975f6b44da6316de189929625e1c382a6c8.zip | |
options: remove 'maxcombine` option (always use 6)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 8 | ||||
| -rw-r--r-- | src/nvim/options.lua | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 882289c8b8..a7ee0ef28b 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4102,11 +4102,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, errmsg = e_winwidth; } } else if (pp == &p_mco) { - if (value > MAX_MCO) { - errmsg = e_invarg; - } else if (value < 0) { - errmsg = e_positive; - } + value = MAX_MCO; } else if (pp == &p_titlelen) { if (value < 0) { errmsg = e_positive; @@ -4268,8 +4264,6 @@ static char *set_num_option(int opt_idx, char_u *varp, long value, if (pp == &curbuf->b_p_sw || curbuf->b_p_sw == 0) { parse_cino(curbuf); } - } else if (pp == &p_mco) { - screenclear(); // will re-allocate the screen } else if (pp == &curbuf->b_p_iminsert) { showmode(); // Show/unshow value of 'keymap' in status lines. diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 47c9f5aa78..30ddb977bb 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1493,9 +1493,8 @@ return { full_name='maxcombine', abbreviation='mco', type='number', scope={'global'}, vi_def=true, - redraw={'curswant'}, varname='p_mco', - defaults={if_true={vi=2}} + defaults={if_true={vi=6}} }, { full_name='maxfuncdepth', abbreviation='mfd', |