mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 16:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4007 from brcolow/vim-7.4.718

Browse Source 
vim-patch:7.4.718
This commit is contained in:
Justin M. Keyes
2016-01-23 14:37:31 -05:00
parent c8b487ae40 8048699f7d
commit d4430dc3eb
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/quickfix.c
View File

@@ -2117,14 +2117,10 @@ void ex_copen(exarg_T *eap)
prevwin = win; 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) { // Fill the buffer with the quickfix list.
qf_set_title_var(qi); qf_fill_buffer(qi);
}
curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index; curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index;
curwin->w_cursor.col = 0; curwin->w_cursor.col = 0;
@@ -2256,16 +2252,13 @@ static void qf_update_buffer(qf_info_T *qi)
/* set curwin/curbuf to buf and save a few things */ /* set curwin/curbuf to buf and save a few things */
aucmd_prepbuf(&aco, buf); aucmd_prepbuf(&aco, buf);
qf_fill_buffer(qi); if ((win = qf_find_win(qi)) != NULL) {
if (qi->qf_lists[qi->qf_curlist].qf_title != NULL
&& (win = qf_find_win(qi)) != NULL) {
curwin_save = curwin; curwin_save = curwin;
curwin = win; curwin = win;
qf_set_title_var(qi); qf_set_title_var(qi);
curwin = curwin_save; curwin = curwin_save;
} }
qf_fill_buffer(qi);
/* restore curwin/curbuf and a few other things */ /* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco); aucmd_restbuf(&aco);
@@ -2274,10 +2267,13 @@ static void qf_update_buffer(qf_info_T *qi)
} }
} }
// Set "w:quickfix_title" if "qi" has a title.
static void qf_set_title_var(qf_info_T *qi) static void qf_set_title_var(qf_info_T *qi)
{ {
set_internal_string_var((char_u *)"w:quickfix_title", if (qi->qf_lists[qi->qf_curlist].qf_title != NULL) {
qi->qf_lists[qi->qf_curlist].qf_title); set_internal_string_var((char_u *)"w:quickfix_title",
qi->qf_lists[qi->qf_curlist].qf_title);
}
} }
/* /*

2
src/nvim/version.c
View File

@@ -406,7 +406,7 @@ static int included_patches[] = {
721, 721,
// 720 NA // 720 NA
719, 719,
// 718, 718,
// 717, // 717,
716, 716,
715, 715,