updated for version 7.3.926

Problem:    Autocommands are triggered by setwinvar() et al. Missing BufEnter
            on :tabclose. Duplicate WinEnter on :tabclose. Wrong order of
            events for :tablose and :tabnew.
Solution:   Fix these autocommand events. (Zyx)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 3c6d68be5bcd9d8095ac2bc151cfabbf1b1afccc..60f01b46fd5549eea47d9c0af00a4570f71d9276 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -5320,8 +5320,6 @@ settabvar({tabnr}, {varname}, {val})                      *settabvar()*
                |t:var|
                Note that the variable name without "t:" must be used.
                Tabs are numbered starting with one.
-               Vim briefly goes to the tab page {tabnr}, this may trigger
-               TabLeave and TabEnter autocommands.
                This function is not available in the |sandbox|.
 
 settabwinvar({tabnr}, {winnr}, {varname}, {val})       *settabwinvar()*
@@ -5334,8 +5332,6 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})  *settabwinvar()*
                doesn't work for a global or local buffer variable.
                For a local buffer option the global value is unchanged.
                Note that the variable name without "w:" must be used.
-               Vim briefly goes to the tab page {tabnr}, this may trigger
-               TabLeave and TabEnter autocommands.
                Examples: >
                        :call settabwinvar(1, 1, "&list", 0)
                        :call settabwinvar(3, 2, "myvar", "foobar")

diff --git a/src/buffer.c b/src/buffer.c
index 54f65442542a13b743d7640b15e36ef43d48d4ba..ae744d28b280776c5ab1916b56636637688f7fc4 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4551,7 +4551,7 @@ do_arg_all(count, forceit, keep_tabs)
      * When the ":tab" modifier was used do this for all tab pages.
      */
     if (had_tab > 0)
-       goto_tabpage_tp(first_tabpage, TRUE);
+       goto_tabpage_tp(first_tabpage, TRUE, TRUE);
     for (;;)
     {
        tpnext = curtab->tp_next;
@@ -4663,7 +4663,7 @@ do_arg_all(count, forceit, keep_tabs)
        if (!valid_tabpage(tpnext))
            tpnext = first_tabpage;     /* start all over...*/
 # endif
-       goto_tabpage_tp(tpnext, TRUE);
+       goto_tabpage_tp(tpnext, TRUE, TRUE);
     }
 
     /*
@@ -4767,13 +4767,13 @@ do_arg_all(count, forceit, keep_tabs)
     if (last_curtab != new_curtab)
     {
        if (valid_tabpage(last_curtab))
-           goto_tabpage_tp(last_curtab, TRUE);
+           goto_tabpage_tp(last_curtab, TRUE, TRUE);
        if (win_valid(last_curwin))
            win_enter(last_curwin, FALSE);
     }
     /* to window with first arg */
     if (valid_tabpage(new_curtab))
-       goto_tabpage_tp(new_curtab, TRUE);
+       goto_tabpage_tp(new_curtab, TRUE, TRUE);
     if (win_valid(new_curwin))
        win_enter(new_curwin, FALSE);
 
@@ -4825,7 +4825,7 @@ ex_buffer_all(eap)
      */
 #ifdef FEAT_WINDOWS
     if (had_tab > 0)
-       goto_tabpage_tp(first_tabpage, TRUE);
+       goto_tabpage_tp(first_tabpage, TRUE, TRUE);
     for (;;)
     {
 #endif
@@ -4865,7 +4865,7 @@ ex_buffer_all(eap)
        /* Without the ":tab" modifier only do the current tab page. */
        if (had_tab == 0 || tpnext == NULL)
            break;
-       goto_tabpage_tp(tpnext, TRUE);
+       goto_tabpage_tp(tpnext, TRUE, TRUE);
     }
 #endif
 

