summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/channel.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c
index 5818dc399..5d8941350 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2545,7 +2545,8 @@ channel_exe_cmd(channel_T *channel, ch_part_T part, typval_T *argv)
char_u *json = NULL;
// Don't pollute the display with errors.
- ++emsg_skip;
+ // Do generate the errors so that try/catch works.
+ ++emsg_silent;
if (!is_call)
{
ch_log(channel, "Evaluating expression '%s'", (char *)arg);
@@ -2581,7 +2582,7 @@ channel_exe_cmd(channel_T *channel, ch_part_T part, typval_T *argv)
vim_free(json);
}
}
- --emsg_skip;
+ --emsg_silent;
if (tv == &res_tv)
clear_tv(tv);
else
diff --git a/src/version.c b/src/version.c
index ed97a521b..e3bdedefb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3081,
+/**/
3080,
/**/
3079,