1 files changed, 44 insertions, 26 deletions

diff --git a/src/nvim/window.c b/src/nvim/window.c
index e84d8df36b..b79aa366e5 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -248,7 +248,7 @@ newwindow:
       /* First create a new tab with the window, then go back to
        * the old tab and close the window there. */
       wp = curwin;
-      if (win_new_tabpage((int)Prenum) == OK
+      if (win_new_tabpage((int)Prenum, NULL) == OK
           && valid_tabpage(oldtab)) {
         newtab = curtab;
         goto_tabpage_tp(oldtab, TRUE, TRUE);
@@ -2952,14 +2952,15 @@ void free_tabpage(tabpage_T *tp)
   xfree(tp);
 }
 
-/*
- * Create a new Tab page with one window.
- * It will edit the current buffer, like after ":split".
- * When "after" is 0 put it just after the current Tab page.
- * Otherwise put it just before tab page "after".
- * Return FAIL or OK.
- */
-int win_new_tabpage(int after)
+/// Create a new tabpage with one window.
+///
+/// It will edit the current buffer, like after :split.
+///
+/// @param after Put new tabpage after tabpage "after", or after the current
+///              tabpage in case of 0.
+/// @param filename Will be passed to apply_autocmds().
+/// @return Was the new tabpage created successfully? FAIL or OK.
+int win_new_tabpage(int after, char_u *filename)
 {
   tabpage_T   *tp = curtab;
   tabpage_T   *newtp;
@@ -2999,10 +3000,12 @@ int win_new_tabpage(int after)
     newtp->tp_topframe = topframe;
     last_status(FALSE);
 
-
     redraw_all_later(CLEAR);
-    apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
-    apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+
+    apply_autocmds(EVENT_TABNEW, filename, filename, false, curbuf);
+    apply_autocmds(EVENT_WINENTER, NULL, NULL, false, curbuf);
+    apply_autocmds(EVENT_TABENTER, NULL, NULL, false, curbuf);
+
     return OK;
   }
 
@@ -3023,7 +3026,7 @@ int may_open_tabpage(void)
   if (n != 0) {
     cmdmod.tab = 0;         /* reset it to avoid doing it twice */
     postponed_split_tab = 0;
-    return win_new_tabpage(n);
+    return win_new_tabpage(n, NULL);
   }
   return FAIL;
 }
@@ -3047,9 +3050,11 @@ int make_tabpages(int maxcount)
    */
   block_autocmds();
 
-  for (todo = count - 1; todo > 0; --todo)
-    if (win_new_tabpage(0) == FAIL)
+  for (todo = count - 1; todo > 0; --todo) {
+    if (win_new_tabpage(0, NULL) == FAIL) {
       break;
+    }
+  }
 
   unblock_autocmds();
 
@@ -4575,10 +4580,19 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
   }
   assert(fr);
 
-  if (room < offset)            /* Not enough room */
-    offset = room;              /* Move as far as we can */
-  if (offset <= 0)              /* No room at all, quit. */
+  // Not enough room
+  if (room < offset) {
+    offset = room;  // Move as far as we can
+  }
+
+  // No room at all, quit.
+  if (offset <= 0) {
     return;
+  }
+
+  if (fr == NULL) {
+    return;  // Safety check, should not happen.
+  }
 
   /* grow frame fr by offset lines */
   frame_new_width(fr, fr->fr_width + offset, left, FALSE);
@@ -5342,14 +5356,14 @@ void restore_buffer(buf_T *save_curbuf)
 }
 
 
-/*
- * Add match to the match list of window 'wp'.  The pattern 'pat' will be
- * highlighted with the group 'grp' with priority 'prio'.
- * Optionally, a desired ID 'id' can be specified (greater than or equal to 1).
- * If no particular ID is desired, -1 must be specified for 'id'.
- * Return ID of added match, -1 on failure.
- */
-int match_add(win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos_list)
+// Add match to the match list of window 'wp'.  The pattern 'pat' will be
+// highlighted with the group 'grp' with priority 'prio'.
+// Optionally, a desired ID 'id' can be specified (greater than or equal to 1).
+// If no particular ID is desired, -1 must be specified for 'id'.
+// Return ID of added match, -1 on failure.
+int match_add(win_T *wp, char_u *grp, char_u *pat,
+              int prio, int id, list_T *pos_list,
+              char_u *conceal_char)
 {
   matchitem_T *cur;
   matchitem_T *prev;
@@ -5405,6 +5419,10 @@ int match_add(win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos
   m->match.regprog = regprog;
   m->match.rmm_ic = FALSE;
   m->match.rmm_maxcol = 0;
+  m->conceal_char = 0;
+  if (conceal_char != NULL) {
+    m->conceal_char = (*mb_ptr2char)(conceal_char);
+  }
 
   // Set up position matches
   if (pos_list != NULL)