mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 7.4.746
Problem: ":[count]tag" is not always working. (cs86661) Solution: Set cur_match a bit later. (Hirohito Higashi)
This commit is contained in:
19
src/tag.c
19
src/tag.c
@@ -508,14 +508,7 @@ do_tag(tag, type, count, forceit, verbose)
|
|||||||
tagmatchname = vim_strsave(name);
|
tagmatchname = vim_strsave(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
if (type == DT_TAG || type == DT_SELECT || type == DT_JUMP
|
||||||
* If a count is supplied to the ":tag <name>" command, then
|
|
||||||
* jump to count'th matching tag.
|
|
||||||
*/
|
|
||||||
if (type == DT_TAG && *tag != NUL && count > 0)
|
|
||||||
cur_match = count - 1;
|
|
||||||
|
|
||||||
if (type == DT_SELECT || type == DT_JUMP
|
|
||||||
#if defined(FEAT_QUICKFIX)
|
#if defined(FEAT_QUICKFIX)
|
||||||
|| type == DT_LTAG
|
|| type == DT_LTAG
|
||||||
#endif
|
#endif
|
||||||
@@ -594,7 +587,13 @@ do_tag(tag, type, count, forceit, verbose)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (type == DT_SELECT || (type == DT_JUMP && num_matches > 1))
|
if (type == DT_TAG)
|
||||||
|
/*
|
||||||
|
* If a count is supplied to the ":tag <name>" command, then
|
||||||
|
* jump to count'th matching tag.
|
||||||
|
*/
|
||||||
|
cur_match = count > 0 ? count - 1 : 0;
|
||||||
|
else if (type == DT_SELECT || (type == DT_JUMP && num_matches > 1))
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* List all the matching tags.
|
* List all the matching tags.
|
||||||
@@ -990,7 +989,7 @@ do_tag(tag, type, count, forceit, verbose)
|
|||||||
|
|
||||||
|
|
||||||
ic = (matches[cur_match][0] & MT_IC_OFF);
|
ic = (matches[cur_match][0] & MT_IC_OFF);
|
||||||
if (type != DT_SELECT && type != DT_JUMP
|
if (type != DT_TAG && type != DT_SELECT && type != DT_JUMP
|
||||||
#ifdef FEAT_CSCOPE
|
#ifdef FEAT_CSCOPE
|
||||||
&& type != DT_CSCOPE
|
&& type != DT_CSCOPE
|
||||||
#endif
|
#endif
|
||||||
|
@@ -741,6 +741,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 */
|
||||||
|
/**/
|
||||||
|
746,
|
||||||
/**/
|
/**/
|
||||||
745,
|
745,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user