diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-28 19:24:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-28 19:24:36 +0200 |
| commit | b78564d0221089e6dfc9c9d58239c18b991ca9fe (patch) | |
| tree | e7d976484b75e62b9b6940eb0edf18c07ebb751c | |
| parent | d4404b4391a0cd3ab197e09bee7828c88882f6b2 (diff) | |
| download | vim-git-b78564d0221089e6dfc9c9d58239c18b991ca9fe.tar.gz | |
patch 8.1.1772: options test still fails on MS-Windowsv8.1.1772
Problem: Options test still fails on MS-Windows.
Solution: Check buffer-local value of 'completeslash'.
| -rw-r--r-- | src/option.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
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 @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1772, +/**/ 1771, /**/ 1770, |