Mercurial > vim
comparison src/evalvars.c @ 25613:994cad298596 v8.2.3343
patch 8.2.3343: Vim9: autoload test fails
Commit: https://github.com/vim/vim/commit/4830c211a47f39edcf1827ffd787306faf65c2a5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 14 14:59:27 2021 +0200
patch 8.2.3343: Vim9: autoload test fails
Problem: Vim9: autoload test fails.
Solution: Adjust the way the second message is avoided
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 14 Aug 2021 15:00:04 +0200 |
parents | f142bfebaac1 |
children | 15b54e0a576b |
comparison
equal
deleted
inserted
replaced
25612:0d5300e4a3be | 25613:994cad298596 |
---|---|
1182 char_u *name; | 1182 char_u *name; |
1183 char_u *name_start; | 1183 char_u *name_start; |
1184 char_u *arg_subsc; | 1184 char_u *arg_subsc; |
1185 char_u *tofree; | 1185 char_u *tofree; |
1186 typval_T tv; | 1186 typval_T tv; |
1187 int prev_uncaught_emsg = uncaught_emsg; | |
1188 | 1187 |
1189 while (!ends_excmd2(eap->cmd, arg) && !got_int) | 1188 while (!ends_excmd2(eap->cmd, arg) && !got_int) |
1190 { | 1189 { |
1191 if (error || eap->skip) | 1190 if (error || eap->skip) |
1192 { | 1191 { |
1193 arg = find_name_end(arg, NULL, NULL, FNE_INCL_BR | FNE_CHECK_START); | 1192 arg = find_name_end(arg, NULL, NULL, FNE_INCL_BR | FNE_CHECK_START); |
1194 if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) | 1193 if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg)) |
1195 { | 1194 { |
1196 emsg_severe = TRUE; | 1195 emsg_severe = TRUE; |
1197 if (uncaught_emsg == prev_uncaught_emsg) | 1196 if (!did_emsg) |
1198 semsg(_(e_trailing_arg), arg); | 1197 semsg(_(e_trailing_arg), arg); |
1199 break; | 1198 break; |
1200 } | 1199 } |
1201 } | 1200 } |
1202 else | 1201 else |