patch 9.0.0710: quitting/unloading/hiding a terminal does not work properly
Problem: Quitting/unloading/hiding a terminal buffer does not always work
properly.
Solution: Avoid that ":q!" leaves an empty buffer behind. ":bunload!" also
kills the job and unloads the buffer. ":hide" does not unload the
buffer. (Yee Cheng Chin, closes #11323)
diff --git a/src/buffer.c b/src/buffer.c
index 97b41e0..b589894 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -538,7 +538,8 @@
unload_buf = TRUE;
#ifdef FEAT_TERMINAL
- if (bt_terminal(buf) && (buf->b_nwindows == 1 || del_buf))
+ // depending on how we get here b_nwindows may already be zero
+ if (bt_terminal(buf) && (buf->b_nwindows <= 1 || del_buf))
{
CHECK_CURBUF;
if (term_job_running(buf->b_term))
@@ -550,6 +551,11 @@
// Wiping out or unloading a terminal buffer kills the job.
free_terminal(buf);
+
+ // A terminal buffer is wiped out when job has finished.
+ del_buf = TRUE;
+ unload_buf = TRUE;
+ wipe_buf = TRUE;
}
else
{
@@ -565,10 +571,16 @@
}
else
{
- // A terminal buffer is wiped out if the job has finished.
- del_buf = TRUE;
- unload_buf = TRUE;
- wipe_buf = TRUE;
+ if (del_buf || unload_buf)
+ {
+ // A terminal buffer is wiped out if the job has finished.
+ // We only do this when there's an intention to unload the
+ // buffer. This way, :hide and other similar commands won't
+ // wipe the buffer.
+ del_buf = TRUE;
+ unload_buf = TRUE;
+ wipe_buf = TRUE;
+ }
}
CHECK_CURBUF;
}