|
|
1fa1ff |
To: vim_dev@googlegroups.com
|
|
|
1fa1ff |
Subject: Patch 7.4.007
|
|
|
1fa1ff |
Fcc: outbox
|
|
|
1fa1ff |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
1fa1ff |
Mime-Version: 1.0
|
|
|
1fa1ff |
Content-Type: text/plain; charset=UTF-8
|
|
|
1fa1ff |
Content-Transfer-Encoding: 8bit
|
|
|
1fa1ff |
------------
|
|
|
1fa1ff |
|
|
|
1fa1ff |
Patch 7.4.007
|
|
|
1fa1ff |
Problem: Creating a preview window on startup leaves the screen layout in a
|
|
|
1fa1ff |
messed up state. (Marius Gedminas)
|
|
|
1fa1ff |
Solution: Don't change firstwin. (Christian Brabandt)
|
|
|
1fa1ff |
Files: src/main.c
|
|
|
1fa1ff |
|
|
|
1fa1ff |
|
|
|
1fa1ff |
*** ../vim-7.4.006/src/main.c 2013-07-03 12:36:49.000000000 +0200
|
|
|
1fa1ff |
--- src/main.c 2013-08-22 14:02:39.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 2727,2732 ****
|
|
|
1fa1ff |
--- 2727,2733 ----
|
|
|
1fa1ff |
int arg_idx; /* index in argument list */
|
|
|
1fa1ff |
int i;
|
|
|
1fa1ff |
int advance = TRUE;
|
|
|
1fa1ff |
+ win_T *win;
|
|
|
1fa1ff |
|
|
|
1fa1ff |
# ifdef FEAT_AUTOCMD
|
|
|
1fa1ff |
/*
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 2816,2839 ****
|
|
|
1fa1ff |
# ifdef FEAT_AUTOCMD
|
|
|
1fa1ff |
--autocmd_no_enter;
|
|
|
1fa1ff |
# endif
|
|
|
1fa1ff |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1fa1ff |
! /*
|
|
|
1fa1ff |
! * Avoid making a preview window the current window.
|
|
|
1fa1ff |
! */
|
|
|
1fa1ff |
! if (firstwin->w_p_pvw)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! win_T *win;
|
|
|
1fa1ff |
!
|
|
|
1fa1ff |
! for (win = firstwin; win != NULL; win = win->w_next)
|
|
|
1fa1ff |
! if (!win->w_p_pvw)
|
|
|
1fa1ff |
! {
|
|
|
1fa1ff |
! firstwin = win;
|
|
|
1fa1ff |
! break;
|
|
|
1fa1ff |
! }
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
! /* make the first window the current window */
|
|
|
1fa1ff |
! win_enter(firstwin, FALSE);
|
|
|
1fa1ff |
|
|
|
1fa1ff |
# ifdef FEAT_AUTOCMD
|
|
|
1fa1ff |
--autocmd_no_leave;
|
|
|
1fa1ff |
--- 2817,2838 ----
|
|
|
1fa1ff |
# ifdef FEAT_AUTOCMD
|
|
|
1fa1ff |
--autocmd_no_enter;
|
|
|
1fa1ff |
# endif
|
|
|
1fa1ff |
+
|
|
|
1fa1ff |
+ /* make the first window the current window */
|
|
|
1fa1ff |
+ win = firstwin;
|
|
|
1fa1ff |
#if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
|
|
|
1fa1ff |
! /* Avoid making a preview window the current window. */
|
|
|
1fa1ff |
! while (win->w_p_pvw)
|
|
|
1fa1ff |
{
|
|
|
1fa1ff |
! win = win->w_next;
|
|
|
1fa1ff |
! if (win == NULL)
|
|
|
1fa1ff |
! {
|
|
|
1fa1ff |
! win = firstwin;
|
|
|
1fa1ff |
! break;
|
|
|
1fa1ff |
! }
|
|
|
1fa1ff |
}
|
|
|
1fa1ff |
#endif
|
|
|
1fa1ff |
! win_enter(win, FALSE);
|
|
|
1fa1ff |
|
|
|
1fa1ff |
# ifdef FEAT_AUTOCMD
|
|
|
1fa1ff |
--autocmd_no_leave;
|
|
|
1fa1ff |
*** ../vim-7.4.006/src/version.c 2013-08-22 12:06:50.000000000 +0200
|
|
|
1fa1ff |
--- src/version.c 2013-08-22 14:04:11.000000000 +0200
|
|
|
1fa1ff |
***************
|
|
|
1fa1ff |
*** 729,730 ****
|
|
|
1fa1ff |
--- 729,732 ----
|
|
|
1fa1ff |
{ /* Add new patch number below this line */
|
|
|
1fa1ff |
+ /**/
|
|
|
1fa1ff |
+ 7,
|
|
|
1fa1ff |
/**/
|
|
|
1fa1ff |
|
|
|
1fa1ff |
--
|
|
|
1fa1ff |
hundred-and-one symptoms of being an internet addict:
|
|
|
1fa1ff |
105. When someone asks you for your address, you tell them your URL.
|
|
|
1fa1ff |
|
|
|
1fa1ff |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
1fa1ff |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
1fa1ff |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
1fa1ff |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|