Blame SOURCES/7.4.007

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