# HG changeset patch # User Bram Moolenaar # Date 1548884706 -3600 # Node ID a8ed064ed316542093917faf651fb810b474fed2 # Parent 1cf39a0d90c9d241d40b1da44f55b337225f1095 patch 8.1.0853: options test fails on Mac commit https://github.com/vim/vim/commit/cbbd0f657803a9a3a9f5e2c66bce6e1ea1d6a64b Author: Bram Moolenaar Date: Wed Jan 30 22:36:18 2019 +0100 patch 8.1.0853: options test fails on Mac Problem: Options test fails on Mac. Solution: Remove a trailing slash from $TMPDIR. diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim --- 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 --- 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,