aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-08-07 07:51:03 +0800
committerckelsel <ckelsel@hotmail.com>2017-08-07 07:51:03 +0800
commit8b4dc955b7384180c1ae0eab6050bbf4e17c7673 (patch)
tree32508d91df7b98baeae52288b8cf0aa08b40b80a /src/nvim/message.c
parentc972efc9d113232b2688ea5c2adc8834a4eda195 (diff)
parent2753d61e4cb037323d78ed3fd978a10694c902c6 (diff)
downloadrneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.gz
rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.tar.bz2
rneovim-8b4dc955b7384180c1ae0eab6050bbf4e17c7673.zip
Merge remote-tracking branch 'upstream/master'
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 36f9ca84ed..28c88f5a14 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2722,9 +2722,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;