From c203f89ace4617681fe0feb9f535c74ed0910796 Mon Sep 17 00:00:00 2001 From: skippi Date: Sun, 25 Oct 2020 18:43:20 -0500 Subject: vim-patch:8.1.1772: options test still fails on MS-Windows Problem: Options test still fails on MS-Windows. Solution: Check buffer-local value of 'completeslash'. https://github.com/vim/vim/commit/b78564d0221089e6dfc9c9d58239c18b991ca9fe --- src/nvim/option.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nvim/option.c b/src/nvim/option.c index 5faf67febf..ca902d5669 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3192,8 +3192,9 @@ ambw_end: completeopt_was_set(); } #ifdef BACKSLASH_IN_FILENAME - } else if (varp == &curbuf->b_p_csl) { // 'completeslash' - if (check_opt_strings(p_csl, p_csl_values, false) != OK) { + } else if (gvarp == &p_csl) { // 'completeslash' + if (check_opt_strings(p_csl, p_csl_values, false) != OK + || check_opt_strings(curbuf->b_p_csl, p_csl_values, false) != OK) { errmsg = e_invarg; } #endif -- cgit