diff options
| -rw-r--r-- | src/main.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |