aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorKillTheMule <KillTheMule@users.noreply.github.com>2016-08-12 12:00:36 +0200
committerKillTheMule <KillTheMule@users.noreply.github.com>2016-10-30 10:21:18 +0100
commit13841a56b4b4916a2f18e66f97cb6f5e55d40e53 (patch)
treed537cb37ba929552d8b2156288dac602458be27a /src/nvim/option.c
parent6143cfdeec4e67cdf73879b92fe2a80b5b36bc1b (diff)
downloadrneovim-13841a56b4b4916a2f18e66f97cb6f5e55d40e53.tar.gz
rneovim-13841a56b4b4916a2f18e66f97cb6f5e55d40e53.tar.bz2
rneovim-13841a56b4b4916a2f18e66f97cb6f5e55d40e53.zip
Incsubsitution feature
Originally implemented by * Clement0 * DesbyP * aym7 * Adrey06 * Robinhola in #4811. Major reworkings and bug fixes by * bfredl Most tests suggested by ZyX-l, suggestions for improvements by oni-link.
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 81919c00d2..761e4451b9 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_ics_values[]) = { "nosplit", "split", NULL };
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "option.c.generated.h"
@@ -3110,9 +3111,13 @@ did_set_string_option (
else if (gvarp == &p_cino) {
/* TODO: recognize errors */
parse_cino(curbuf);
- }
- /* Options that are a list of flags. */
- else {
+ // incsubstitute
+ } else if (varp == &p_ics) {
+ if (check_opt_strings(p_ics, p_ics_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;