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
index 4d2c477c4aa055b7e4138b6b0808dcdaeab807ba..740863e3cc3b0d7aa525f74eb6b141badd05730f 100644 (file)
--- 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 3652f43cfb24628113cc1e19050b20d91a74bf94..97ef0c1e5eee2fcc12765c774fc58eebdf349f75 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    853,
 /**/
     852,
 /**/