diff --git a/src/eval.c b/src/eval.c
index 04ed2c5bcef865924d0a631f1be87e2d16ec3c3b..ed2a9d3e2f6852d44f23a9b6f691569ff0b88c93 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -16604,7 +16604,7 @@ f_settabvar(argvars, rettv)
     if (tp != NULL && varname != NULL && varp != NULL)
     {
        save_curtab = curtab;
-       goto_tabpage_tp(tp, TRUE);
+       goto_tabpage_tp(tp, FALSE, FALSE);
 
        tabvarname = alloc((unsigned)STRLEN(varname) + 3);
        if (tabvarname != NULL)
@@ -16617,7 +16617,7 @@ f_settabvar(argvars, rettv)
 
        /* Restore current tabpage */
        if (valid_tabpage(save_curtab))
-           goto_tabpage_tp(save_curtab, TRUE);
+           goto_tabpage_tp(save_curtab, FALSE, FALSE);
     }
 }
 
@@ -16654,7 +16654,7 @@ switch_win(save_curwin, save_curtab, win, tp)
     /* set curwin to be our win, temporarily */
     *save_curwin = curwin;
     *save_curtab = curtab;
-    goto_tabpage_tp(tp, TRUE);
+    goto_tabpage_tp(tp, FALSE, FALSE);
     if (!win_valid(win))
        return FAIL;
     curwin = win;
@@ -16672,7 +16672,7 @@ restore_win(save_curwin, save_curtab)
     /* Restore current tabpage and window, if still valid (autocommands can
      * make them invalid). */
     if (valid_tabpage(save_curtab))
-       goto_tabpage_tp(save_curtab, TRUE);
+       goto_tabpage_tp(save_curtab, FALSE, FALSE);
     if (win_valid(save_curwin))
     {
        curwin = save_curwin;

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index c2f768a1d5ca35772424e26b3e1ec6af7452b69e..9afcc283adf49f73d816ddb9119e6413447ef6b3 100644 (file)
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2482,7 +2482,7 @@ ex_listdo(eap)
                /* go to window "tp" */
                if (!valid_tabpage(tp))
                    break;
-               goto_tabpage_tp(tp, TRUE);
+               goto_tabpage_tp(tp, TRUE, TRUE);
                tp = tp->tp_next;
            }
 #endif

diff --git a/src/fileio.c b/src/fileio.c
index 1ce20405171ff3caae4c9c39f16d5e4692f34e2f..b93ae1b41c71cfd00485a25abcbff59735efc267 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -8934,7 +8934,7 @@ aucmd_restbuf(aco)
                if (wp == aucmd_win)
                {
                    if (tp != curtab)
-                       goto_tabpage_tp(tp, TRUE);
+                       goto_tabpage_tp(tp, TRUE, TRUE);
                    win_goto(aucmd_win);
                    goto win_found;
                }

diff --git a/src/proto/window.pro b/src/proto/window.pro
index 92229692f52f8f6909541137922592f8ebe2348b..0a7448927a9371ecb97b088461f96c0ef9231fdf 100644 (file)
--- a/src/proto/window.pro
+++ b/src/proto/window.pro
@@ -27,7 +27,7 @@ int valid_tabpage __ARGS((tabpage_T *tpc));
 tabpage_T *find_tabpage __ARGS((int n));
 int tabpage_index __ARGS((tabpage_T *ftp));
 void goto_tabpage __ARGS((int n));
-void goto_tabpage_tp __ARGS((tabpage_T *tp, int trigger_autocmds));
+void goto_tabpage_tp __ARGS((tabpage_T *tp, int trigger_enter_autocmds, int trigger_leave_autocmds));
 void goto_tabpage_win __ARGS((tabpage_T *tp, win_T *wp));
 void tabpage_move __ARGS((int nr));
 void win_goto __ARGS((win_T *wp));

diff --git a/src/testdir/test62.in b/src/testdir/test62.in
index fd1844bdc3a5bfd4059f54659b4ae1b62a666e08..933bfe5059caf48fa39e6d905ad668195e4aa89a 100644 (file)
--- a/src/testdir/test62.in
+++ b/src/testdir/test62.in
@@ -120,6 +120,68 @@ i\12=tabpagenr()\r\r\e
 :endtry
 i\12=a\r\e
 :"
