aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-12-23 13:56:32 +0800
committerGitHub <noreply@github.com>2022-12-23 13:56:32 +0800
commit30f606fc602f835fbed869140d3d658e24129c22 (patch)
tree5af7b1091fa420b81d753e3d9f7a02f78afeb24c /src/nvim/eval.c
parent98daaa798e018071876d026a60840991be8d8069 (diff)
downloadrneovim-30f606fc602f835fbed869140d3d658e24129c22.tar.gz
rneovim-30f606fc602f835fbed869140d3d658e24129c22.tar.bz2
rneovim-30f606fc602f835fbed869140d3d658e24129c22.zip
fix(options): restore exists() behavior for options (#21510)
Duplicating get_option_value() logic for an obscure future refactor isn't really worthwhile, and findoption() isn't used anywhere else outside the options code.
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d9081680ae..7bae8dff00 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -3674,6 +3674,7 @@ static int eval_index(char **arg, typval_T *rettv, int evaluate, int verbose)
int get_option_tv(const char **const arg, typval_T *const rettv, const bool evaluate)
FUNC_ATTR_NONNULL_ARG(1)
{
+ const bool working = (**arg == '+'); // has("+option")
int scope;
// Isolate the option name and find its value.
@@ -3718,6 +3719,10 @@ int get_option_tv(const char **const arg, typval_T *const rettv, const bool eval
rettv->v_type = VAR_STRING;
rettv->vval.v_string = stringval;
}
+ } else if (working && (opt_type == gov_hidden_bool
+ || opt_type == gov_hidden_number
+ || opt_type == gov_hidden_string)) {
+ ret = FAIL;
}
*option_end = c; // put back for error messages