diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-12-01 19:02:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 19:02:38 -0500 |
| commit | d80f262f894bfc1d8a8ba79fdc5d1c14f738a140 (patch) | |
| tree | 28bae2d0a935a9e0fdd13f19c1dbaaec294fc73e /src/nvim/ex_cmds2.c | |
| parent | 72c22862dc2199462aef0d450a49d29a9d0680b9 (diff) | |
| parent | 518fe0e8a2de00ce6b7f62183dfa89b410378a89 (diff) | |
| download | rneovim-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/ex_cmds2.c')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 6b03117ff3..3b9c44c3cd 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1297,7 +1297,7 @@ bool check_changed(buf_T *buf, int flags) if (flags & CCGD_EXCMD) { no_write_message(); } else { - no_write_message_nobang(); + no_write_message_nobang(curbuf); } return true; } @@ -1503,8 +1503,10 @@ bool check_changed_any(bool hidden, bool unload) msg_col = 0; msg_didout = false; } - if (EMSG2(_("E162: No write since last change for buffer \"%s\""), - buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname)) { + if ((buf->terminal && channel_job_running((uint64_t)buf->b_p_channel)) + ? EMSG2(_("E947: Job still running in buffer \"%s\""), buf->b_fname) + : EMSG2(_("E162: No write since last change for buffer \"%s\""), + buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname)) { save = no_wait_return; no_wait_return = false; wait_return(false); |