diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-02-08 15:05:20 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-08 15:05:20 +0000 |
| commit | e3537aec2f8d6470010547af28dcbd83d41461b8 (patch) | |
| tree | c82805b886c333b464b8473377bc0548cb3f4e5d /src/buffer.c | |
| parent | 51ab7c7d0da08aac796acff22a6c075dac579e76 (diff) | |
patch 8.2.4327: may end up with no current bufferv8.2.4327
Problem: May end up with no current buffer.
Solution: When deleting the current buffer to not pick a quickfix buffer as
the new current buffer.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/buffer.c b/src/buffer.c index 81bdb31ca1..b3e2bc3f98 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1430,8 +1430,14 @@ do_buffer_ext( buf = buflist_findnr(curwin->w_jumplist[jumpidx].fmark.fnum); if (buf != NULL) { - if (buf == curbuf || !buf->b_p_bl) - buf = NULL; // skip current and unlisted bufs + // Skip current and unlisted bufs. Also skip a quickfix + // buffer, it might be deleted soon. + if (buf == curbuf || !buf->b_p_bl +#if defined(FEAT_QUICKFIX) + || bt_quickfix(buf) +#endif + ) + buf = NULL; else if (buf->b_ml.ml_mfp == NULL) { // skip unloaded buf, but may keep it for later @@ -1467,7 +1473,11 @@ do_buffer_ext( continue; } // in non-help buffer, try to skip help buffers, and vv - if (buf->b_help == curbuf->b_help && buf->b_p_bl) + if (buf->b_help == curbuf->b_help && buf->b_p_bl +#if defined(FEAT_QUICKFIX) + && !bt_quickfix(buf) +#endif + ) { if (buf->b_ml.ml_mfp != NULL) // found loaded buffer break; @@ -1485,7 +1495,11 @@ do_buffer_ext( if (buf == NULL) // No loaded buffer, find listed one { FOR_ALL_BUFFERS(buf) - if (buf->b_p_bl && buf != curbuf) + if (buf->b_p_bl && buf != curbuf +#if defined(FEAT_QUICKFIX) + && !bt_quickfix(buf) +#endif + ) break; } if (buf == NULL) // Still no buffer, just take one @@ -1494,6 +1508,10 @@ do_buffer_ext( buf = curbuf->b_next; else buf = curbuf->b_prev; +#if defined(FEAT_QUICKFIX) + if (bt_quickfix(buf)) + buf = NULL; +#endif } } |