aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-01 19:02:38 -0500
committerGitHub <noreply@github.com>2020-12-01 19:02:38 -0500
commitd80f262f894bfc1d8a8ba79fdc5d1c14f738a140 (patch)
tree28bae2d0a935a9e0fdd13f19c1dbaaec294fc73e /src/nvim/buffer.c
parent72c22862dc2199462aef0d450a49d29a9d0680b9 (diff)
parent518fe0e8a2de00ce6b7f62183dfa89b410378a89 (diff)
downloadrneovim-d80f262f894bfc1d8a8ba79fdc5d1c14f738a140.tar.gz
rneovim-d80f262f894bfc1d8a8ba79fdc5d1c14f738a140.tar.bz2
rneovim-d80f262f894bfc1d8a8ba79fdc5d1c14f738a140.zip
Merge pull request #13428 from janlazo/nvim-8.0.1525
vim-patch:8.0.{858,953,1525}
Diffstat (limited to 'src/nvim/buffer.c')
-rw-r--r--src/nvim/buffer.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index ffa44c33cd..839d61cd2e 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1637,12 +1637,23 @@ void do_autochdir(void)
void no_write_message(void)
{
- EMSG(_("E37: No write since last change (add ! to override)"));
+ if (curbuf->terminal
+ && channel_job_running((uint64_t)curbuf->b_p_channel)) {
+ EMSG(_("E948: Job still running (add ! to end the job)"));
+ } else {
+ EMSG(_("E37: No write since last change (add ! to override)"));
+ }
}
-void no_write_message_nobang(void)
+void no_write_message_nobang(const buf_T *const buf)
+ FUNC_ATTR_NONNULL_ALL
{
- EMSG(_("E37: No write since last change"));
+ if (buf->terminal
+ && channel_job_running((uint64_t)buf->b_p_channel)) {
+ EMSG(_("E948: Job still running"));
+ } else {
+ EMSG(_("E37: No write since last change"));
+ }
}
//