vim-patch: 7.4.1347

Problem:    When there is any error Vim will use a non-zero exit code.
Solution:   When using ":silent!" do not set the exit code. (Yasuhiro
            Matsumoto)

8b778d5599
This commit is contained in:
Michael Ennen
2016-04-24 12:33:45 -07:00
parent ab63f5d934
commit 9cf91a8691
2 changed files with 13 additions and 12 deletions

View File

@@ -467,22 +467,23 @@ int emsg(char_u *s)
{ {
int attr; int attr;
char_u *p; char_u *p;
int ignore = FALSE; int ignore = false;
int severe; int severe;
/* Skip this if not giving error messages at the moment. */ // Skip this if not giving error messages at the moment.
if (emsg_not_now()) if (emsg_not_now()) {
return TRUE; return true;
}
called_emsg = TRUE; called_emsg = true;
if (emsg_silent == 0) {
ex_exitval = 1; ex_exitval = 1;
}
/* // If "emsg_severe" is TRUE: When an error exception is to be thrown,
* If "emsg_severe" is TRUE: When an error exception is to be thrown, // prefer this message over previous messages for the same command.
* prefer this message over previous messages for the same command.
*/
severe = emsg_severe; severe = emsg_severe;
emsg_severe = FALSE; emsg_severe = false;
if (!emsg_off || vim_strchr(p_debug, 't') != NULL) { if (!emsg_off || vim_strchr(p_debug, 't') != NULL) {
/* /*

View File

@@ -330,7 +330,7 @@ static int included_patches[] = {
// 1350 NA // 1350 NA
// 1349 NA // 1349 NA
// 1348 NA // 1348 NA
// 1347, 1347,
1346, 1346,
// 1345 NA // 1345 NA
// 1344 NA // 1344 NA