From c3ebb5dd9ea0bcf6c4ba0866143422babb2ea7a1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Jun 2013 21:57:20 +0200 Subject: [PATCH] updated for version 7.3.1188 Problem: Newline characters messing up error message. Solution: Remove the newlines. (Kazunobu Kuriyama) --- src/gui_x11.c | 12 ++++++------ src/version.c | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui_x11.c b/src/gui_x11.c index e4a056ee6d..41fcbde2bb 100644 --- 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 index 337bf308e5..4519fbe694 100644 --- 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 */ +/**/ + 1188, /**/ 1187, /**/