changeset 17549:e5dabc127143 v8.1.1772

patch 8.1.1772: options test still fails on MS-Windows commit https://github.com/vim/vim/commit/b78564d0221089e6dfc9c9d58239c18b991ca9fe Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 28 19:24:36 2019 +0200 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'.
author Bram Moolenaar <Bram@vim.org>
date Sun, 28 Jul 2019 19:30:04 +0200
parents ac05183a94ed
children 9afddb85a45c
files src/option.c src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/option.c
+++ b/src/option.c
@@ -7433,9 +7433,10 @@ did_set_string_option(
 
 # ifdef BACKSLASH_IN_FILENAME
     // 'completeslash'
-    else if (varp == &curbuf->b_p_csl)
-    {
-	if (check_opt_strings(p_csl, p_csl_values, FALSE) != OK)
+    else if (gvarp == &p_csl)
+    {
+	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
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1772,
+/**/
     1771,
 /**/
     1770,