From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 30 Jan 2019 21:36:18 +0000 (+0100)
Subject: patch 8.1.0853: options test fails on Mac
X-Git-Tag: v8.1.0853
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbbd0f657803a9a3a9f5e2c66bce6e1ea1d6a64b;p=vim

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 4d2c477c4..740863e3c 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 3652f43cf..97ef0c1e5 100644
--- 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,
 /**/