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

vim-patch:8.2.4492: no error if an option is given a value with ":let &opt = val" (#19670)

Browse Source 
Problem:    No error if an option is given an invalid value with
            ":let &opt = val".
Solution:   Give the error. (closes vim/vim#9864)
8ccbbeb620
This commit is contained in:
zeertzjq 2022-08-07 17:11:03 +08:00 committed by GitHub
parent fea15adad3
commit fa8b2b4c50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/eval/vars.c
View File

@ -678,8 +678,11 @@ static char *ex_let_one(char *arg, typval_T *const tv, const bool copy, const bo
if (!failed) { if (!failed) {
if (opt_type != gov_string || s != NULL) { if (opt_type != gov_string || s != NULL) {
set_option_value(arg, n, s, opt_flags); char *err = set_option_value(arg, n, s, opt_flags);
arg_end = p; arg_end = p;
if (err != NULL) {
emsg(_(err));
}
} else { } else {
emsg(_(e_stringreq)); emsg(_(e_stringreq));
} }

3
src/nvim/testdir/test_normal.vim
View File

@ -1975,7 +1975,8 @@ func Test_normal31_r_cmd()
" using CTRL-Y and CTRL-E. " using CTRL-Y and CTRL-E.
" Different code paths are used for utf-8 and latin1 encodings " Different code paths are used for utf-8 and latin1 encodings
set showmatch set showmatch
for enc in ['latin1', 'utf-8'] " for enc in ['latin1', 'utf-8']
for enc in ['utf-8']
enew! enew!
let &encoding = enc let &encoding = enc
call setline(1, [' {a}', 'xxxxxxxxxx', ' [b]']) call setline(1, [' {a}', 'xxxxxxxxxx', ' [b]'])

2
src/nvim/testdir/test_options.vim
View File

@ -310,6 +310,7 @@ func Test_set_errors()
call assert_fails('set sidescroll=-1', 'E487:') call assert_fails('set sidescroll=-1', 'E487:')
call assert_fails('set tabstop=-1', 'E487:') call assert_fails('set tabstop=-1', 'E487:')
call assert_fails('set tabstop=10000', 'E474:') call assert_fails('set tabstop=10000', 'E474:')
call assert_fails('let &tabstop = 10000', 'E474:')
call assert_fails('set tabstop=5500000000', 'E474:') call assert_fails('set tabstop=5500000000', 'E474:')
call assert_fails('set textwidth=-1', 'E487:') call assert_fails('set textwidth=-1', 'E487:')
call assert_fails('set timeoutlen=-1', 'E487:') call assert_fails('set timeoutlen=-1', 'E487:')
@ -325,6 +326,7 @@ func Test_set_errors()
call assert_fails('set comments=a', 'E525:') call assert_fails('set comments=a', 'E525:')
call assert_fails('set foldmarker=x', 'E536:') call assert_fails('set foldmarker=x', 'E536:')
call assert_fails('set commentstring=x', 'E537:') call assert_fails('set commentstring=x', 'E537:')
call assert_fails('let &commentstring = "x"', 'E537:')
call assert_fails('set complete=x', 'E539:') call assert_fails('set complete=x', 'E539:')
call assert_fails('set rulerformat=%-', 'E539:') call assert_fails('set rulerformat=%-', 'E539:')
call assert_fails('set rulerformat=%(', 'E542:') call assert_fails('set rulerformat=%(', 'E542:')