# HG changeset patch # User Bram Moolenaar # Date 1370111532 -7200 # Node ID 79522bb1712556183073b148e085d302967d7260 # Parent ad6f29ec56a1a28e40b5a5fd1edb8510dbfea878 updated for version 7.3.1089 Problem: Tests 86 and 87 fail on MS-Windows. (Ken Takata) Solution: Fix platform-specific stuff. (ZyX) diff --git a/src/testdir/test86.in b/src/testdir/test86.in --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -435,6 +435,7 @@ EOF :py bopts1=vim.buffers[vim.bindeval("g:bufs")[2]].options :py bopts2=vim.buffers[vim.bindeval("g:bufs")[1]].options :py bopts3=vim.buffers[vim.bindeval("g:bufs")[0]].options +:set path=.,..,, :let lst=[] :let lst+=[['paste', 1, 0, 1, 2, 1, 1, 0 ]] :let lst+=[['previewheight', 5, 1, 6, 'a', 0, 1, 0 ]] @@ -530,13 +531,14 @@ b[0]='bar' b[0:0]=['baz'] vim.command('call append("$", getbufline(%i, 1, "$"))' % b.number) # Test assigning to name property +import os old_name = cb.name cb.name = 'foo' -cb.append(cb.name[-11:]) +cb.append(cb.name[-11:].replace(os.path.sep, '/')) b.name = 'bar' -cb.append(b.name[-11:]) +cb.append(b.name[-11:].replace(os.path.sep, '/')) cb.name = old_name -cb.append(cb.name[-17:]) +cb.append(cb.name[-17:].replace(os.path.sep, '/')) # Test CheckBuffer for _b in vim.buffers: if _b is not cb: diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok --- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -310,7 +310,7 @@ jkl W: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1 >>> path - p/gopts1: '.,/usr/include,,' + p/gopts1: '.,..,,' inv: 0! TypeError p/wopts1! KeyError inv: 0! KeyError diff --git a/src/testdir/test87.in b/src/testdir/test87.in --- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -404,6 +404,7 @@ EOF :py3 bopts1=vim.buffers[vim.bindeval("g:bufs")[2]].options :py3 bopts2=vim.buffers[vim.bindeval("g:bufs")[1]].options :py3 bopts3=vim.buffers[vim.bindeval("g:bufs")[0]].options +:set path=.,..,, :let lst=[] :let lst+=[['paste', 1, 0, 1, 2, 1, 1, 0 ]] :let lst+=[['previewheight', 5, 1, 6, 'a', 0, 1, 0 ]] @@ -499,13 +500,14 @@ b[0]='bar' b[0:0]=['baz'] vim.command('call append("$", getbufline(%i, 1, "$"))' % b.number) # Test assigning to name property +import os old_name = cb.name cb.name = 'foo' -cb.append(cb.name[-11:]) +cb.append(cb.name[-11:].replace(os.path.sep, '/')) b.name = 'bar' -cb.append(b.name[-11:]) +cb.append(b.name[-11:].replace(os.path.sep, '/')) cb.name = old_name -cb.append(cb.name[-17:]) +cb.append(cb.name[-17:].replace(os.path.sep, '/')) # Test CheckBuffer for _b in vim.buffers: if _b is not cb: diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -299,7 +299,7 @@ jkl W: 1:0 2:1 3:0 4:1 B: 1:0 2:1 3:0 4:1 >>> path - p/gopts1: b'.,/usr/include,,' + p/gopts1: b'.,..,,' inv: 0! TypeError p/wopts1! KeyError inv: 0! KeyError diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1089, +/**/ 1088, /**/ 1087,