Merge pull request #4129 from jbradaric/vim-7.4.745

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

src/nvim/eval.c

@@ -15209,6 +15209,7 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
   list_T      *l;
   listitem_T  *li;
   dict_T      *d;
+  list_T      *s = NULL;
 
   rettv->vval.v_number = -1;
   if (argvars[0].v_type != VAR_LIST) {
@@ -15227,7 +15228,8 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
         return;
       }
       if (!(dict_find(d, (char_u *)"group", -1) != NULL
-            && dict_find(d, (char_u *)"pattern", -1) != NULL
+            && (dict_find(d, (char_u *)"pattern", -1) != NULL
+                || dict_find(d, (char_u *)"pos1", -1) != NULL)
             && dict_find(d, (char_u *)"priority", -1) != NULL
             && dict_find(d, (char_u *)"id", -1) != NULL)) {
         EMSG(_(e_invarg));
@@ -15239,11 +15241,47 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
     clear_matches(curwin);
     li = l->lv_first;
     while (li != NULL) {
+      int i = 0;
+      char_u buf[5];
+      dictitem_T *di;
       d = li->li_tv.vval.v_dict;
-      match_add(curwin, get_dict_string(d, (char_u *)"group", FALSE),
-          get_dict_string(d, (char_u *)"pattern", FALSE),
+
+      if (dict_find(d, (char_u *)"pattern", -1) == NULL) {
+        if (s == NULL) {
+          s = list_alloc();
+          if (s == NULL) {
+            return;
+          }
+        }
+
+        // match from matchaddpos()
+        for (i = 1; i < 9; ++i) {
+          snprintf((char *)buf, sizeof(buf), (char *)"pos%d", i);
+          if ((di = dict_find(d, (char_u *)buf, -1)) != NULL) {
+            if (di->di_tv.v_type != VAR_LIST) {
+              return;
+            }
+
+            list_append_tv(s, &di->di_tv);
+            s->lv_refcount++;
+          } else {
+            break;
+          }
+        }
+      }
+
+      if (i == 0) {
+        match_add(curwin, get_dict_string(d, (char_u *)"group", false),
+                  get_dict_string(d, (char_u *)"pattern", false),
                   (int)get_dict_number(d, (char_u *)"priority"),
                   (int)get_dict_number(d, (char_u *)"id"), NULL);
+      } else {
+        match_add(curwin, get_dict_string(d, (char_u *)"group", false),
+                  NULL, (int)get_dict_number(d, (char_u *)"priority"),
+                  (int)get_dict_number(d, (char_u *)"id"), s);
+        list_unref(s);
+        s = NULL;
+      }
       li = li->li_next;
     }
     rettv->vval.v_number = 0;

src/nvim/quickfix.c

@@ -1606,13 +1606,12 @@ win_found:
       }
       if (qf_ptr->qf_col > 0) {
         curwin->w_cursor.col = qf_ptr->qf_col - 1;
-        if (qf_ptr->qf_viscol == TRUE) {
-          /*
-           * Check each character from the beginning of the error
-           * line up to the error column.  For each tab character
-           * found, reduce the error column value by the length of
-           * a tab character.
-           */
+        curwin->w_cursor.coladd = 0;
+        if (qf_ptr->qf_viscol == true) {
+          // Check each character from the beginning of the error
+          // line up to the error column.  For each tab character
+          // found, reduce the error column value by the length of
+          // a tab character.
           line = get_cursor_line_ptr();
           screen_col = 0;
           for (char_col = 0; char_col < curwin->w_cursor.col; ++char_col) {

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) {

src/nvim/version.c

@@ -414,10 +414,10 @@ static int included_patches[] = {
   // 751 NA
   // 750 NA
   // 749,
-  // 748,
-  // 747,
-  // 746,
-  // 745,
+  748,
+  747,
+  746,
+  745,
   // 744 NA
   // 743,
   // 742,

test/functional/legacy/063_match_and_matchadd_spec.lua

@@ -89,7 +89,11 @@ describe('063: Test for ":match", "matchadd()" and related functions', function(
     execute("call clearmatches()")
     execute("call setmatches(ml)")
     eq(ml, eval('getmatches()'))
+
+    -- Check that "setmatches()" can correctly restore the matches from matchaddpos()
     execute("call clearmatches()")
+    execute("call setmatches(ml)")
+    eq(ml, eval('getmatches()'))
 
     -- Check that "setmatches()" will not add two matches with the same ID. The
     -- expected behaviour (for now) is to add the first match but not the