# HG changeset patch # User Bram Moolenaar # Date 1368730076 -7200 # Node ID d5177d5ece0c539680390448c8ce8d05a6d61201 # Parent e56bf2af53c0203122a92e1835455df0b7e40fe7 updated for version 7.3.961 Problem: Tests 86 and 87 fail when using another language than English. Solution: Set the language to C in the test. (Dominique Pelle) diff --git a/src/testdir/test86.in b/src/testdir/test86.in --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -5,10 +5,10 @@ This would require recompiling Python wi ./configure --without-pymalloc See http://svn.python.org/view/python/trunk/Misc/README.valgrind?view=markup - STARTTEST :so small.vim :if !has('python') | e! test.ok | wq! test.out | endif +:lang C :py import vim :fun Test() :let l = [] diff --git a/src/testdir/test87.in b/src/testdir/test87.in --- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -3,6 +3,7 @@ Tests for various python features. v STARTTEST :so small.vim :if !has('python3') | e! test.ok | wq! test.out | endif +:lang C :py3 import vim :fun Test() :let l = [] diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -322,7 +322,7 @@ Number of tabs: 4 Current tab pages: (1): 1 windows, current is Windows: - (0): displays buffer ; cursor is at (929, 0) + (0): displays buffer ; cursor is at (930, 0) (2): 1 windows, current is Windows: (0): displays buffer ; cursor is at (1, 0) 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 */ /**/ + 961, +/**/ 960, /**/ 959,