From 1557b16dad2b1a3466a93d015575cd7fdb4661c9 Mon Sep 17 00:00:00 2001
From: Wei-Chung Wen <morisato3711@gmail.com>
Date: Thu, 15 Jul 2021 13:13:39 +0200
Subject: patch 8.2.3163: location list window may open a wrong file

Problem:    Location list window may open a wrong file.
Solution:   Also update the qf_ptr field. (Wei-Chung Wen, closes #8565,
            closes #8566)
---
 src/quickfix.c                |  1 +
 src/testdir/test_quickfix.vim | 33 +++++++++++++++++++++++++++++++++
 src/version.c                 |  2 ++
 3 files changed, 36 insertions(+)

diff --git a/src/quickfix.c b/src/quickfix.c
index 4ac4a01a10..39424ca680 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3461,6 +3461,7 @@ qf_jump_newwin(qf_info_T	*qi,
     }
 
     qfl->qf_index = qf_index;
+    qfl->qf_ptr = qf_ptr;
     if (qf_win_pos_update(qi, old_qf_index))
 	// No need to print the error message if it's visible in the error
 	// window
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index a6a20a8451..e5a6d6cdbc 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -5554,4 +5554,37 @@ func Test_vimgrep_fuzzy_match()
   call delete('Xfile2')
 endfunc
 
+func Test_locationlist_open_in_newtab()
+  call s:create_test_file('Xqftestfile1')
+  call s:create_test_file('Xqftestfile2')
+  call s:create_test_file('Xqftestfile3')
+
+  %bwipe!
+
+  lgetexpr ['Xqftestfile1:5:Line5',
+		\ 'Xqftestfile2:10:Line10',
+		\ 'Xqftestfile3:16:Line16']
+
+  silent! llast
+  call assert_equal(1, tabpagenr('$'))
+  call assert_equal('Xqftestfile3', bufname())
+
+  set switchbuf=newtab
+
+  silent! lfirst
+  call assert_equal(2, tabpagenr('$'))
+  call assert_equal('Xqftestfile1', bufname())
+
+  silent! lnext
+  call assert_equal(3, tabpagenr('$'))
+  call assert_equal('Xqftestfile2', bufname())
+
+  call delete('Xqftestfile1')
+  call delete('Xqftestfile2')
+  call delete('Xqftestfile3')
+  set switchbuf&vim
+
+  %bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 341faea42d..edf5306f74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3163,
 /**/
     3162,
 /**/
-- 
cgit v1.2.3