thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0-153

Browse Source
This commit is contained in:
Bram Moolenaar
2006-10-30 21:32:28 +00:00
parent 8b610cfc7c
commit 0cae847008
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/if_cscope.c
View File

@@ -1100,38 +1100,44 @@ cs_find_common(opt, pat, forceit, verbose, use_ll)
if (qfpos != NULL && *qfpos != '0' && totmatches > 0) if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
{ {
/* fill error list */ /* fill error list */
FILE *f; FILE *f;
char_u *tmp = vim_tempname('c'); char_u *tmp = vim_tempname('c');
qf_info_T *qi = NULL; qf_info_T *qi = NULL;
win_T *wp = NULL; win_T *wp = NULL;
f = mch_fopen((char *)tmp, "w"); f = mch_fopen((char *)tmp, "w");
cs_file_results(f, nummatches); if (f == NULL)
fclose(f); EMSG2(_(e_notopen), tmp);
if (use_ll) /* Use location list */ else
wp = curwin;
/* '-' starts a new error list */
if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", *qfpos == '-') > 0)
{ {
# ifdef FEAT_WINDOWS cs_file_results(f, nummatches);
if (postponed_split != 0) fclose(f);
if (use_ll) /* Use location list */
wp = curwin;
/* '-' starts a new error list */
if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m",
*qfpos == '-') > 0)
{ {
win_split(postponed_split > 0 ? postponed_split : 0, # ifdef FEAT_WINDOWS
if (postponed_split != 0)
{
win_split(postponed_split > 0 ? postponed_split : 0,
postponed_split_flags); postponed_split_flags);
# ifdef FEAT_SCROLLBIND # ifdef FEAT_SCROLLBIND
curwin->w_p_scb = FALSE; curwin->w_p_scb = FALSE;
# endif # endif
postponed_split = 0; postponed_split = 0;
} }
# endif # endif
if (use_ll) if (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);
@@ -1723,7 +1729,7 @@ cs_file_results(f, nummatches_a)
continue; continue;
context = (char *)alloc((unsigned)strlen(cntx)+5); context = (char *)alloc((unsigned)strlen(cntx)+5);
if (context==NULL) if (context == NULL)
continue; continue;
if (strcmp(cntx, "<global>")==0) if (strcmp(cntx, "<global>")==0)
@@ -1731,7 +1737,7 @@ cs_file_results(f, nummatches_a)
else else
sprintf(context, "<<%s>>", cntx); sprintf(context, "<<%s>>", cntx);
if (search==NULL) if (search == NULL)
fprintf(f, "%s\t%s\t%s\n", fullname, slno, context); fprintf(f, "%s\t%s\t%s\n", fullname, slno, context);
else else
fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search); fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search);

2
src/version.c
View File

@@ -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,
/**/ /**/