aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorsohnryang <loop.infinitely@gmail.com>2018-01-31 19:45:04 +0900
committerJustin M. Keyes <justinkz@gmail.com>2018-03-24 22:33:41 +0100
commitf50ce7d510cc0b0b31b738670c98e946b5ddd53c (patch)
tree47554d624bde6438f36ac6bead0022a8fec16960 /src/nvim/message.c
parent131aad953c007d382cbff1d2560471b29975da87 (diff)
downloadrneovim-f50ce7d510cc0b0b31b738670c98e946b5ddd53c.tar.gz
rneovim-f50ce7d510cc0b0b31b738670c98e946b5ddd53c.tar.bz2
rneovim-f50ce7d510cc0b0b31b738670c98e946b5ddd53c.zip
vim-patch:8.0.0184: fix ex-mode exit code #7943
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) https://github.com/vim/vim/commit/2b7bc567b9238aaac682236cb4f727d0376e1302
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index e522670a65..12e5b844be 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -487,9 +487,6 @@ int emsg(const char_u *s_)
}
called_emsg = true;
- if (emsg_silent == 0) {
- ex_exitval = 1;
- }
// If "emsg_severe" is TRUE: When an error exception is to be thrown,
// prefer this message over previous messages for the same command.
@@ -540,6 +537,8 @@ int emsg(const 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;