patch 8.2.0074: Python 3 unicode test someitmes fails

Problem:    Python 3 unicode test someitmes fails.
Solution:   Make 'termencoding' empty.  Correct number of error message.

diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index af53e64f4e98de9291ba7a75c61d4367dd605467..9e4937bff0c19c1200cb6abf58fa43f40b766b89 100644 (file)
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -76,7 +76,7 @@ See `:messages` above.
 LIST OF MESSAGES
                        *E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
                        *E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
-                       *E323* *E341* *E473* *E570* *E685* *E950*  >
+                       *E323* *E341* *E473* *E570* *E685* *E292*  >
   Add to read buffer
   makemap: Illegal mode
   Cannot create BalloonEval with both message and callback

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7d8e032cd33a76a9915abc5efe92e56e4bfbd7c7..0fd23a48b8b820f23b5c7b73784e063ea2433ee8 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -7694,7 +7694,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        the GUI it only applies to the keyboard ('encoding' is used for the
        display).  Except for the Mac when 'macatsui' is off, then
        'termencoding' should be "macroman".
-                                                               *E617*
+                                                               *E617* *E950*
        Note: This does not apply to the GTK+ GUI.  After the GUI has been
        successfully initialized, 'termencoding' is forcibly set to "utf-8".
        Any attempts to set a different value will be rejected, and an error

diff --git a/src/change.c b/src/change.c
index f2dfc9371e68810233b663e2e2426410cc0d3f38..e5ac97bd5455101d1560b1561851c5d54507c6b0 100644 (file)
--- 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 97f797e440cc2b76614a1bd7df1918462ecd255e..cd5ac9cc09260b19591f67a5980b6299a8f0a45b 100644 (file)
--- 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 c8df547e4d6c06d7fa51b6289a90eeeb68a49d77..30f4465f6e243103b97f17595a24c18afb86c10b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    74,
 /**/
     73,
 /**/