]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1188 v7.3.1188
authorBram Moolenaar <Bram@vim.org>
Thu, 13 Jun 2013 19:57:20 +0000 (21:57 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 13 Jun 2013 19:57:20 +0000 (21:57 +0200)
Problem:    Newline characters messing up error message.
Solution:   Remove the newlines. (Kazunobu Kuriyama)

src/gui_x11.c
src/version.c

index e4a056ee6db5fcf0f1b8fbd8244b8b2390f01c0e..41fcbde2bb83919ecbc355957d11e5456d70dc3c 100644 (file)
@@ -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;
        }
     }
index 337bf308e5d49aaa678d8ecaaedf5fcb27102001..4519fbe6940b6ad4ae64e1ff6fbc7f5c4848d6ca 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1188,
 /**/
     1187,
 /**/