jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.007

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