From a42df5934bdc1178ed2ee8cb9c8686975b578497 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 24 Dec 2018 00:22:39 +0100 Subject: patch 8.1.0630: "wincmd p" does not work after using an autocmd window Problem: "wincmd p" does not work after using an autocmd window. Solution: Store "prevwin" in aco_save_T. (Christian Brabandt, closes #3690) --- src/fileio.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/fileio.c') diff --git a/src/fileio.c b/src/fileio.c index bf46522b9..fd8fd243f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -9017,6 +9017,7 @@ aucmd_prepbuf( aco->save_curwin = curwin; aco->save_curbuf = curbuf; + aco->save_prevwin = prevwin; if (win != NULL) { /* There is a window for "buf" in the current tab page, make it the @@ -9127,6 +9128,8 @@ win_found: else /* Hmm, original window disappeared. Just use the first one. */ curwin = firstwin; + if (win_valid(aco->save_prevwin)) + prevwin = aco->save_prevwin; #ifdef FEAT_EVAL vars_clear(&aucmd_win->w_vars->dv_hashtab); /* free all w: variables */ hash_init(&aucmd_win->w_vars->dv_hashtab); /* re-use the hashtab */ @@ -9177,6 +9180,8 @@ win_found: curwin = aco->save_curwin; curbuf = curwin->w_buffer; + if (win_valid(aco->save_prevwin)) + prevwin = aco->save_prevwin; /* In case the autocommand move the cursor to a position that that * not exist in curbuf. */ check_cursor(); -- cgit v1.2.1