summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-15 21:54:16 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-15 21:54:16 +0200
commite66f06d819c2bbb09205a5c28e7ccf481f3ea9e7 (patch)
tree51ebda31471afb3d060fe3ce53d606f184a8c409
parent52b91d801aa1af208aeb25f707da823d40671e4a (diff)
downloadvim-git-e66f06d819c2bbb09205a5c28e7ccf481f3ea9e7.tar.gz
updated for version 7.3.1201v7.3.1201
Problem: When a startup script creates a preview window, it probably becomes the current window. Solution: Make another window the current one. (Christian Brabandt)
-rw-r--r--src/main.c20
-rw-r--r--src/version.c2
2 files changed, 21 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 9c11b432a..5c1405ea3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2816,7 +2816,25 @@ edit_buffers(parmp)
# ifdef FEAT_AUTOCMD
--autocmd_no_enter;
# endif
- win_enter(firstwin, FALSE); /* back to first window */
+#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+ /*
+ * Avoid making a preview window the current window.
+ */
+ if (firstwin->w_p_pvw)
+ {
+ win_T *win;
+
+ for (win = firstwin; win != NULL; win = win->w_next)
+ if (!win->w_p_pvw)
+ {
+ firstwin = win;
+ break;
+ }
+ }
+#endif
+ /* make the first window the current window */
+ win_enter(firstwin, FALSE);
+
# ifdef FEAT_AUTOCMD
--autocmd_no_leave;
# endif
diff --git a/src/version.c b/src/version.c
index bb9edce1f..2f47dad7a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1201,
+/**/
1200,
/**/
1199,