diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-01-01 13:03:06 -0500 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-01-01 13:11:54 -0500 |
| commit | abaabd1d03fd723630f6addeadee9928faa4cdde (patch) | |
| tree | 71eefad0cab65912368f88de4170363a0ba24b09 | |
| parent | 5f0d5ec9852cf82c9b865ac2d3cf7f6e131adf4a (diff) | |
| download | rneovim-abaabd1d03fd723630f6addeadee9928faa4cdde.tar.gz rneovim-abaabd1d03fd723630f6addeadee9928faa4cdde.tar.bz2 rneovim-abaabd1d03fd723630f6addeadee9928faa4cdde.zip | |
vim-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.
https://github.com/vim/vim/commit/4b7cdca23035eacf6cd0e30b90546cf32f7efe9e
| -rw-r--r-- | runtime/doc/message.txt | 2 | ||||
| -rw-r--r-- | src/nvim/change.c | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_python3.vim | 9 |
4 files changed, 10 insertions, 9 deletions
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 98e45ac6da..43b1eb5e0c 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -69,7 +69,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/src/nvim/change.c b/src/nvim/change.c index 8a782c2b20..05cacaf2c2 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -757,7 +757,7 @@ int del_bytes(colnr_T count, bool fixpos_arg, bool use_delcombine) } // If "count" is negative the caller must be doing something wrong. if (count < 1) { - IEMSGN("E950: Invalid count for del_bytes(): %ld", count); + IEMSGN("E292: Invalid count for del_bytes(): %ld", count); return FAIL; } diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 7d080b8d56..a5a14a1a25 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2489,12 +2489,6 @@ return { defaults={if_true={vi=false}} }, { - full_name='termencoding', abbreviation='tenc', - type='string', scope={'global'}, - vi_def=true, - defaults={if_true={vi=""}} - }, - { full_name='termguicolors', abbreviation='tgc', type='bool', scope={'global'}, vi_def=false, diff --git a/src/nvim/testdir/test_python3.vim b/src/nvim/testdir/test_python3.vim index edd24c7be5..9ffca12706 100644 --- a/src/nvim/testdir/test_python3.vim +++ b/src/nvim/testdir/test_python3.vim @@ -174,13 +174,20 @@ func Test_Catch_Exception_Message() endfunc func Test_unicode() - throw 'skipped: Nvim only supports "utf-8" for "encoding" option' + throw 'skipped: Nvim does not support "termencoding" option and only supports "utf-8" for "encoding" option' " 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 |