updated for version 7.0-170

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 783fca769643839d9a60a493ddb005ebddfa8f37..353b7a6e35888338d9bf7abf9e2dc7f40f7a642f 100644 (file)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2405,8 +2405,7 @@ gui_mch_update_tabline(void)
                tiw.mask = TCIF_TEXT;
                tiw.iImage = -1;
                tiw.pszText = wstr;
-               SendMessage(s_tabhwnd, TCM_INSERTITEMW, (WPARAM)nr,
-                                                               (LPARAM)&tiw);
+               SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw);
                vim_free(wstr);
            }
        }
@@ -3033,13 +3032,25 @@ gui_mch_init_font(char_u *font_name, int fontset)
     return OK;
 }
 
+#ifndef WPF_RESTORETOMAXIMIZED
+# define WPF_RESTORETOMAXIMIZED 2   /* just in case someone doesn't have it */
+#endif
+
 /*
  * Return TRUE if the GUI window is maximized, filling the whole screen.
  */
     int
 gui_mch_maximized()
 {
-    return IsZoomed(s_hwnd);
+    WINDOWPLACEMENT wp;
+
+    wp.length = sizeof(WINDOWPLACEMENT);
+    if (GetWindowPlacement(s_hwnd, &wp))
+       return wp.showCmd == SW_SHOWMAXIMIZED
+           || (wp.showCmd == SW_SHOWMINIMIZED
+                   && wp.flags == WPF_RESTORETOMAXIMIZED);
+
+    return 0;
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index e88165416f64f48e839dece933b96f59bb1167fe..d03ef121cce360144f1dedbf7f31ac92df6418e8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    170,
 /**/
     169,
 /**/