073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.325
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.325
073263
Problem:    When starting the gui and changing the window size the status line
073263
	    may not be drawn correctly.
073263
Solution:   Catch new_win_height() being called recursively. (Christian
073263
	    Brabandt)
073263
Files:	    src/window.c
073263
073263
073263
*** ../vim-7.4.324/src/window.c	2014-06-12 14:01:27.579769788 +0200
073263
--- src/window.c	2014-06-13 20:04:59.051863582 +0200
073263
***************
073263
*** 5660,5666 ****
073263
      if (wp->w_height > 0)
073263
      {
073263
  	if (wp == curwin)
073263
! 	    validate_cursor();		/* w_wrow needs to be valid */
073263
  	if (wp->w_wrow != wp->w_prev_fraction_row)
073263
  	    set_fraction(wp);
073263
      }
073263
--- 5660,5671 ----
073263
      if (wp->w_height > 0)
073263
      {
073263
  	if (wp == curwin)
073263
! 	    /* w_wrow needs to be valid. When setting 'laststatus' this may
073263
! 	     * call win_new_height() recursively. */
073263
! 	    validate_cursor();
073263
! 	if (wp->w_height != prev_height)
073263
! 	    return;  /* Recursive call already changed the size, bail out here
073263
! 			to avoid the following to mess things up. */
073263
  	if (wp->w_wrow != wp->w_prev_fraction_row)
073263
  	    set_fraction(wp);
073263
      }
073263
*** ../vim-7.4.324/src/version.c	2014-06-12 19:44:45.324549030 +0200
073263
--- src/version.c	2014-06-13 20:06:12.947866378 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     325,
073263
  /**/
073263
073263
-- 
073263
DINGO:   And after the spanking ... the oral sex.
073263
GALAHAD: Oh, dear! Well, I...
073263
GIRLS:   The oral sex ...  The oral sex.
073263
GALAHAD: Well, I suppose I could stay a BIT longer.
073263
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///