summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui_w32.c8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index edfe24e56..aff0ba26a 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -6658,7 +6658,13 @@ gui_mch_draw_string(
/* Use unicodepdy to make characters fit as we expect, even
* when the font uses different widths (e.g., bold character
* is wider). */
- unicodepdy[clen] = cw * gui.char_width;
+ if (c >= 0x10000)
+ {
+ unicodepdy[wlen - 2] = cw * gui.char_width;
+ unicodepdy[wlen - 1] = 0;
+ }
+ else
+ unicodepdy[wlen - 1] = cw * gui.char_width;
}
cells += cw;
i += utfc_ptr2len_len(text + i, len - i);
diff --git a/src/version.c b/src/version.c
index 68ccf9280..4fde2fe85 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1429,
+/**/
1428,
/**/
1427,