1
0
forked from aniani/vim

updated for version 7.3.1188

Problem:    Newline characters messing up error message.
Solution:   Remove the newlines. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar
2013-06-13 21:57:20 +02:00
parent 0c6633a7ea
commit 9d438d3b38
2 changed files with 8 additions and 6 deletions

View File

@@ -2197,12 +2197,12 @@ check_fontset_sanity(fs)
if ( xfs[i]->max_bounds.width != 2 * min_width if ( xfs[i]->max_bounds.width != 2 * min_width
&& xfs[i]->max_bounds.width != min_width) && xfs[i]->max_bounds.width != min_width)
{ {
EMSG2(_("E253: Fontset name: %s\n"), base_name); EMSG2(_("E253: Fontset name: %s"), base_name);
EMSG2(_("Font0: %s\n"), font_name[min_font_idx]); EMSG2(_("Font0: %s"), font_name[min_font_idx]);
EMSG2(_("Font1: %s\n"), font_name[i]); EMSG2(_("Font1: %s"), font_name[i]);
EMSGN(_("Font%ld width is not twice that of font0\n"), i); EMSGN(_("Font%ld width is not twice that of font0"), i);
EMSGN(_("Font0 width: %ld\n"), xfs[min_font_idx]->max_bounds.width); EMSGN(_("Font0 width: %ld"), xfs[min_font_idx]->max_bounds.width);
EMSGN(_("Font1 width: %ld\n\n"), xfs[i]->max_bounds.width); EMSGN(_("Font1 width: %ld"), xfs[i]->max_bounds.width);
return FAIL; return FAIL;
} }
} }

View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1188,
/**/ /**/
1187, 1187,
/**/ /**/