updated for version 7.3.280
Problem: ":lmake" does not update the quickfix window title.
Solution: Update the title. (Lech Lorens)
diff --git a/src/quickfix.c b/src/quickfix.c
index 17d8583..0502392 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -126,6 +126,7 @@
static win_T *qf_find_win __ARGS((qf_info_T *qi));
static buf_T *qf_find_buf __ARGS((qf_info_T *qi));
static void qf_update_buffer __ARGS((qf_info_T *qi));
+static void qf_set_title __ARGS((qf_info_T *qi));
static void qf_fill_buffer __ARGS((qf_info_T *qi));
#endif
static char_u *get_mef_name __ARGS((void));
@@ -2388,8 +2389,7 @@
qf_fill_buffer(qi);
if (qi->qf_lists[qi->qf_curlist].qf_title != NULL)
- set_internal_string_var((char_u *)"w:quickfix_title",
- qi->qf_lists[qi->qf_curlist].qf_title);
+ qf_set_title(qi);
curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index;
curwin->w_cursor.col = 0;
@@ -2526,6 +2526,8 @@
qf_info_T *qi;
{
buf_T *buf;
+ win_T *win;
+ win_T *curwin_save;
aco_save_T aco;
/* Check if a buffer for the quickfix list exists. Update it. */
@@ -2537,6 +2539,16 @@
qf_fill_buffer(qi);
+ if (qi->qf_lists[qi->qf_curlist].qf_title != NULL
+ && (win = qf_find_win(qi)) != NULL)
+ {
+ curwin_save = curwin;
+ curwin = win;
+ qf_set_title(qi);
+ curwin = curwin_save;
+
+ }
+
/* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco);
@@ -2544,6 +2556,14 @@
}
}
+ static void
+qf_set_title(qi)
+ qf_info_T *qi;
+{
+ set_internal_string_var((char_u *)"w:quickfix_title",
+ qi->qf_lists[qi->qf_curlist].qf_title);
+}
+
/*
* Fill current buffer with quickfix errors, replacing any previous contents.
* curbuf must be the quickfix buffer!
diff --git a/src/testdir/test10.in b/src/testdir/test10.in
index 0bd6455..50ef86e 100644
--- a/src/testdir/test10.in
+++ b/src/testdir/test10.in
Binary files differ
diff --git a/src/testdir/test10.ok b/src/testdir/test10.ok
index 2c86889..01d47e8 100644
--- a/src/testdir/test10.ok
+++ b/src/testdir/test10.ok
@@ -18,6 +18,6 @@
line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Eine 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+line 21 :cf Xerrorfile1xxxxxxxxxxxxxxx
+line 22 :cf Xerrorfile2xxxxxxxxxxxxxxx
end of testfile
diff --git a/src/version.c b/src/version.c
index 8ef4fac..1330376 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 280,
+/**/
279,
/**/
278,