patch 8.1.1134: buffer for quickfix window is reused for another file

Problem:    Buffer for quickfix window is reused for another file.
Solution:   Don't reuse the quickfx buffer. (Yegappan Lakshmanan)

diff --git a/src/buffer.c b/src/buffer.c
index b9b44886c4f7195b541a6f09b305fbd5dc83f180..187a8a648252b59767ccb9ee46cfec6b4a364667 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1853,6 +1853,7 @@ curbuf_reusable(void)
        && curbuf->b_ffname == NULL
        && curbuf->b_nwindows <= 1
        && (curbuf->b_ml.ml_mfp == NULL || BUFEMPTY())
+       && !bt_quickfix(curbuf)
        && !curbufIsChanged());
 }
 

diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index bb25e64c830664477a8493bd71f1e07fcafa0adc..6099dcf34ef911e87cdbe1723ffddeeaf09bbba5 100644 (file)
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -4012,3 +4012,17 @@ func Test_winonly_autocmd()
   new | only
   call delete('Xtest1')
 endfunc
+
+" Test to make sure that an empty quickfix buffer is not reused for loading
+" a normal buffer.
+func Test_empty_qfbuf()
+  enew | only
+  call writefile(["Test"], 'Xfile1')
+  call setqflist([], 'f')
+  copen | only
+  let qfbuf = bufnr('')
+  edit Xfile1
+  call assert_notequal(qfbuf, bufnr(''))
+  enew
+  call delete('Xfile1')
+endfunc

diff --git a/src/version.c b/src/version.c
index 9f62232178ac49eef0d94824fae622ba2ecb37b7..4ffd63b980c34f0e990b0f2b39a741c687c3698d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1134,
 /**/
     1133,
 /**/