lkundrak / rpms / vim

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