diff src/message.c @ 10589:b0c9c1a05054 v8.0.0184

patch 8.0.0184: when an error is caught Vim still exits with non-zero result commit https://github.com/vim/vim/commit/2b7bc567b9238aaac682236cb4f727d0376e1302 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 14 19:24:52 2017 +0100 patch 8.0.0184: when an error is caught Vim still exits with non-zero result Problem: When in Ex mode and an error is caught by try-catch, Vim still exits with a non-zero exit code. Solution: Don't set ex_exitval when inside a try-catch. (partly by Christian Brabandt)
author Christian Brabandt <cb@256bit.org>
date Sat, 14 Jan 2017 19:30:03 +0100
parents acfc83aca8ee
children b3601a8eb679
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -578,8 +578,6 @@ emsg(char_u *s)
 	return TRUE;
 
     called_emsg = TRUE;
-    if (emsg_silent == 0)
-	ex_exitval = 1;
 
     /*
      * If "emsg_severe" is TRUE: When an error exception is to be thrown,
@@ -642,6 +640,8 @@ emsg(char_u *s)
 	    return TRUE;
 	}
 
+	ex_exitval = 1;
+
 	/* Reset msg_silent, an error causes messages to be switched back on. */
 	msg_silent = 0;
 	cmd_silent = FALSE;