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

updated for version 7.0144

Browse Source
This commit is contained in:
Bram Moolenaar 2005-09-09 19:47:12 +00:00
parent 7ca3043e1e
commit a5373faa17
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto/message.pro
View File

@ -3,7 +3,7 @@ int msg __ARGS((char_u *s));
int verb_msg __ARGS((char_u *s)); int verb_msg __ARGS((char_u *s));
int msg_attr __ARGS((char_u *s, int attr)); int msg_attr __ARGS((char_u *s, int attr));
int msg_attr_keep __ARGS((char_u *s, int attr, int keep)); int msg_attr_keep __ARGS((char_u *s, int attr, int keep));
char_u *msg_strtrunc __ARGS((char_u *s)); char_u *msg_strtrunc __ARGS((char_u *s, int force));
void trunc_string __ARGS((char_u *s, char_u *buf, int room)); void trunc_string __ARGS((char_u *s, char_u *buf, int room));
void reset_last_sourcing __ARGS((void)); void reset_last_sourcing __ARGS((void));
void msg_source __ARGS((int attr)); void msg_source __ARGS((int attr));

5
src/quickfix.c
View File

@ -2491,7 +2491,7 @@ ex_vimgrep(eap)
/* Display the file name every second or so. */ /* Display the file name every second or so. */
seconds = time(NULL); seconds = time(NULL);
msg_start(); msg_start();
p = msg_strtrunc(fnames[fi]); p = msg_strtrunc(fnames[fi], TRUE);
if (p == NULL) if (p == NULL)
msg_outtrans(fnames[fi]); msg_outtrans(fnames[fi]);
else else
@ -2824,10 +2824,7 @@ get_errorlist(list)
int i; int i;
if (qf_curlist >= qf_listcount || qf_lists[qf_curlist].qf_count == 0) if (qf_curlist >= qf_listcount || qf_lists[qf_curlist].qf_count == 0)
{
EMSG(_(e_quickfix));
return FAIL; return FAIL;
}
qfp = qf_lists[qf_curlist].qf_start; qfp = qf_lists[qf_curlist].qf_start;
for (i = 1; !got_int && i <= qf_lists[qf_curlist].qf_count; ++i) for (i = 1; !got_int && i <= qf_lists[qf_curlist].qf_count; ++i)

43
src/tag.c
View File

@ -68,7 +68,6 @@ static char *mt_names[MT_COUNT/2] =
static char_u *nofile_fname = NULL; /* fname for NOTAGFILE error */ static char_u *nofile_fname = NULL; /* fname for NOTAGFILE error */
static void taglen_advance __ARGS((int l)); static void taglen_advance __ARGS((int l));
static int get_tagfname __ARGS((int first, char_u *buf));
static int jumpto_tag __ARGS((char_u *lbuf, int forceit, int keep_help)); static int jumpto_tag __ARGS((char_u *lbuf, int forceit, int keep_help));
#ifdef FEAT_EMACS_TAGS #ifdef FEAT_EMACS_TAGS
@ -2370,7 +2369,7 @@ free_tag_stuff()
* *
* Return FAIL if no more tag file names, OK otherwise. * Return FAIL if no more tag file names, OK otherwise.
*/ */
static int int
get_tagfname(first, buf) get_tagfname(first, buf)
int first; /* TRUE when first file name is wanted */ int first; /* TRUE when first file name is wanted */
char_u *buf; /* pointer to buffer of MAXPATHL chars */ char_u *buf; /* pointer to buffer of MAXPATHL chars */
@ -2381,14 +2380,15 @@ get_tagfname(first, buf)
char_u *fname = NULL; char_u *fname = NULL;
char_u *r_ptr; char_u *r_ptr;
if (first) if (curbuf->b_help)
{ {
if (curbuf->b_help) /*
* For help files it's done in a completely different way:
* Find "doc/tags" and "doc/tags-??" in all directories in
* 'runtimepath'.
*/
if (first)
{ {
/*
* For a help window find "doc/tags" and "doc/tags-??" in all
* directories in 'runtimepath'.
*/
ga_clear_strings(&tag_fnames); ga_clear_strings(&tag_fnames);
ga_init2(&tag_fnames, (int)sizeof(char_u *), 10); ga_init2(&tag_fnames, (int)sizeof(char_u *), 10);
do_in_runtimepath((char_u *) do_in_runtimepath((char_u *)
@ -2408,17 +2408,7 @@ get_tagfname(first, buf)
, TRUE, found_tagfile_cb, NULL); , TRUE, found_tagfile_cb, NULL);
hf_idx = 0; hf_idx = 0;
} }
else if (*curbuf->b_p_tags != NUL) else if (hf_idx >= tag_fnames.ga_len)
np = curbuf->b_p_tags;
else
np = p_tags;
vim_findfile_free_visited(search_ctx);
did_filefind_init = FALSE;
}
if (curbuf->b_help)
{
if (hf_idx >= tag_fnames.ga_len)
{ {
/* Not found in 'runtimepath', use 'helpfile', if it exists and /* Not found in 'runtimepath', use 'helpfile', if it exists and
* wasn't used yet, replacing "help.txt" with "tags". */ * wasn't used yet, replacing "help.txt" with "tags". */
@ -2431,12 +2421,23 @@ get_tagfname(first, buf)
else else
vim_strncpy(buf, ((char_u **)(tag_fnames.ga_data))[hf_idx++], vim_strncpy(buf, ((char_u **)(tag_fnames.ga_data))[hf_idx++],
MAXPATHL - 1); MAXPATHL - 1);
return OK;
}
if (first)
{
/* Init. */
if (*curbuf->b_p_tags != NUL)
np = curbuf->b_p_tags;
else
np = p_tags;
vim_findfile_free_visited(search_ctx);
did_filefind_init = FALSE;
} }
else else
{ {
/* tried already (or bogus call) */
if (np == NULL) if (np == NULL)
return FAIL; return FAIL; /* tried already (or bogus call) */
/* /*
* Loop until we have found a file name that can be used. * Loop until we have found a file name that can be used.