summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-01 16:18:38 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-01 16:18:38 +0100
commit4b7cdca23035eacf6cd0e30b90546cf32f7efe9e (patch)
tree0a79a0d892c24d9fa72a1412bb2dbffb87cedfe7 /src
parentea8b7aecab9cc6d9c2d2845ad53203b26de14f85 (diff)
patch 8.2.0074: Python 3 unicode test someitmes failsv8.2.0074
Problem: Python 3 unicode test someitmes fails. Solution: Make 'termencoding' empty. Correct number of error message.
Diffstat (limited to 'src')
-rw-r--r--src/change.c2
-rw-r--r--src/testdir/test_python3.vim7
-rw-r--r--src/version.c2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/change.c b/src/change.c
index f2dfc9371e..e5ac97bd54 100644
--- a/src/change.c
+++ b/src/change.c
@@ -1218,7 +1218,7 @@ del_bytes(
// If "count" is negative the caller must be doing something wrong.
if (count < 1)
{
- siemsg("E950: Invalid count for del_bytes(): %ld", count);
+ siemsg("E292: Invalid count for del_bytes(): %ld", count);
return FAIL;
}
diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim
index 97f797e440..cd5ac9cc09 100644
--- a/src/testdir/test_python3.vim
+++ b/src/testdir/test_python3.vim
@@ -170,11 +170,18 @@ endfunc
func Test_unicode()
" this crashed Vim once
+ let save_tenc = &tenc
+ set tenc=
+
set encoding=utf32
py3 print('hello')
+
set encoding=debug
py3 print('hello')
+
set encoding=euc-tw
py3 print('hello')
+
set encoding=utf8
+ let &tenc = save_tenc
endfunc
diff --git a/src/version.c b/src/version.c
index c8df547e4d..30f4465f6e 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 */
/**/
+ 74,
+/**/
73,
/**/
72,