jkunstle / rpms / vim

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