From 7559dcef6cfd0ba13271088fff51b8979fee950b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 30 Mar 2019 19:12:02 +0100 Subject: patch 8.1.1087: tag stack is incorrect after CTRL-T and then :tag Problem: tag stack is incorrect after CTRL-T and then :tag Solution: Handle DT_TAG differently. (test by Andy Massimino, closes #3944, closes #4177) --- src/tag.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/tag.c') diff --git a/src/tag.c b/src/tag.c index 950ab8d95a..c5cec8bc09 100644 --- a/src/tag.c +++ b/src/tag.c @@ -504,13 +504,16 @@ do_tag( tagmatchname = vim_strsave(name); } - if (type == DT_TAG || type == DT_SELECT || type == DT_JUMP + if (type == DT_SELECT || type == DT_JUMP #if defined(FEAT_QUICKFIX) || type == DT_LTAG #endif ) cur_match = MAXCOL - 1; - max_num_matches = cur_match + 1; + if (type == DT_TAG) + max_num_matches = MAXCOL; + else + max_num_matches = cur_match + 1; /* when the argument starts with '/', use it as a regexp */ if (!no_regexp && *name == '/') @@ -583,7 +586,7 @@ do_tag( } else #endif - if (type == DT_TAG) + if (type == DT_TAG && *tag != NUL) /* * If a count is supplied to the ":tag " command, then * jump to count'th matching tag. -- cgit v1.2.3