diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-06-13 21:57:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-06-13 21:57:20 +0200 |
| commit | 34c4e23e45bc01f71835811b73616a666a9ec4fc (patch) | |
| tree | 30a26b960022daadc34a2104b5b1121033392b7d | |
| parent | 72f3797381ff56c570d7b4a7d2389e18e361c223 (diff) | |
| download | vim-34c4e23e45bc01f71835811b73616a666a9ec4fc.tar.gz | |
Problem: Newline characters messing up error message.
Solution: Remove the newlines. (Kazunobu Kuriyama)
| -rw-r--r-- | src/gui_x11.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c index e4a056ee..41fcbde2 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 337bf308..4519fbe6 100644 --- 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, |