patch 9.0.0708: :confirm does not work properly for a terminal buffer
Problem: :confirm does not work properly for a terminal buffer.
Solution: Handle :confirm for a terminal buffer differently. (Yee Cheng
Chin, closes #11312)
diff --git a/src/terminal.c b/src/terminal.c
index f5687df..46ed325 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1651,6 +1651,25 @@
&& term->tl_job->jv_channel->ch_keep_open;
}
+//
+// Used to confirm whether we would like to kill a terminal.
+// Return OK when the user confirms to kill it.
+// Return FAIL if the user selects otherwise.
+//
+ int
+term_confirm_stop(buf_T *buf)
+{
+ char_u buff[DIALOG_MSG_SIZE];
+ int ret;
+
+ dialog_msg(buff, _("Kill job in \"%s\"?"), buf_get_fname(buf));
+ ret = vim_dialog_yesno(VIM_QUESTION, NULL, buff, 1);
+ if (ret == VIM_YES)
+ return OK;
+ else
+ return FAIL;
+}
+
/*
* Used when exiting: kill the job in "buf" if so desired.
* Return OK when the job finished.
@@ -1666,14 +1685,9 @@
if ((how == NULL || *how == NUL)
&& (p_confirm || (cmdmod.cmod_flags & CMOD_CONFIRM)))
{
- char_u buff[DIALOG_MSG_SIZE];
- int ret;
-
- dialog_msg(buff, _("Kill job in \"%s\"?"), buf_get_fname(buf));
- ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
- if (ret == VIM_YES)
+ if (term_confirm_stop(buf) == OK)
how = "kill";
- else if (ret == VIM_CANCEL)
+ else
return FAIL;
}
#endif