patch 9.0.1520: completion for option name includes all bool options
Problem: Completion for option name includes all bool options.
Solution: Do not recognize the "noinv" prefix. Prefix "no" or "inv" when
appropriate.
diff --git a/src/option.c b/src/option.c
index 1a9ba25..e5e78d8 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7265,11 +7265,13 @@
if (STRNCMP(p, "no", 2) == 0 && STRNCMP(p, "novice", 6) != 0)
{
xp->xp_context = EXPAND_BOOL_SETTINGS;
+ xp->xp_prefix = XP_PREFIX_NO;
p += 2;
}
- if (STRNCMP(p, "inv", 3) == 0)
+ else if (STRNCMP(p, "inv", 3) == 0)
{
xp->xp_context = EXPAND_BOOL_SETTINGS;
+ xp->xp_prefix = XP_PREFIX_INV;
p += 3;
}
xp->xp_pattern = arg = p;
@@ -7528,7 +7530,7 @@
if (options[opt_idx].var == NULL)
continue;
if (xp->xp_context == EXPAND_BOOL_SETTINGS
- && !(options[opt_idx].flags & P_BOOL))
+ && !(options[opt_idx].flags & P_BOOL))
continue;
is_term_opt = istermoption_idx(opt_idx);
if (is_term_opt && num_normal > 0)
@@ -7600,7 +7602,7 @@
name_buf[4] = NUL;
if (match_str(name_buf, regmatch, *matches, count,
- (loop == 0), fuzzy, fuzzystr, fuzmatch))
+ (loop == 0), fuzzy, fuzzystr, fuzmatch))
{
if (loop == 0)
num_term++;