summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-01 17:09:11 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-01 17:09:11 +0100
commit2466aea508f22d44099d54ed6d15c0a1d90f8d6e (patch)
treedc2d9530b7e9845b397784afdd9fd0ddcc20f5a0
parent4b7cdca23035eacf6cd0e30b90546cf32f7efe9e (diff)
downloadvim-git-2466aea508f22d44099d54ed6d15c0a1d90f8d6e.tar.gz
patch 8.2.0075: Python 3 unicode test still sometimes failsv8.2.0075
Problem: Python 3 unicode test still sometimes fails. Solution: Skip the test when 'termencoding' is not empty.
-rw-r--r--src/testdir/test_python3.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index cd5ac9cc0..f722edca5 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -170,8 +170,9 @@ endfunc
func Test_unicode()
" this crashed Vim once
- let save_tenc = &tenc
- set tenc=
+ if &tenc != ''
+ throw "Skipped: 'termencoding' is not empty"
+ endif
set encoding=utf32
py3 print('hello')
@@ -183,5 +184,4 @@ func Test_unicode()
py3 print('hello')
set encoding=utf8
- let &tenc = save_tenc
endfunc
diff --git a/src/version.c b/src/version.c
index 30f4465f6..16544f7ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 75,
+/**/
74,
/**/
73,