From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 28 Jul 2019 17:24:36 +0000 (+0200)
Subject: patch 8.1.1772: options test still fails on MS-Windows
X-Git-Tag: v8.1.1772
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b78564d0221089e6dfc9c9d58239c18b991ca9fe;p=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'.
---

diff --git a/src/option.c b/src/option.c
index fdad20551..a804dd870 100644
--- 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)
+    else if (gvarp == &p_csl)
     {
-	if (check_opt_strings(p_csl, p_csl_values, FALSE) != OK)
+	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
diff --git a/src/version.c b/src/version.c
index 5507f6ac0..29921e24b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1772,
 /**/
     1771,
 /**/