summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-26 12:58:32 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-26 12:58:32 +0200
commitf05d81102c263b746c344a71cd3aafdec96d9f38 (patch)
treedaaad55552acf522452a0c226f1fde7d522b915b
parentf86c0b01a74fa3e5e37033ac037ef3af41d81a8d (diff)
downloadvim-git-f05d81102c263b746c344a71cd3aafdec96d9f38.tar.gz
updated for version 7.3.1244v7.3.1244
Problem: MS-Windows: confirm() dialog text may not fit. Solution: Use GetTextWidthEnc() instead of GetTextWidth(). (Yasuhiro Matsumoto)
-rw-r--r--src/gui_w32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index c7a7b605c..5ff619267 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3216,7 +3216,7 @@ gui_mch_dialog(
if (l == 1 && vim_iswhite(*pend)
&& textWidth > maxDialogWidth * 3 / 4)
last_white = pend;
- textWidth += GetTextWidth(hdc, pend, l);
+ textWidth += GetTextWidthEnc(hdc, pend, l);
if (textWidth >= maxDialogWidth)
{
/* Line will wrap. */
diff --git a/src/version.c b/src/version.c
index c1cf11ddd..9c646e600 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1244,
+/**/
1243,
/**/
1242,