+:" Test autocommands
+:tabonly!
+:let g:r=[]
+:command -nargs=1 -bar C :call add(g:r, '=== ' . <q-args> . ' ===')|<args>
+:function Test()
+    let hasau=has('autocmd')
+    if hasau
+        autocmd TabEnter * :call add(g:r, 'TabEnter')
+        autocmd WinEnter * :call add(g:r, 'WinEnter')
+        autocmd BufEnter * :call add(g:r, 'BufEnter')
+        autocmd TabLeave * :call add(g:r, 'TabLeave')
+        autocmd WinLeave * :call add(g:r, 'WinLeave')
+        autocmd BufLeave * :call add(g:r, 'BufLeave')
+    endif
+    let t:a='a'
+    C tab split
+    if !hasau
+        let g:r+=['WinLeave', 'TabLeave', 'WinEnter', 'TabEnter']
+    endif
+    let t:a='b'
+    C tabnew
+    if !hasau
+        let g:r+=['WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufLeave', 'BufEnter']
+    endif
+    let t:a='c'
+    call add(g:r, join(map(range(1, tabpagenr('$')), 'gettabvar(v:val, "a")')))
+    C call map(range(1, tabpagenr('$')), 'settabvar(v:val, "a", v:val*2)')
+    call add(g:r, join(map(range(1, tabpagenr('$')), 'gettabvar(v:val, "a")')))
+    let w:a='a'
+    C vsplit
+    if !hasau
+        let g:r+=['WinLeave', 'WinEnter']
+    endif
+    let w:a='a'
+    let tabn=tabpagenr()
+    let winr=range(1, winnr('$'))
+    C tabnext 1
+    if !hasau
+        let g:r+=['BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufEnter']
+    endif
+    call add(g:r, join(map(copy(winr), 'gettabwinvar('.tabn.', v:val, "a")')))
+    C call map(copy(winr), 'settabwinvar('.tabn.', v:val, "a", v:val*2)')
+    call add(g:r, join(map(copy(winr), 'gettabwinvar('.tabn.', v:val, "a")')))
+    if hasau
+        augroup TabDestructive
+            autocmd TabEnter * :C tabnext 2 | C tabclose 3
+        augroup END
+        C tabnext 3
+        let g:r+=[tabpagenr().'/'.tabpagenr('$')]
+        autocmd! TabDestructive TabEnter
+        C tabnew
+        C tabnext 1
+        autocmd TabDestructive TabEnter * nested :C tabnext 2 | C tabclose 3
+        C tabnext 3
+        let g:r+=[tabpagenr().'/'.tabpagenr('$')]
+    else
+        let g:r+=["=== tabnext 3 ===","BufLeave","WinLeave","TabLeave","WinEnter","TabEnter","=== tabnext 2 ===","=== tabclose 3 ===","2/2","=== tabnew ===","WinLeave","TabLeave","WinEnter","TabEnter","BufLeave","BufEnter","=== tabnext 1 ===","BufLeave","WinLeave","TabLeave","WinEnter","TabEnter","BufEnter","=== tabnext 3 ===","BufLeave","WinLeave","TabLeave","WinEnter","TabEnter","=== tabnext 2 ===","BufLeave","WinLeave","TabLeave","WinEnter","TabEnter","=== tabnext 2 ===","=== tabclose 3 ===","BufEnter","=== tabclose 3 ===","2/2",]
+    endif
+endfunction
+:call Test()
+:$ put =g:r
+:"
 :"
 :/^Results/,$w! test.out
 :qa!

diff --git a/src/testdir/test62.ok b/src/testdir/test62.ok
index 0ac1fcbbd4c90099b15b41345e578846a7bbd48e..df1035eccbe89129bb931fd9a83d8701d03af8d1 100644 (file)
--- a/src/testdir/test62.ok
+++ b/src/testdir/test62.ok
@@ -18,3 +18,71 @@ tab drop 3: pass
 4
 6
 E474 caught.
