diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-11-09 03:19:22 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-11-09 03:19:22 +0100 |
| commit | 0213e99aaf6eba303fd459183dd14a4a11cc5b07 (patch) | |
| tree | 9cf382b3ac1922520f9934cf47887430d99bc023 /src/nvim/option.c | |
| parent | bd33f1165b95e9f8f0d20ae3a941ee55906107ee (diff) | |
| parent | aa0e09d251610f9b17f0bf96a4f3485032c36e0f (diff) | |
| download | rneovim-0213e99aaf6eba303fd459183dd14a4a11cc5b07.tar.gz rneovim-0213e99aaf6eba303fd459183dd14a4a11cc5b07.tar.bz2 rneovim-0213e99aaf6eba303fd459183dd14a4a11cc5b07.zip | |
Merge #5561 'inccommand'
Initial work by:
Robin Elrharbi-Fleury (Robinhola)
Audrey Rayé (Adrey06)
Philémon Hullot (DesbyP)
Aymeric Collange (aym7)
Clément Guyomard (Clement0)
Major revisions by:
KillTheMule
Björn Linse <bjorn.linse@gmail.com>
Justin M. Keyes <justinkz@gmail.com>
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 311982982b..3bd1ce217e 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -288,6 +288,7 @@ static char *(p_fdm_values[]) = { "manual", "expr", "marker", "indent", static char *(p_fcl_values[]) = { "all", NULL }; static char *(p_cot_values[]) = { "menu", "menuone", "longest", "preview", "noinsert", "noselect", NULL }; +static char *(p_icm_values[]) = { "nosplit", "split", NULL }; #ifdef INCLUDE_GENERATED_DECLARATIONS # include "option.c.generated.h" @@ -3100,9 +3101,13 @@ did_set_string_option ( else if (gvarp == &p_cino) { /* TODO: recognize errors */ parse_cino(curbuf); - } - /* Options that are a list of flags. */ - else { + // inccommand + } else if (varp == &p_icm) { + if (check_opt_strings(p_icm, p_icm_values, false) != OK) { + errmsg = e_invarg; + } + // Options that are a list of flags. + } else { p = NULL; if (varp == &p_ww) p = (char_u *)WW_ALL; |