updated for version 7.4.195

Problem:    Python tests fail.
Solution:   Change "then" to "than" in more places. (Dominique Pelle, Taro
            Muraoka)

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index ab5541faf22775d73ac3f2f3cb4f5a30fb5a5a0a..b1692939a71b9a6624a8133117c5f3fab98617ee 100644 (file)
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -675,7 +675,7 @@ except ImportError:
 # Check GCing iterator that was not fully exhausted
 i = iter(vim.buffers)
 cb.append('i:' + str(next(i)))
-# and also check creating more then one iterator at a time
+# and also check creating more than one iterator at a time
 i2 = iter(vim.buffers)
 cb.append('i2:' + str(next(i2)))
 cb.append('i:' + str(next(i)))

diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 257a5ee4cd052670e5c51d7c9c942d16d5345d6d..8edb7499703cf41942d07ab91ef5888e073885d7 100644 (file)
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -882,11 +882,11 @@ ll[1:100] = "abcJ":error:('list is locked',)
 l[:] = FailingIter():NotImplementedError:('iter',)
 l[:] = FailingIterNext():NotImplementedError:('next',)
 <<< Finished
-nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater then 2 to extended slice',)
+nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater than 2 to extended slice',)
 ('a', 'b', 'c', 'O')
 nel[1:10:2]  = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',)
 ('a', 'b', 'c', 'O')
-nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater then 0 to extended slice',)
+nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater than 0 to extended slice',)
 ('a', 'b', 'c', 'O')
 nel[:] = FailingIterNextN(2):NotImplementedError:('next N',)
 ('a', 'b', 'c', 'O')
@@ -1233,8 +1233,8 @@ vim.buffers[100000000]:KeyError:(100000000,)
 >>> Testing NumberToLong using vim.buffers[%s]
 vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
 vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
-vim.buffers[-1]:ValueError:('number must be greater then zero',)
-vim.buffers[0]:ValueError:('number must be greater then zero',)
+vim.buffers[-1]:ValueError:('number must be greater than zero',)
+vim.buffers[0]:ValueError:('number must be greater than zero',)
 <<< Finished
 > Current
 >> CurrentGetattr

diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 1515a906bbf52d74ad7c7c772f3e28db5b123ff0..9111a499bc75146ee078f7f6ac705f2ced2b80d1 100644 (file)
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -664,7 +664,7 @@ py3 << EOF
 # Check GCing iterator that was not fully exhausted
 i = iter(vim.buffers)
 cb.append('i:' + str(next(i)))
-# and also check creating more then one iterator at a time
+# and also check creating more than one iterator at a time
 i2 = iter(vim.buffers)
 cb.append('i2:' + str(next(i2)))
 cb.append('i:' + str(next(i)))

diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index d1ec84c6b83b0cf9eb5d41fd9e792faef541caa3..e616544b5b455c2cd27d97c6005b7b6d90de18b6 100644 (file)
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -882,11 +882,11 @@ ll[1:100] = "abcJ":(<class 'vim.error'>, error('list is locked',))
 l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',))
 l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
 <<< Finished
-nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 2 to extended slice',))
+nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 2 to extended slice',))
 (b'a', b'b', b'c', b'O')
 nel[1:10:2]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size 1 to extended slice of size 2',))
 (b'a', b'b', b'c', b'O')
-nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 0 to extended slice',))
+nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 0 to extended slice',))
 (b'a', b'b', b'c', b'O')
 nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',))
 (b'a', b'b', b'c', b'O')
@@ -1233,8 +1233,8 @@ vim.buffers[100000000]:(<class 'KeyError'>, KeyError(100000000,))
 >>> Testing NumberToLong using vim.buffers[%s]
 vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
 vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
-vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
-vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
+vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
+vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
 <<< Finished
 > Current
 >> CurrentGetattr

diff --git a/src/version.c b/src/version.c
index 4b213685cbdc4229435b454be913a93667ec38b0..035b124b4cb247b8fd1db7162243879e9175c10f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    195,
 /**/
     194,
 /**/