diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-22 13:56:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 13:56:50 +0800 |
| commit | 2bed0d1d978b42184564201088ea5fef12ec8581 (patch) | |
| tree | a6ad160916e751a71a39c44303bdf1a7e2616a31 /src/nvim/eval | |
| parent | d4d27c41b3298c25ae62bc067472bef37bc61c99 (diff) | |
| download | rneovim-2bed0d1d978b42184564201088ea5fef12ec8581.tar.gz rneovim-2bed0d1d978b42184564201088ea5fef12ec8581.tar.bz2 rneovim-2bed0d1d978b42184564201088ea5fef12ec8581.zip | |
vim-patch:8.2.4753: error from setting an option is silently ignored (#19888)
Problem: Error from setting an option is silently ignored.
Solution: Handle option value errors better. Fix uses of N_().
https://github.com/vim/vim/commit/31e5c60a682840959cae6273ccadd9aae48c928d
Diffstat (limited to 'src/nvim/eval')
| -rw-r--r-- | src/nvim/eval/funcs.c | 2 | ||||
| -rw-r--r-- | src/nvim/eval/vars.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 94bc2f5557..94fda654f3 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -7416,7 +7416,7 @@ long do_searchpair(const char *spat, const char *mpat, const char *epat, int dir // If it's still empty it was changed and restored, need to restore in // the complicated way. if (*p_cpo == NUL) { - set_option_value("cpo", 0L, save_cpo, 0); + set_option_value_give_err("cpo", 0L, save_cpo, 0); } free_string_option((char_u *)save_cpo); } diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c index b38849730a..23d77e0687 100644 --- a/src/nvim/eval/vars.c +++ b/src/nvim/eval/vars.c @@ -1627,7 +1627,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); } } |