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 fdad20551816d4bede020f0870fd2cd944cd78e8..a804dd870449f343a1a309530fd23d8f1123bb09 100644 (file)
--- 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 5507f6ac0997e0e00e0cb32d77a3b56f57114ff5..29921e24bf953d0f973e8420ceba4dde58fc2586 100644 (file)
--- 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,
 /**/