aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/vars.c
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2022-08-22 15:52:25 -0600
committerJosh Rahm <rahm@google.com>2022-08-22 15:52:25 -0600
commit24c75e4f7be4eb4052939e7d5db7721d88288604 (patch)
tree55e6e0c8e5f45e7ac007f33f025f98ad2921af36 /src/nvim/eval/vars.c
parentbf37d6bbd02d79fd86dc7740f0c27ebb1b5f5903 (diff)
parentbaaaa1f2b3b6ae3a989d1362a27e55dc7b0b148a (diff)
downloadrneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.tar.gz
rneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.tar.bz2
rneovim-24c75e4f7be4eb4052939e7d5db7721d88288604.zip
Merge remote-tracking branch 'upstream/master' into userreg
Diffstat (limited to 'src/nvim/eval/vars.c')
-rw-r--r--src/nvim/eval/vars.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
index 73e84a8c1e..a5deb70ed8 100644
--- a/src/nvim/eval/vars.c
+++ b/src/nvim/eval/vars.c
@@ -1631,7 +1631,7 @@ static void set_option_from_tv(const char *varname, typval_T *varp)
strval = tv_get_string_buf_chk(varp, nbuf);
}
if (!error && strval != NULL) {
- set_option_value(varname, numval, strval, OPT_LOCAL);
+ set_option_value_give_err(varname, numval, strval, OPT_LOCAL);
}
}