patch 7.4.718

Problem:    Autocommands triggered by quickfix cannot get the current title
            value.
Solution:   Set w:quickfix_title earlier. (Yannick)
            Also move the check for a title into the function.

diff --git a/src/quickfix.c b/src/quickfix.c
index 186520a9fb08f6826e57424dbc6b2b59f8ea58a8..d4db0d253da8452f9a80d3e5ce5ae94911718e68 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -2452,14 +2452,13 @@ ex_copen(eap)
            prevwin = win;
     }
 
+    qf_set_title_var(qi);
+
     /*
      * Fill the buffer with the quickfix list.
      */
     qf_fill_buffer(qi);
 
-    if (qi->qf_lists[qi->qf_curlist].qf_title != NULL)
-       qf_set_title_var(qi);
-
     curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index;
     curwin->w_cursor.col = 0;
     check_cursor();
@@ -2608,8 +2607,7 @@ qf_update_buffer(qi)
 
        qf_fill_buffer(qi);
 
-       if (qi->qf_lists[qi->qf_curlist].qf_title != NULL
-           && (win = qf_find_win(qi)) != NULL)
+       if ((win = qf_find_win(qi)) != NULL)
        {
            curwin_save = curwin;
            curwin = win;
@@ -2625,11 +2623,15 @@ qf_update_buffer(qi)
     }
 }
 
+/*
+ * Set "w:quickfix_title" if "qi" has a title.
+ */
     static void
 qf_set_title_var(qi)
     qf_info_T  *qi;
 {
-    set_internal_string_var((char_u *)"w:quickfix_title",
+    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);
 }
 

diff --git a/src/version.c b/src/version.c
index ee6d301b06b448b9484f43d1ca2a967143b40ea4..ab9d100af95b6001f034da693e6e4d460b4677c9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    718,
 /**/
     717,
 /**/