Merge pull request #4260 from watiko/vim-7.4.887

vim-patch:7.4.887

src/nvim/regexp_nfa.c

@@ -4048,6 +4048,7 @@ skip_add:
         sub->list.multi[subidx].start_col =
           (colnr_T)(reginput - regline + off);
       }
+      sub->list.multi[subidx].end_lnum = -1;
     } else {
       if (subidx < sub->in_use) {
         save_ptr = sub->list.line[subidx].start;

src/nvim/version.c

@@ -401,7 +401,7 @@ static int included_patches[] = {
   // 890 NA
   // 889,
   // 888,
-  // 887,
+  887,
   // 886 NA
   // 885,
   // 884 NA