aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3342: test for :let errors fails

Browse Source 
Problem:    Test for :let errors fails.
Solution:   Adjust the test and how to avoid a second error message.
This commit is contained in:
Bram Moolenaar 2021-08-14 14:27:30 +02:00
parent 88c89c7722
commit b521766c56
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/evalvars.c
View File

@ -1184,6 +1184,7 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first)
char_u *arg_subsc; char_u *arg_subsc;
char_u *tofree; char_u *tofree;
typval_T tv; typval_T tv;
int prev_uncaught_emsg = uncaught_emsg;
while (!ends_excmd2(eap->cmd, arg) && !got_int) while (!ends_excmd2(eap->cmd, arg) && !got_int)
{ {
@ -1193,7 +1194,7 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first)
if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg))
{ {
emsg_severe = TRUE; emsg_severe = TRUE;
if (!error) if (uncaught_emsg == prev_uncaught_emsg)
semsg(_(e_trailing_arg), arg); semsg(_(e_trailing_arg), arg);
break; break;
} }

2
src/testdir/test_let.vim
View File

@ -279,7 +279,7 @@ func Test_let_errors()
let l = [1, 2, 3] let l = [1, 2, 3]
call assert_fails('let l[:] = 5', 'E709:') call assert_fails('let l[:] = 5', 'E709:')
call assert_fails('let x:lnum=5', ['E121:', 'E488:']) call assert_fails('let x:lnum=5', ['E121:', 'E121:'])
call assert_fails('let v:=5', 'E461:') call assert_fails('let v:=5', 'E461:')
call assert_fails('let [a]', 'E474:') call assert_fails('let [a]', 'E474:')
call assert_fails('let [a, b] = [', 'E697:') call assert_fails('let [a, b] = [', 'E697:')

2
src/version.c
View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3342,
/**/ /**/
3341, 3341,
/**/ /**/