Merge pull request #4129 from jbradaric/vim-7.4.745

vim-patch:7.4.{745,746,747,748}

1 files changed, 20 insertions, 27 deletions

diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index d832924efd..8fcb02c3b6 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -445,17 +445,10 @@ do_tag (
         tagmatchname = vim_strsave(name);
       }
 
-      /*
-       * 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
-          || type == DT_LTAG
-          )
+      if (type == DT_TAG || type == DT_SELECT || type == DT_JUMP
+          || type == DT_LTAG) {
         cur_match = MAXCOL - 1;
+      }
       max_num_matches = cur_match + 1;
 
       /* when the argument starts with '/', use it as a regexp */
@@ -506,18 +499,19 @@ do_tag (
         EMSG2(_("E426: tag not found: %s"), name);
       g_do_tagpreview = 0;
     } else {
-      int ask_for_selection = FALSE;
+      bool ask_for_selection = false;
 
       if (type == DT_CSCOPE && num_matches > 1) {
         cs_print_tags();
-        ask_for_selection = TRUE;
-      } else if (type == DT_SELECT ||
-                 (type == DT_JUMP && num_matches > 1))        {
-        /*
-         * List all the matching tags.
-         * Assume that the first match indicates how long the tags can
-         * be, and align the file names to that.
-         */
+        ask_for_selection = true;
+      } else 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.
+        // Assume that the first match indicates how long the tags can
+        // be, and align the file names to that.
         parse_match(matches[0], &tagp);
         taglen = (int)(tagp.tagname_end - tagp.tagname + 2);
         if (taglen < 18)
@@ -666,9 +660,10 @@ do_tag (
             msg_putchar('\n');
           os_breakcheck();
         }
-        if (got_int)
-          got_int = FALSE;              /* only stop the listing */
-        ask_for_selection = TRUE;
+        if (got_int) {
+          got_int = false;  // only stop the listing
+        }
+        ask_for_selection = true;
       } else if (type == DT_LTAG)   {
         list_T  *list;
         char_u tag_name[128 + 1];
@@ -801,10 +796,8 @@ do_tag (
         cur_match = 0;                  /* Jump to the first tag */
       }
 
-      if (ask_for_selection == TRUE) {
-        /*
-         * Ask to select a tag from the list.
-         */
+      if (ask_for_selection) {
+        // Ask to select a tag from the list.
         i = prompt_for_number(NULL);
         if (i <= 0 || i > num_matches || got_int) {
           /* no valid choice: don't change anything */
@@ -851,7 +844,7 @@ do_tag (
 
 
       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
           && type != DT_CSCOPE
           && (num_matches > 1 || ic)
           && !skip_msg) {