1 files changed, 38 insertions, 29 deletions

diff --git a/src/nvim/window.c b/src/nvim/window.c
index 39106a7b8d..bea55c465f 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -97,7 +97,7 @@ do_window (
      * don't replicate the quickfix buffer. */
     if (bt_quickfix(curbuf))
       goto newwindow;
-    win_split((int)Prenum, 0);
+    (void)win_split((int)Prenum, 0);
     break;
 
   /* split current window in two parts, vertically */
@@ -108,7 +108,7 @@ do_window (
      * don't replicate the quickfix buffer. */
     if (bt_quickfix(curbuf))
       goto newwindow;
-    win_split((int)Prenum, WSP_VERT);
+    (void)win_split((int)Prenum, WSP_VERT);
     break;
 
   /* split current window and edit alternate file */
@@ -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);
@@ -2948,18 +2948,19 @@ void free_tabpage(tabpage_T *tp)
   unref_var_dict(tp->tp_vars);
 
 
-
+  xfree(tp->localdir);  // Free tab-local working directory
   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();
 
@@ -3555,18 +3560,24 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int tri
     curwin->w_cursor.coladd = 0;
   changed_line_abv_curs();      /* assume cursor position needs updating */
 
-  if (curwin->w_localdir != NULL) {
-    /* Window has a local directory: Save current directory as global
-     * directory (unless that was done already) and change to the local
-     * directory. */
+  // The new directory is either the local directory of the window, of the tab
+  // or NULL.
+  char_u *new_dir = curwin->w_localdir ? curwin->w_localdir : curtab->localdir;
+
+  if (new_dir) {
+    // Window/tab has a local directory: Save current directory as global
+    // directory (unless that was done already) and change to the local
+    // directory.
     if (globaldir == NULL) {
       char_u cwd[MAXPATHL];
 
-      if (os_dirname(cwd, MAXPATHL) == OK)
+      if (os_dirname(cwd, MAXPATHL) == OK) {
         globaldir = vim_strsave(cwd);
+      }
+    }
+    if (os_chdir((char *)new_dir) == 0) {
+      shorten_fnames(true);
     }
-    if (os_chdir((char *)curwin->w_localdir) == 0)
-      shorten_fnames(TRUE);
   } else if (globaldir != NULL) {
     /* Window doesn't have a local directory and we are not in the global
      * directory: Change to the global directory. */
@@ -4619,10 +4630,8 @@ void win_drag_vsep_line(win_T *dragwin, int offset)
 
 #define FRACTION_MULT   16384L
 
-/*
- * Set wp->w_fraction for the current w_wrow and w_height.
- */
-static void set_fraction(win_T *wp)
+// Set wp->w_fraction for the current w_wrow and w_height.
+void set_fraction(win_T *wp)
 {
   wp->w_fraction = ((long)wp->w_wrow * FRACTION_MULT + wp->w_height / 2)
                    / (long)wp->w_height;