summaryrefslogtreecommitdiffstats
path: root/src/message.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-01 18:30:34 +0100
committerBram Moolenaar <Bram@vim.org>2017-03-01 18:30:34 +0100
commitf8ab1b14fd972a093e0c12146dd3becd511eb519 (patch)
tree8315232533c5788867675c0099d3e1befd6fc65a /src/message.c
parentabc39ab642791ae3d22a524516eeedb673a95d9d (diff)
patch 8.0.0395: testing the + register fails with Motifv8.0.0395
Problem: Testing the + register fails with Motif. Solution: Also ignore the "failed to create input context" error in the second gvim. Don't use msg() when it would result in a dialog.
Diffstat (limited to 'src/message.c')
-rw-r--r--src/message.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index 985e1ebbf2..ab193f0855 100644
--- a/src/message.c
+++ b/src/message.c
@@ -605,7 +605,8 @@ emsg(char_u *s)
#ifdef FEAT_EVAL
/* When testing some errors are turned into a normal message. */
if (ignore_error(s))
- return msg(s);
+ /* don't call msg() if it results in a dialog */
+ return msg_use_printf() ? FALSE : msg(s);
#endif
called_emsg = TRUE;