summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-01-25 19:28:38 +0100
committerBram Moolenaar <Bram@vim.org>2013-01-25 19:28:38 +0100
commit826763f87b4a15fb125b3b5cc3fc308a5976bfaf (patch)
treeda1e2b9d2c47244a3739ec16b8a69e38adfc40ac
parent15364d74ca33d8d722483c7b8ebede17f344ab8c (diff)
updated for version 7.3.784v7.3.784
Problem: Error when 'guifontwide' has a comma. Solution: Use gui.wide_font. (Taro Muraoka)
-rw-r--r--src/gui_w48.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 0a7f367e87..2a5f696512 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -3107,7 +3107,8 @@ update_im_font()
LOGFONT lf_wide;
if (p_guifontwide != NULL && *p_guifontwide != NUL
- && get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
+ && gui.wide_font != NOFONT
+ && GetObject((HFONT)gui.wide_font, sizeof(lf_wide), &lf_wide))
norm_logfont = lf_wide;
else
norm_logfont = sub_logfont;
diff --git a/src/version.c b/src/version.c
index cd838d41bf..9a94c54da6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 784,
+/**/
783,
/**/
782,