Fix merge

Author: splhack

src/gui_w32.c

@@ -633,70 +633,6 @@ gui_mch_show_caption(int show)
     }
 }
 
-/*
- * Return TRUE when Visual Style is enabled.
- */
-    static int
-is_visual_style_enabled(void)
-{
-    HANDLE hUxtheme;
-    static BOOL (WINAPI *pIsThemeActive)(void) = NULL;
-    static BOOL loaded = FALSE;
-
-    if (!loaded) {
-	hUxtheme = GetModuleHandle("uxtheme.dll");
-	if (hUxtheme != NULL)
-	    pIsThemeActive = (void*)GetProcAddress(hUxtheme, "IsThemeActive");
-	loaded = TRUE;
-    }
-    if (pIsThemeActive)
-	return pIsThemeActive();
-    return FALSE;
-}
-
-    static int
-has_caption(void)
-{
-    return GetWindowLong(s_hwnd, GWL_STYLE) & WS_CAPTION;
-}
-
-    static int
-get_caption_height(void)
-{
-    /*
-     * A window's caption includes extra 1 dot margin.  When caption is
-     * removed the margin also be removed.  So we must return -1 when
-     * caption is diabled.
-     */
-    return has_caption() ? GetSystemMetrics(SM_CYCAPTION) : -1;
-}
-
-    static int
-get_caption_width_adjustment(void)
-{
-    return has_caption() ? 0 : -2;
-}
-
-    void
-gui_mch_show_caption(int show)
-{
-    LONG style, newstyle;
-
-    /* Remove caption when title is null. */
-    style = newstyle = GetWindowLong(s_hwnd, GWL_STYLE);
-    if (show && !(style & WS_CAPTION))
-	newstyle = style | WS_CAPTION;
-    else if (!show && (style & WS_CAPTION))
-	newstyle = style & ~WS_CAPTION;
-    if (newstyle != style)
-    {
-	SetWindowLong(s_hwnd, GWL_STYLE, newstyle);
-	SetWindowPos(s_hwnd, NULL, 0, 0, 0, 0,
-		SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
-	gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH);
-    }
-}
-
 /*
  * Return TRUE when Visual Style is enabled.
  */

src/testdir/Make_dos.mak

@@ -64,13 +64,13 @@ DOSTMP_INFILES = $(DOSTMP_OUTFILES:.out=.in)
 
 .SUFFIXES: .in .out
 
-nongui:	clear_report $(SCRIPTS16) $(SCRIPTS) report
+nongui:	clean_report $(SCRIPTS16) $(SCRIPTS) report
 
-small:	clear_report report
+small:	clean_report report
 
-gui:	clear_report $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report
+gui:	clean_report $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS_GUI) report
 
-win32:	clear_report $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
+win32:	clean_report $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) report
 
 $(DOSTMP_INFILES): $(*B).in
 	IF NOT EXIST $(DOSTMP)\NUL MD $(DOSTMP)

src/vim.h

@@ -574,14 +574,6 @@ typedef unsigned long u8char_T;	    /* long should be 32 bits or more */
 # define USE_AMBIWIDTH_AUTO
 #endif
 
-/*
- * Whether 'ambiwidth' supports "auto".  Currently, only for Win32.
- */
-#if defined(FEAT_MBYTE) && defined(FEAT_GUI) && \
-    (defined(FEAT_GUI_W32))
-# define USE_AMBIWIDTH_AUTO
-#endif
-
 /*
  * For dynamically loaded gettext library.  Currently, only for Win32.
  */