diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-05-16 20:47:56 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-05-16 20:47:56 +0200 |
| commit | c24c1acd828e9dc410c2a674c794600eed98bcf6 (patch) | |
| tree | 36dc69e48a9953c09e47a11675b95b043e1dd72e /src | |
| parent | 07729b25bf85f41822eae4978eb2097f31ac09d7 (diff) | |
updated for version 7.3.961v7.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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test86.in | 2 | ||||
| -rw-r--r-- | src/testdir/test87.in | 1 | ||||
| -rw-r--r-- | src/testdir/test87.ok | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 43f2a54513..8124b51d60 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -5,10 +5,10 @@ This would require recompiling Python with: ./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 index 7d8ba3c3bf..51425d645a 100644 --- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -3,6 +3,7 @@ Tests for various python features. vim: set ft=vim : 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 index a37bd72263..7ed51b933c 100644 --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -322,7 +322,7 @@ Number of tabs: 4 Current tab pages: <tabpage 0>(1): 1 windows, current is <window object (unknown)> Windows: - <window object (unknown)>(0): displays buffer <buffer test87.in>; cursor is at (929, 0) + <window object (unknown)>(0): displays buffer <buffer test87.in>; cursor is at (930, 0) <tabpage 1>(2): 1 windows, current is <window object (unknown)> Windows: <window object (unknown)>(0): displays buffer <buffer 0>; cursor is at (1, 0) diff --git a/src/version.c b/src/version.c index 4ace0a0202..65683bae1a 100644 --- 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, |