+=== tab split ===
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+=== tabnew ===
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+BufLeave
+BufEnter
+a b c
+=== call map(range(1, tabpagenr('$')), 'settabvar(v:val, ===
+a b c
+=== vsplit ===
+WinLeave
+WinEnter
+=== tabnext 1 ===
+BufLeave
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+BufEnter
+a a
+=== call map(copy(winr), 'settabwinvar('.tabn.', v:val, ===
+a a
+=== tabnext 3 ===
+BufLeave
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+=== tabnext 2 ===
+=== tabclose 3 ===
+2/2
+=== tabnew ===
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+BufLeave
+BufEnter
+=== tabnext 1 ===
+BufLeave
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+BufEnter
+=== tabnext 3 ===
+BufLeave
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+=== tabnext 2 ===
+BufLeave
+WinLeave
+TabLeave
+WinEnter
+TabEnter
+=== tabnext 2 ===
+=== tabclose 3 ===
+BufEnter
+=== tabclose 3 ===
+2/2

diff --git a/src/version.c b/src/version.c
index fea150e53ffa717a7cdc75202c0f68b5696c21c2..02d93d924a587b61b7593f200d69e76582a8fae5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    926,
 /**/
     925,
 /**/

diff --git a/src/window.c b/src/window.c
index 7fd434e69d6e54db03cbce6495b9317a547d8088..4616c803d4491b14f0273fa680e384ef7dc44524 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -44,11 +44,11 @@ static int win_alloc_firstwin __ARGS((win_T *oldwin));
 static void new_frame __ARGS((win_T *wp));
 #if defined(FEAT_WINDOWS) || defined(PROTO)
 static tabpage_T *alloc_tabpage __ARGS((void));
-static int leave_tabpage __ARGS((buf_T *new_curbuf));
-static void enter_tabpage __ARGS((tabpage_T *tp, buf_T *old_curbuf, int trigger_autocmds));
+static int leave_tabpage __ARGS((buf_T *new_curbuf, int trigger_leave_autocmds));
+static void enter_tabpage __ARGS((tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_autocmds, int trigger_leave_autocmds));
 static void frame_fix_height __ARGS((win_T *wp));
 static int frame_minheight __ARGS((frame_T *topfrp, win_T *next_curwin));
-static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
+static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin, int trigger_enter_autocmds, int trigger_leave_autocmds));
 static void win_free __ARGS((win_T *wp, tabpage_T *tp));
 static void frame_append __ARGS((frame_T *after, frame_T *frp));
 static void frame_insert __ARGS((frame_T *before, frame_T *frp));
@@ -353,11 +353,11 @@ newwindow:
                                                     && valid_tabpage(oldtab))
                    {
                        newtab = curtab;
-                       goto_tabpage_tp(oldtab, TRUE);
+                       goto_tabpage_tp(oldtab, TRUE, TRUE);
                        if (curwin == wp)
                            win_close(curwin, FALSE);
                        if (valid_tabpage(newtab))
-                           goto_tabpage_tp(newtab, TRUE);
+                           goto_tabpage_tp(newtab, TRUE, TRUE);
                    }
                }
                break;
