IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #11647 from janlazo/vim-8.2.0070

Browse Source 
vim-patch:8.2.{70,74,75,76}
This commit is contained in:
Justin M. Keyes 2020-01-01 11:09:01 -08:00 committed by GitHub
commit a495d49012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/message.txt
View File

@ -69,7 +69,7 @@ See `:messages` above.
LIST OF MESSAGES LIST OF MESSAGES
*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317* *E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
*E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322* *E318* *E356* *E438* *E439* *E440* *E316* *E320* *E322*
*E323* *E341* *E473* *E570* *E685* *E950* > *E323* *E341* *E473* *E570* *E685* *E292* >
Add to read buffer Add to read buffer
makemap: Illegal mode makemap: Illegal mode
Cannot create BalloonEval with both message and callback Cannot create BalloonEval with both message and callback

2
src/nvim/change.c
View File

@ -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" is negative the caller must be doing something wrong.
if (count < 1) { if (count < 1) {
IEMSGN("E950: Invalid count for del_bytes(): %ld", count); IEMSGN("E292: Invalid count for del_bytes(): %ld", count);
return FAIL; return FAIL;
} }

6
src/nvim/options.lua
View File

@ -2488,12 +2488,6 @@ return {
varname='p_tbidi', varname='p_tbidi',
defaults={if_true={vi=false}} 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', full_name='termguicolors', abbreviation='tgc',
type='bool', scope={'global'}, type='bool', scope={'global'},

18
src/nvim/testdir/test_python3.vim
View File

@ -174,8 +174,22 @@ func Test_Catch_Exception_Message()
endfunc endfunc
func Test_unicode() func Test_unicode()
throw 'skipped: Nvim does not support "termencoding" option and only supports "utf-8" for "encoding" option'
" this crashed Vim once " this crashed Vim once
" set encoding=utf32 if &tenc != ''
throw "Skipped: 'termencoding' is not empty"
endif
set encoding=utf32
py3 print('hello') py3 print('hello')
" set encoding=utf8
if !has('win32')
set encoding=debug
py3 print('hello')
endif
set encoding=euc-tw
py3 print('hello')
set encoding=utf8
endfunc endfunc