summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-18 20:31:34 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-18 20:31:34 +0100
commit8b778d55993d951a65f8a59843cecd177c707676 (patch)
treeda0d746a7c2c755da02f23e58dda09edb4450f14
parenta1e24b9bc9123ff6dd23e3cac2287a4411ef5572 (diff)
patch 7.4.1347v7.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)
-rw-r--r--src/message.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index b3525909f7..6c9dd646cb 100644
--- a/src/message.c
+++ b/src/message.c
@@ -531,7 +531,8 @@ emsg(char_u *s)
return TRUE;
called_emsg = TRUE;
- ex_exitval = 1;
+ if (emsg_silent == 0)
+ ex_exitval = 1;
/*
* If "emsg_severe" is TRUE: When an error exception is to be thrown,
diff --git a/src/version.c b/src/version.c
index 315a4142ab..31e15c3350 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1347,
+/**/
1346,
/**/
1345,