summaryrefslogtreecommitdiffstats
path: root/src/ex_docmd.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-13 18:05:18 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-13 18:05:18 +0100
commit2be57331524e93da52a0663f4a334d21c05123bb (patch)
tree231325e508c202f6d060ce3fc836ccc6d8cff954 /src/ex_docmd.c
parentbc197195b097707d08fd44a476dbc374366504cb (diff)
patch 8.0.1518: error messages suppressed after ":silent! try"v8.0.1518
Problem: Error messages suppressed after ":silent! try". (Ben Reilly) Solution: Restore emsg_silent before executing :try. (closes #2531)
Diffstat (limited to 'src/ex_docmd.c')
-rw-r--r--src/ex_docmd.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 5825bf1d1b..b923980e35 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2880,8 +2880,18 @@ do_one_cmd(
}
#endif
+ /* The :try command saves the emsg_silent flag, reset it here when
+ * ":silent! try" was used, it should only apply to :try itself. */
+ if (ea.cmdidx == CMD_try && did_esilent > 0)
+ {
+ emsg_silent -= did_esilent;
+ if (emsg_silent < 0)
+ emsg_silent = 0;
+ did_esilent = 0;
+ }
+
/*
- * 7. Switch on command name.
+ * 7. Execute the command.
*
* The "ea" structure holds the arguments that can be used.
*/