# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1427216232 -3600
# Node ID dc96dd80aef84bbdf0537fbf9c9f5ab63a7ab649
# Parent  e544e57681f013e46eacd8a20ad33146ea7e6637
updated for version 7.4.681
Problem:    MS-Windows: When Vim is minimized the window height is computed
	    incorrectly.
Solution:   When minimized use the previously computed size. (Ingo Karkat)

diff --git a/src/gui_w32.c b/src/gui_w32.c
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -598,6 +598,14 @@ gui_mswin_get_menu_height(
 
     if (num == 0)
 	menu_height = 0;
+    else if (IsMinimized(s_hwnd))
+    {
+	/* The height of the menu cannot be determined while the window is
+	 * minimized.  Take the previous height if the menu is changed in that
+	 * state, to avoid that Vim's vertical window size accidentally
+	 * increases due to the unaccounted-for menu height. */
+	menu_height = old_menu_height == -1 ? 0 : old_menu_height;
+    }
     else
     {
 	if (is_winnt_3())	/* for NT 3.xx */
@@ -644,9 +652,9 @@ gui_mswin_get_menu_height(
 
     if (fix_window && menu_height != old_menu_height)
     {
-	old_menu_height = menu_height;
 	gui_set_shellsize(FALSE, FALSE, RESIZE_VERT);
     }
+    old_menu_height = menu_height;
 
     return menu_height;
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    681,
+/**/
     680,
 /**/
     679,