patch 7.4.874

Problem:    MS-Windows: When Vim runs inside another application, the size
            isn't right.
Solution:   When in child mode compute the size differently. (Agorgianitis
            Loukas)

src/gui_w48.c

@@ -3335,6 +3335,8 @@ gui_mch_newfont()
     RECT	rect;
 
     GetWindowRect(s_hwnd, &rect);
+    if (win_socket_id == 0)
+    {
 	gui_resize_shell(rect.right - rect.left
 	    - (GetSystemMetrics(SM_CXFRAME) +
 	       GetSystemMetrics(SM_CXPADDEDBORDER)) * 2,
@@ -3347,6 +3349,17 @@ gui_mch_newfont()
 #endif
 	);
     }
+    else
+    {
+	/* Inside another window, don't use the frame and border. */
+	gui_resize_shell(rect.right - rect.left,
+	    rect.bottom - rect.top
+#ifdef FEAT_MENU
+			- gui_mswin_get_menu_height(FALSE)
+#endif
+	);
+    }
+}
 
 /*
  * Set the window title

src/version.c

@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    874,
 /**/
     873,
 /**/