forked from aniani/vim
updated for version 7.0-153
This commit is contained in:
@@ -1106,12 +1106,17 @@ cs_find_common(opt, pat, forceit, verbose, use_ll)
|
|||||||
win_T *wp = NULL;
|
win_T *wp = NULL;
|
||||||
|
|
||||||
f = mch_fopen((char *)tmp, "w");
|
f = mch_fopen((char *)tmp, "w");
|
||||||
|
if (f == NULL)
|
||||||
|
EMSG2(_(e_notopen), tmp);
|
||||||
|
else
|
||||||
|
{
|
||||||
cs_file_results(f, nummatches);
|
cs_file_results(f, nummatches);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
if (use_ll) /* Use location list */
|
if (use_ll) /* Use location list */
|
||||||
wp = curwin;
|
wp = curwin;
|
||||||
/* '-' starts a new error list */
|
/* '-' starts a new error list */
|
||||||
if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", *qfpos == '-') > 0)
|
if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m",
|
||||||
|
*qfpos == '-') > 0)
|
||||||
{
|
{
|
||||||
# ifdef FEAT_WINDOWS
|
# ifdef FEAT_WINDOWS
|
||||||
if (postponed_split != 0)
|
if (postponed_split != 0)
|
||||||
@@ -1129,10 +1134,11 @@ cs_find_common(opt, pat, forceit, verbose, use_ll)
|
|||||||
* In the location list window, use the displayed location
|
* In the location list window, use the displayed location
|
||||||
* list. Otherwise, use the location list for the window.
|
* list. Otherwise, use the location list for the window.
|
||||||
*/
|
*/
|
||||||
qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) ?
|
qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
|
||||||
wp->w_llist_ref : wp->w_llist;
|
? wp->w_llist_ref : wp->w_llist;
|
||||||
qf_jump(qi, 0, 0, forceit);
|
qf_jump(qi, 0, 0, forceit);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
mch_remove(tmp);
|
mch_remove(tmp);
|
||||||
vim_free(tmp);
|
vim_free(tmp);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|||||||
@@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
153,
|
||||||
/**/
|
/**/
|
||||||
152,
|
152,
|
||||||
/**/
|
/**/
|
||||||
|
|||||||
Reference in New Issue
Block a user