@@ -2124,6 +2124,8 @@ close_last_window_tabpage(win, free_buf, prev_curtab)
 {
     if (firstwin == lastwin)
     {
+       buf_T   *old_curbuf = curbuf;
+
        /*
         * Closing the last window in a tab page.  First go to another tab
         * page and then close the window and the tab page.  This avoids that
@@ -2132,7 +2134,7 @@ close_last_window_tabpage(win, free_buf, prev_curtab)
         * Don't trigger autocommands yet, they may use wrong values, so do
         * that below.
         */
-       goto_tabpage_tp(alt_tabpage(), FALSE);
+       goto_tabpage_tp(alt_tabpage(), FALSE, TRUE);
        redraw_tabline = TRUE;
 
        /* Safety check: Autocommands may have closed the window when jumping
@@ -2148,8 +2150,10 @@ close_last_window_tabpage(win, free_buf, prev_curtab)
        /* Since goto_tabpage_tp above did not trigger *Enter autocommands, do
         * that now. */
 #ifdef FEAT_AUTOCMD
-       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
        apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
+       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
+       if (old_curbuf != curbuf)
+           apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
 #endif
        return TRUE;
     }
@@ -2341,7 +2345,7 @@ win_close(win, free_buf)
        win_comp_pos();
     if (close_curwin)
     {
-       win_enter_ext(wp, FALSE, TRUE);
+       win_enter_ext(wp, FALSE, TRUE, TRUE, TRUE);
 #ifdef FEAT_AUTOCMD
        if (other_buffer)
            /* careful: after this wp and win may be invalid! */
@@ -3529,7 +3533,7 @@ win_new_tabpage(after)
        return FAIL;
 
     /* Remember the current windows in this Tab page. */
-    if (leave_tabpage(curbuf) == FAIL)
+    if (leave_tabpage(curbuf, TRUE) == FAIL)
     {
        vim_free(newtp);
        return FAIL;
@@ -3574,14 +3578,14 @@ win_new_tabpage(after)
 
        redraw_all_later(CLEAR);
 #ifdef FEAT_AUTOCMD
-       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
        apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
+       apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
 #endif
        return OK;
     }
 
     /* Failed, get back the previous Tab page */
-    enter_tabpage(curtab, curbuf, TRUE);
+    enter_tabpage(curtab, curbuf, TRUE, TRUE);
     return FAIL;
 }
 
@@ -3692,9 +3696,10 @@ tabpage_index(ftp)
  * Careful: When OK is returned need to get a new tab page very very soon!
  */
     static int
-leave_tabpage(new_curbuf)
+leave_tabpage(new_curbuf, trigger_leave_autocmds)
     buf_T      *new_curbuf UNUSED;    /* what is going to be the new curbuf,
                                       NULL if unknown */
+    int                trigger_leave_autocmds UNUSED;
 {
     tabpage_T  *tp = curtab;
 
@@ -3702,18 +3707,21 @@ leave_tabpage(new_curbuf)
     reset_VIsual_and_resel();  /* stop Visual mode */
 #endif
 #ifdef FEAT_AUTOCMD
-    if (new_curbuf != curbuf)
+    if (trigger_leave_autocmds)
     {
-       apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
+       if (new_curbuf != curbuf)
+       {
+           apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
+           if (curtab != tp)
+               return FAIL;
+       }
+       apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf);
+       if (curtab != tp)
+           return FAIL;
+       apply_autocmds(EVENT_TABLEAVE, NULL, NULL, FALSE, curbuf);
        if (curtab != tp)
            return FAIL;
     }
-    apply_autocmds(EVENT_WINLEAVE, NULL, NULL, FALSE, curbuf);
-    if (curtab != tp)
-       return FAIL;
-    apply_autocmds(EVENT_TABLEAVE, NULL, NULL, FALSE, curbuf);
-    if (curtab != tp)
-       return FAIL;
 #endif
 #if defined(FEAT_GUI)
     /* Remove the scrollbars.  They may be added back later. */
@@ -3734,13 +3742,15 @@ leave_tabpage(new_curbuf)
 /*
  * Start using tab page "tp".
  * Only to be used after leave_tabpage() or freeing the current tab page.
- * Only trigger *Enter autocommands when trigger_autocmds is TRUE.
+ * Only trigger *Enter autocommands when trigger_enter_autocmds is TRUE.
+ * Only trigger *Leave autocommands when trigger_leave_autocmds is TRUE.
  */
     static void
-enter_tabpage(tp, old_curbuf, trigger_autocmds)
+enter_tabpage(tp, old_curbuf, trigger_enter_autocmds, trigger_leave_autocmds)
     tabpage_T  *tp;
     buf_T      *old_curbuf UNUSED;
-    int                trigger_autocmds UNUSED;
+    int                trigger_enter_autocmds UNUSED;
+    int                trigger_leave_autocmds UNUSED;
 {
     int                old_off = tp->tp_firstwin->w_winrow;
     win_T      *next_prevwin = tp->tp_prevwin;
@@ -3753,7 +3763,7 @@ enter_tabpage(tp, old_curbuf, trigger_autocmds)
     /* We would like doing the TabEnter event first, but we don't have a
      * valid current window yet, which may break some commands.
      * This triggers autocommands, thus may make "tp" invalid. */
-    win_enter_ext(tp->tp_curwin, FALSE, TRUE);
+    win_enter_ext(tp->tp_curwin, FALSE, TRUE, trigger_enter_autocmds, trigger_leave_autocmds);
     prevwin = next_prevwin;
 
     last_status(FALSE);                /* status line may appear or disappear */
@@ -3788,7 +3798,7 @@ enter_tabpage(tp, old_curbuf, trigger_autocmds)
 #ifdef FEAT_AUTOCMD
     /* Apply autocommands after updating the display, when 'rows' and
      * 'columns' have been set correctly. */
-    if (trigger_autocmds)
+    if (trigger_enter_autocmds)
     {
        apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
        if (old_curbuf != curbuf)
@@ -3869,7 +3879,7 @@ goto_tabpage(n)
        }
     }
 
-    goto_tabpage_tp(tp, TRUE);
+    goto_tabpage_tp(tp, TRUE, TRUE);
 
 #ifdef FEAT_GUI_TABLINE
     if (gui_use_tabline())
@@ -3879,23 +3889,28 @@ goto_tabpage(n)
 
 /*
  * Go to tabpage "tp".
- * Only trigger *Enter autocommands when trigger_autocmds is TRUE.
+ * Only trigger *Enter autocommands when trigger_enter_autocmds is TRUE.
+ * Only trigger *Leave autocommands when trigger_leave_autocmds is TRUE.
  * Note: doesn't update the GUI tab.
  */
     void
-goto_tabpage_tp(tp, trigger_autocmds)
+goto_tabpage_tp(tp, trigger_enter_autocmds, trigger_leave_autocmds)
     tabpage_T  *tp;
-    int                trigger_autocmds;
+    int                trigger_enter_autocmds;
+    int                trigger_leave_autocmds;
 {
     /* Don't repeat a message in another tab page. */
     set_keep_msg(NULL, 0);
 
-    if (tp != curtab && leave_tabpage(tp->tp_curwin->w_buffer) == OK)
+    if (tp != curtab && leave_tabpage(tp->tp_curwin->w_buffer,
+                                       trigger_leave_autocmds) == OK)
     {
        if (valid_tabpage(tp))
-           enter_tabpage(tp, curbuf, trigger_autocmds);
+           enter_tabpage(tp, curbuf, trigger_enter_autocmds,
+                   trigger_leave_autocmds);
        else
-           enter_tabpage(curtab, curbuf, trigger_autocmds);
+           enter_tabpage(curtab, curbuf, trigger_enter_autocmds,
+                   trigger_leave_autocmds);
     }
 }
 
@@ -3908,7 +3923,7 @@ goto_tabpage_win(tp, wp)
     tabpage_T  *tp;
     win_T      *wp;
 {
-    goto_tabpage_tp(tp, TRUE);
+    goto_tabpage_tp(tp, TRUE, TRUE);
     if (curtab == tp && win_valid(wp))
     {
        win_enter(wp, TRUE);
@@ -4168,7 +4183,7 @@ win_enter(wp, undo_sync)
     win_T      *wp;
     int                undo_sync;
 {
-    win_enter_ext(wp, undo_sync, FALSE);
+    win_enter_ext(wp, undo_sync, FALSE, TRUE, TRUE);
 }
 
 /*
@@ -4177,10 +4192,12 @@ win_enter(wp, undo_sync)
  * been closed and isn't valid.
  */
     static void
-win_enter_ext(wp, undo_sync, curwin_invalid)
+win_enter_ext(wp, undo_sync, curwin_invalid, trigger_enter_autocmds, trigger_leave_autocmds)
     win_T      *wp;
     int                undo_sync;
     int                curwin_invalid;
+    int                trigger_enter_autocmds UNUSED;
+    int                trigger_leave_autocmds UNUSED;
 {
 #ifdef FEAT_AUTOCMD
     int                other_buffer = FALSE;
@@ -4190,7 +4207,7 @@ win_enter_ext(wp, undo_sync, curwin_invalid)
        return;
 
 #ifdef FEAT_AUTOCMD
-    if (!curwin_invalid)
+    if (!curwin_invalid && trigger_leave_autocmds)
     {
        /*
         * Be careful: If autocommands delete the window, return now.
@@ -4259,9 +4276,12 @@ win_enter_ext(wp, undo_sync, curwin_invalid)
     }
 
 #ifdef FEAT_AUTOCMD
-    apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
-    if (other_buffer)
-       apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+    if (trigger_enter_autocmds)
+    {
+       apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
+       if (other_buffer)
+           apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+    }
 #endif
 
 #ifdef FEAT_TITLE