summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-16 22:15:11 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-16 22:15:11 +0100
commit500f36108031c75befb6a04cac2ceeb592d8cf00 (patch)
tree98aa0248364223daec0f284dec133abf37f8bdb8
parentd89682477cd01ec60edd6d88093b95b12e180127 (diff)
patch 8.1.0758: font number is always one instead of the actualv8.1.0758
Problem: Font number is always one instead of the actual. Solution: Use "%d" instead of "1". (Ken Takata)
-rw-r--r--src/gui_x11.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 42fb7ca86e..652bbec28a 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -2209,7 +2209,7 @@ check_fontset_sanity(XFontSet fs)
{
semsg(_("E253: Fontset name: %s"), base_name);
semsg(_("Font0: %s"), font_name[min_font_idx]);
- semsg(_("Font1: %s"), font_name[i]);
+ semsg(_("Font%d: %s"), i, font_name[i]);
semsg(_("Font%d width is not twice that of font0"), i);
semsg(_("Font0 width: %d"),
(int)xfs[min_font_idx]->max_bounds.width);
diff --git a/src/version.c b/src/version.c
index d96ec6ebd3..710c0245e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -796,6 +796,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 758,
+/**/
757,
/**/
756,