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)

diff --git a/src/message.c b/src/message.c
index b3525909f78856666af5a5b1cdabace133b3af3c..6c9dd646cb526b8178cf8dfe4a789095a1babbb9 100644 (file)
--- 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 315a4142abc8cba6c6d3503a1bfe7378dd2a7c7a..31e15c335098f662679b3fc7c83b8142fd3c80b1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1347,
 /**/
     1346,
 /**/