# HG changeset patch # User Bram Moolenaar # Date 1371153440 -7200 # Node ID 6f7ed9b799a3db282f0fc076d8232752716a4e00 # Parent 212b3fb13d1ef55b68b6100f680561591eda41e4 updated for version 7.3.1188 Problem: Newline characters messing up error message. Solution: Remove the newlines. (Kazunobu Kuriyama) diff --git a/src/gui_x11.c b/src/gui_x11.c --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -2197,12 +2197,12 @@ check_fontset_sanity(fs) if ( xfs[i]->max_bounds.width != 2 * min_width && xfs[i]->max_bounds.width != min_width) { - EMSG2(_("E253: Fontset name: %s\n"), base_name); - EMSG2(_("Font0: %s\n"), font_name[min_font_idx]); - EMSG2(_("Font1: %s\n"), font_name[i]); - EMSGN(_("Font%ld width is not twice that of font0\n"), i); - EMSGN(_("Font0 width: %ld\n"), xfs[min_font_idx]->max_bounds.width); - EMSGN(_("Font1 width: %ld\n\n"), xfs[i]->max_bounds.width); + EMSG2(_("E253: Fontset name: %s"), base_name); + EMSG2(_("Font0: %s"), font_name[min_font_idx]); + EMSG2(_("Font1: %s"), font_name[i]); + EMSGN(_("Font%ld width is not twice that of font0"), i); + EMSGN(_("Font0 width: %ld"), xfs[min_font_idx]->max_bounds.width); + EMSGN(_("Font1 width: %ld"), xfs[i]->max_bounds.width); return FAIL; } } diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 1188, +/**/ 1187, /**/ 1186,