8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.118
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.118
8b9a1c
Problem:    It's possible that redrawing the status lines causes
8b9a1c
	    win_redr_custom() to be called recursively.
8b9a1c
Solution:   Protect against recursiveness. (Yasuhiro Matsumoto)
8b9a1c
Files:	    src/screen.c
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.117/src/screen.c	2013-11-08 04:30:06.000000000 +0100
8b9a1c
--- src/screen.c	2013-12-11 15:32:21.000000000 +0100
8b9a1c
***************
8b9a1c
*** 6653,6658 ****
8b9a1c
--- 6653,6659 ----
8b9a1c
      win_T	*wp;
8b9a1c
      int		draw_ruler;	/* TRUE or FALSE */
8b9a1c
  {
8b9a1c
+     static int	entered = FALSE;
8b9a1c
      int		attr;
8b9a1c
      int		curattr;
8b9a1c
      int		row;
8b9a1c
***************
8b9a1c
*** 6671,6676 ****
8b9a1c
--- 6672,6684 ----
8b9a1c
      win_T	*ewp;
8b9a1c
      int		p_crb_save;
8b9a1c
  
8b9a1c
+     /* There is a tiny chance that this gets called recursively: When
8b9a1c
+      * redrawing a status line triggers redrawing the ruler or tabline.
8b9a1c
+      * Avoid trouble by not allowing recursion. */
8b9a1c
+     if (entered)
8b9a1c
+ 	return;
8b9a1c
+     entered = TRUE;
8b9a1c
+ 
8b9a1c
      /* setup environment for the task at hand */
8b9a1c
      if (wp == NULL)
8b9a1c
      {
8b9a1c
***************
8b9a1c
*** 6746,6752 ****
8b9a1c
      }
8b9a1c
  
8b9a1c
      if (maxwidth <= 0)
8b9a1c
! 	return;
8b9a1c
  
8b9a1c
      /* Temporarily reset 'cursorbind', we don't want a side effect from moving
8b9a1c
       * the cursor away and back. */
8b9a1c
--- 6754,6760 ----
8b9a1c
      }
8b9a1c
  
8b9a1c
      if (maxwidth <= 0)
8b9a1c
! 	goto theend;
8b9a1c
  
8b9a1c
      /* Temporarily reset 'cursorbind', we don't want a side effect from moving
8b9a1c
       * the cursor away and back. */
8b9a1c
***************
8b9a1c
*** 6827,6832 ****
8b9a1c
--- 6835,6843 ----
8b9a1c
  	while (col < Columns)
8b9a1c
  	    TabPageIdxs[col++] = fillchar;
8b9a1c
      }
8b9a1c
+ 
8b9a1c
+ theend:
8b9a1c
+     entered = FALSE;
8b9a1c
  }
8b9a1c
  
8b9a1c
  #endif /* FEAT_STL_OPT */
8b9a1c
*** ../vim-7.4.117/src/version.c	2013-12-11 15:06:36.000000000 +0100
8b9a1c
--- src/version.c	2013-12-11 15:32:16.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     118,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
Nothing is fool-proof to a sufficiently talented fool.
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    ///