To: vim_dev@googlegroups.com
Subject: Patch 7.4b.0
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4b.019 (after 7.4a.034)
Problem:    Tabline is not updated properly when closing a tab on Win32.
Solution:   Only reduce flickering when adding a tab. (Ken Takata)
Files:	    src/gui_w48.c


*** ../vim-7.4b.018/src/gui_w48.c	2013-07-21 17:51:37.000000000 +0200
--- src/gui_w48.c	2013-08-07 21:10:23.000000000 +0200
***************
*** 2459,2464 ****
--- 2459,2465 ----
      TCITEM	tie;
      int		nr = 0;
      int		curtabidx = 0;
+     int		tabadded = 0;
  #ifdef FEAT_MBYTE
      static int	use_unicode = FALSE;
      int		uu;
***************
*** 2499,2504 ****
--- 2500,2506 ----
  	    /* Add the tab */
  	    tie.pszText = "-Empty-";
  	    TabCtrl_InsertItem(s_tabhwnd, nr, &tie);
+ 	    tabadded = 1;
  	}
  
  	get_tabline_label(tp, FALSE);
***************
*** 2531,2542 ****
      while (nr < TabCtrl_GetItemCount(s_tabhwnd))
  	TabCtrl_DeleteItem(s_tabhwnd, nr);
  
      /* Re-enable redraw and redraw. */
      SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
      RedrawWindow(s_tabhwnd, NULL, NULL,
  		    RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
  
!     if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
  	TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
  }
  
--- 2533,2547 ----
      while (nr < TabCtrl_GetItemCount(s_tabhwnd))
  	TabCtrl_DeleteItem(s_tabhwnd, nr);
  
+     if (!tabadded && TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
+ 	TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
+ 
      /* Re-enable redraw and redraw. */
      SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
      RedrawWindow(s_tabhwnd, NULL, NULL,
  		    RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
  
!     if (tabadded && TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
  	TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
  }
  
*** ../vim-7.4b.018/src/version.c	2013-08-07 15:27:07.000000000 +0200
--- src/version.c	2013-08-07 21:11:49.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     19,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
58. You turn on your computer and turn off your wife.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///