updated for version 7.3.1245

Problem:    MS-Windows: confirm() dialog text may still not fit.
Solution:   Use GetTextWidthEnc() instead of GetTextWidth() in two more
            places. (Yasuhiro Matsumoto)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 5ff619267945dee699354309f349cabc9f5f7174..34d3dd4d91750a10bf730a89e361606439f937d0 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3282,7 +3282,7 @@ gui_mch_dialog(
            pend = vim_strchr(pstart, DLG_BUTTON_SEP);
            if (pend == NULL)
                pend = pstart + STRLEN(pstart); // Last button name.
-           textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart));
+           textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart));
            if (textWidth < minButtonWidth)
                textWidth = minButtonWidth;
            textWidth += dlgPaddingX;       /* Padding within button */
@@ -3307,7 +3307,7 @@ gui_mch_dialog(
            pend = vim_strchr(pstart, DLG_BUTTON_SEP);
            if (pend == NULL)
                pend = pstart + STRLEN(pstart); // Last button name.
-           textWidth = GetTextWidth(hdc, pstart, (int)(pend - pstart));
+           textWidth = GetTextWidthEnc(hdc, pstart, (int)(pend - pstart));
            textWidth += dlgPaddingX;           /* Padding within button */
            textWidth += DLG_VERT_PADDING_X * 2; /* Padding around button */
            if (textWidth > dlgwidth)

diff --git a/src/version.c b/src/version.c
index 9c646e600be93beb4c2293f11dc91cf573bbcb82..c06fad3525e7f7020cd8953e52eb78f11480854a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1245,
 /**/
     1244,
 /**/