To: [email protected]
Subject: Patch 7.4a.034
Fcc: outbox
From: Bram Moolenaar <[email protected]>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4a.034
Problem:    The tabline may flicker when opening a new tab after 7.3.759 on
           Win32.
Solution:   Move call to TabCtrl_SetCurSel(). (Ken Takata)
Files:      src/gui_w48.c


*** ../vim-7.4a.033/src/gui_w48.c       2013-07-09 17:42:42.000000000 +0200
--- src/gui_w48.c       2013-07-17 21:58:28.000000000 +0200
***************
*** 2529,2541 ****
     while (nr < TabCtrl_GetItemCount(s_tabhwnd))
       TabCtrl_DeleteItem(s_tabhwnd, nr);

-     if (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);
 }

 /*
--- 2529,2541 ----
     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);
 }

 /*
***************
*** 2548,2555 ****
     if (s_tabhwnd == NULL)
       return;

!     if (TabCtrl_GetCurSel(s_tabhwnd) != nr -1)
!       TabCtrl_SetCurSel(s_tabhwnd, nr -1);
 }

 #endif
--- 2548,2555 ----
     if (s_tabhwnd == NULL)
       return;

!     if (TabCtrl_GetCurSel(s_tabhwnd) != nr - 1)
!       TabCtrl_SetCurSel(s_tabhwnd, nr - 1);
 }

 #endif
*** ../vim-7.4a.033/src/version.c       2013-07-17 21:40:11.000000000 +0200
--- src/version.c       2013-07-17 21:57:26.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
 {   /* Add new patch number below this line */
+ /**/
+     34,
 /**/

--
Q:  What's a light-year?
A:  One-third less calories than a regular year.

/// Bram Moolenaar -- [email protected] -- 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    ///