From 58f2dcfc887134f5ebc33c13d7ef5ce540f8a247 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 17 Jan 2023 16:46:43 +0800 Subject: vim-patch:8.2.4917: fuzzy expansion of option names is not right (#21853) Problem: Fuzzy expansion of option names is not right. Solution: Pass the fuzzy flag down the call chain. (Christian Brabandt, closes vim/vim#10380, closes vim/vim#10318) https://github.com/vim/vim/commit/cb747899bd99361a299a163f3aa55d5fe7d6f798 Co-authored-by: Christian Brabandt --- src/nvim/option.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index aec91a4dc6..024bf3af09 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4740,7 +4740,7 @@ static bool match_str(char *const str, regmatch_T *const regmatch, char **const } int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char *fuzzystr, int *numMatches, - char ***matches) + char ***matches, const bool can_fuzzy) { int num_normal = 0; // Nr of matching non-term-code settings int count = 0; @@ -4748,7 +4748,7 @@ int ExpandSettings(expand_T *xp, regmatch_T *regmatch, char *fuzzystr, int *numM int ic = regmatch->rm_ic; // remember the ignore-case flag fuzmatch_str_T *fuzmatch = NULL; - const bool fuzzy = cmdline_fuzzy_complete(fuzzystr); + const bool fuzzy = can_fuzzy && cmdline_fuzzy_complete(fuzzystr); // do this loop twice: // loop == 0: count the number of matching options -- cgit