aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/tag.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-03-31 20:58:36 +0200
committerGitHub <noreply@github.com>2019-03-31 20:58:36 +0200
commitf793c578bc409be65b755c35d347b8c60f777eed (patch)
treede788d46cd03138f759f31f26cdc4b7130226263 /src/nvim/tag.c
parent157034bd6ce48e7138171627713672ccdea730aa (diff)
parent13f4d4fb6e10ca59a93b1e7ebb56215891b80c2e (diff)
downloadrneovim-f793c578bc409be65b755c35d347b8c60f777eed.tar.gz
rneovim-f793c578bc409be65b755c35d347b8c60f777eed.tar.bz2
rneovim-f793c578bc409be65b755c35d347b8c60f777eed.zip
Merge #9822 from janlazo/vim-8.1.1073
vim-patch:8.1.{1073,1074,1082,1087}
Diffstat (limited to 'src/nvim/tag.c')
-rw-r--r--src/nvim/tag.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 410b9dfcbd..c609af4751 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -436,11 +436,15 @@ do_tag (
tagmatchname = vim_strsave(name);
}
- if (type == DT_TAG || type == DT_SELECT || type == DT_JUMP
+ if (type == DT_SELECT || type == DT_JUMP
|| type == DT_LTAG) {
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 == '/') {
@@ -495,7 +499,7 @@ do_tag (
if (type == DT_CSCOPE && num_matches > 1) {
cs_print_tags();
ask_for_selection = true;
- } else if (type == DT_TAG) {
+ } else if (type == DT_TAG && *tag != NUL) {
// If a count is supplied to the ":tag <name>" command, then
// jump to count'th matching tag.
cur_match = count > 0 ? count - 1 : 0;