Skip to content

Commit 4b7cdca

Browse files
committed
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.
1 parent ea8b7ae commit 4b7cdca

5 files changed

Lines changed: 12 additions & 3 deletions

File tree

runtime/doc/message.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ See `:messages` above.
7676
LIST OF MESSAGES
7777
*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
7878
*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
79-
*E323* *E341* *E473* *E570* *E685* *E950* >
79+
*E323* *E341* *E473* *E570* *E685* *E292* >
8080
Add to read buffer
8181
makemap: Illegal mode
8282
Cannot create BalloonEval with both message and callback

runtime/doc/options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7694,7 +7694,7 @@ A jump table for the options with a short description can be found at |Q_op|.
76947694
the GUI it only applies to the keyboard ('encoding' is used for the
76957695
display). Except for the Mac when 'macatsui' is off, then
76967696
'termencoding' should be "macroman".
7697-
*E617*
7697+
*E617* *E950*
76987698
Note: This does not apply to the GTK+ GUI. After the GUI has been
76997699
successfully initialized, 'termencoding' is forcibly set to "utf-8".
77007700
Any attempts to set a different value will be rejected, and an error

src/change.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ del_bytes(
12181218
// If "count" is negative the caller must be doing something wrong.
12191219
if (count < 1)
12201220
{
1221-
siemsg("E950: Invalid count for del_bytes(): %ld", count);
1221+
siemsg("E292: Invalid count for del_bytes(): %ld", count);
12221222
return FAIL;
12231223
}
12241224

src/testdir/test_python3.vim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,18 @@ endfunc
170170

171171
func Test_unicode()
172172
" this crashed Vim once
173+
let save_tenc = &tenc
174+
set tenc=
175+
173176
set encoding=utf32
174177
py3 print('hello')
178+
175179
set encoding=debug
176180
py3 print('hello')
181+
177182
set encoding=euc-tw
178183
py3 print('hello')
184+
179185
set encoding=utf8
186+
let &tenc = save_tenc
180187
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
74,
745747
/**/
746748
73,
747749
/**/

0 commit comments

Comments
 (0)