diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-30 22:36:18 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-30 22:36:18 +0100 |
| commit | cbbd0f657803a9a3a9f5e2c66bce6e1ea1d6a64b (patch) | |
| tree | b2d7896eb69c804f649a59441d26c3f45af36a95 | |
| parent | ed71ed37bcd44bcbfcf59beee1248799de3315ec (diff) | |
patch 8.1.0853: options test fails on Macv8.1.0853
Problem: Options test fails on Mac.
Solution: Remove a trailing slash from $TMPDIR.
| -rw-r--r-- | src/testdir/test_options.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 4d2c477c4a..740863e3cc 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -387,8 +387,10 @@ func Test_backupskip() for var in ['$TMPDIR', '$TMP', '$TEMP'] if exists(var) let varvalue = substitute(expand(var), '\\', '/', 'g') - let found = (index(bsklist, varvalue.'/*') >= 0) - call assert_true(found, var . ' not in option bsk: ' . &bsk) + let varvalue = substitute(varvalue, '/$', '', '') + let varvalue .= '/*' + let found = (index(bsklist, varvalue) >= 0) + call assert_true(found, var . ' (' . varvalue . ') not in option bsk: ' . &bsk) endif endfor endfunc diff --git a/src/version.c b/src/version.c index 3652f43cfb..97ef0c1e5e 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 853, +/**/ 852, /**/ 851, |