summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-19 16:38:56 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-19 16:38:56 +0200
commit2b39d806f04c1a474b6d689a7970253850d4adb8 (patch)
tree4ce4117895ab567d05a58c00cc9f2e141769f753 /src
parente9ebc9a91cac357fd4888f4b71fdff7d97b41160 (diff)
downloadvim-git-2b39d806f04c1a474b6d689a7970253850d4adb8.tar.gz
patch 8.1.1353: undo test fails on Macv8.1.1353
Problem: Undo test fails on Mac. Solution: Expect "private" on the Mac.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_undo.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
index ba1c861f8..1440660ad 100644
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -442,7 +442,11 @@ funct Test_undofile()
if isdirectory('/tmp')
set undodir=/tmp
- call assert_equal('/tmp/%tmp%file', undofile('///tmp/file'))
+ if has('osx')
+ call assert_equal('/tmp/%private%tmp%file', undofile('///tmp/file'))
+ else
+ call assert_equal('/tmp/%tmp%file', undofile('///tmp/file'))
+ endif
endif
set undodir&
diff --git a/src/version.c b/src/version.c
index f349d7b73..d16354683 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1353,
+/**/
1352,
/**/
1351,