diff options
| -rw-r--r-- | runtime/doc/message.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | src/change.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_python3.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index af53e64f4..9e4937bff 100644 --- 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 7d8e032cd..0fd23a48b 100644 --- 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 f2dfc9371..e5ac97bd5 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 97f797e44..cd5ac9cc0 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 c8df547e4..30f4465f6 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, |