aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskippi <jbtcao@gmail.com>2020-10-25 18:43:20 -0500
committerskippi <jbtcao@gmail.com>2020-10-26 15:22:22 -0500
commitc203f89ace4617681fe0feb9f535c74ed0910796 (patch)
tree8bdb271e4bc98d4ae5d52b826e9be5a551c6353c
parent089f4f8e4a297aa8e7c689331ffd16ffe415120a (diff)
downloadrneovim-c203f89ace4617681fe0feb9f535c74ed0910796.tar.gz
rneovim-c203f89ace4617681fe0feb9f535c74ed0910796.tar.bz2
rneovim-c203f89ace4617681fe0feb9f535c74ed0910796.zip
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
-rw-r--r--src/nvim/option.c5
1 files changed, 3 insertions, 2 deletions
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