aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-08-06 15:25:17 +0300
committerZyX <kp-pav@yandex.ru>2017-08-06 15:25:17 +0300
commit474aa823dc5680b06dc84cd2ae248e58b6e83359 (patch)
tree1714a0878caecff1f3d9d69228c888728c824d15 /src/nvim/message.c
parent36acfce4eac9dd131a39c4dbdff2836ab3e21d73 (diff)
parent5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (diff)
downloadrneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.gz
rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.bz2
rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.zip
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index fd7043cea8..b90c475ede 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2743,9 +2743,11 @@ do_dialog (
int c;
int i;
- /* Don't output anything in silent mode ("ex -s") */
- if (silent_mode)
- return dfltbutton; /* return default option */
+ if (silent_mode // No dialogs in silent mode ("ex -s")
+ || !ui_active() // Without a UI Nvim waits for input forever.
+ ) {
+ return dfltbutton; // return default option
+ }
oldState = State;