(w32_load_system_font): Always mark font as double byte if codepage is unicode.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/w32fns.c b/src/w32fns.c
index 591a7543229..d6385204119 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5537,11 +5537,17 @@ w32_load_system_font (f,fontname,size)
       {
         HDC hdc;
         HANDLE oldobj;
+        int codepage = w32_codepage_for_font (fontname);
 
         hdc = GetDC (dpyinfo->root_window);
         oldobj = SelectObject (hdc, font->hfont);
+
         ok = GetTextMetrics (hdc, &font->tm);
-        font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS;
+        if (codepage == CP_UNICODE)
+          font->double_byte_p = 1;
+        else
+          font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS;
+
         SelectObject (hdc, oldobj);
         ReleaseDC (dpyinfo->root_window, hdc);
         /* Fill out details in lf according to the font that was