Mercurial > vim
changeset 15965:f376cd250b07 v8.1.0988
patch 8.1.0988: deleting location list buffer breaks location list window
commit https://github.com/vim/vim/commit/d82a81cad93708a6c180e59119db4818cc38c1a9
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 2 07:57:18 2019 +0100
patch 8.1.0988: deleting location list buffer breaks location list window
Problem: Deleting a location list buffer breaks location list window
functionality.
Solution: (Yegappan Lakshmanan, closes #4056)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 02 Mar 2019 08:00:06 +0100 |
| parents | fd3e889df355 |
| children | 04e63da5e0b3 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 39 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -3981,6 +3981,27 @@ qf_goto_cwindow(qf_info_T *qi, int resiz } /* + * Set options for the buffer in the quickfix or location list window. + */ + static void +qf_set_cwindow_options(void) +{ + // switch off 'swapfile' + set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL); + set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", + OPT_LOCAL); + set_option_value((char_u *)"bh", 0L, (char_u *)"hide", OPT_LOCAL); + RESET_BINDING(curwin); +#ifdef FEAT_DIFF + curwin->w_p_diff = FALSE; +#endif +#ifdef FEAT_FOLDING + set_option_value((char_u *)"fdm", 0L, (char_u *)"manual", + OPT_LOCAL); +#endif +} + +/* * Open a new quickfix or location list window, load the quickfix buffer and * set the appropriate options for the window. * Returns FAIL if the window could not be opened. @@ -4032,23 +4053,16 @@ qf_open_new_cwindow(qf_info_T *qi, int h // Create a new quickfix buffer (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, oldwin); - // switch off 'swapfile' - set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL); - set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", - OPT_LOCAL); - set_option_value((char_u *)"bh", 0L, (char_u *)"hide", OPT_LOCAL); - RESET_BINDING(curwin); -#ifdef FEAT_DIFF - curwin->w_p_diff = FALSE; -#endif -#ifdef FEAT_FOLDING - set_option_value((char_u *)"fdm", 0L, (char_u *)"manual", - OPT_LOCAL); -#endif // save the number of the new buffer qi->qf_bufnr = curbuf->b_fnum; } + // Set the options for the quickfix buffer/window (if not already done) + // Do this even if the quickfix buffer was already present, as an autocmd + // might have previously deleted (:bdelete) the quickfix buffer. + if (curbuf->b_p_bt[0] != 'q') + qf_set_cwindow_options(); + // Only set the height when still in the same tab page and there is no // window to the side. if (curtab == prevtab && curwin->w_width == Columns)
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -3933,6 +3933,16 @@ func Xqfbuf_test(cchar) call assert_match(qfbnum . ' h- "\[Location List]"', execute('ls')) call assert_true(bufloaded(qfbnum)) + " After deleting a location list buffer using ":bdelete", opening the + " location list window should mark the buffer as a location list buffer. + exe "bdelete " . qfbnum + lopen + call assert_equal("quickfix", &buftype) + call assert_equal(1, getwininfo(win_getid(winnr()))[0].loclist) + call assert_equal(wid, getloclist(0, {'filewinid' : 0}).filewinid) + call assert_false(&swapfile) + lclose + " When the location list is cleared for the window, the buffer should be " removed call setloclist(0, [], 'f')