updated for version 7.3.1274
Problem: When selecting an entry from a location list it may pick an
arbitrary window or open a new one.
Solution: Prefer using a window related to the location list. (Lech Lorens)
diff --git a/src/quickfix.c b/src/quickfix.c
index b11ddd2..f789785 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1616,6 +1616,8 @@
*/
if (bt_quickfix(curbuf) && !opened_window)
{
+ win_T *usable_win_ptr = NULL;
+
/*
* If there is no file specified, we don't know where to go.
* But do advance, otherwise ":cn" gets stuck.
@@ -1623,14 +1625,29 @@
if (qf_ptr->qf_fnum == 0)
goto theend;
- /* Locate a window showing a normal buffer */
usable_win = 0;
- FOR_ALL_WINDOWS(win)
- if (win->w_buffer->b_p_bt[0] == NUL)
- {
- usable_win = 1;
- break;
- }
+
+ ll_ref = curwin->w_llist_ref;
+ if (ll_ref != NULL)
+ {
+ /* Find a window using the same location list that is not a
+ * quickfix window. */
+ FOR_ALL_WINDOWS(usable_win_ptr)
+ if (usable_win_ptr->w_llist == ll_ref
+ && usable_win_ptr->w_buffer->b_p_bt[0] != 'q')
+ break;
+ }
+
+ if (!usable_win)
+ {
+ /* Locate a window showing a normal buffer */
+ FOR_ALL_WINDOWS(win)
+ if (win->w_buffer->b_p_bt[0] == NUL)
+ {
+ usable_win = 1;
+ break;
+ }
+ }
/*
* If no usable window is found and 'switchbuf' contains "usetab"
@@ -1659,8 +1676,6 @@
*/
if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
{
- ll_ref = curwin->w_llist_ref;
-
flags = WSP_ABOVE;
if (ll_ref != NULL)
flags |= WSP_NEWLOC;
@@ -1683,12 +1698,7 @@
if (curwin->w_llist_ref != NULL)
{
/* In a location window */
- ll_ref = curwin->w_llist_ref;
-
- /* Find the window with the same location list */
- FOR_ALL_WINDOWS(win)
- if (win->w_llist == ll_ref)
- break;
+ win = usable_win_ptr;
if (win == NULL)
{
/* Find the window showing the selected file */
diff --git a/src/version.c b/src/version.c
index ea90de9..99c54b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1274,
+/**/
1273,
/**/
1272,