# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1486653305 -3600
# Node ID 20d71d305d1cece4f650d0cfb79913f072f02c2b
# Parent  0679b8261115eed6f4442786d9eab3eb2a420e53
patch 8.0.0318: small mistake in 7x13 font name

commit https://github.com/vim/vim/commit/a9f8ffb6345f5b246944c73b9861fcc53eaa5228
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Feb 9 16:14:53 2017 +0100

    patch 8.0.0318: small mistake in 7x13 font name

    Problem:    Small mistake in 7x13 font name.
    Solution:   Use ISO 8859-1 name instead of 10646-1. (Kazunobu Kuriyama)

diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim
--- a/src/testdir/test_gui.vim
+++ b/src/testdir/test_gui.vim
@@ -41,7 +41,7 @@ func Test_getfontname_with_arg()
     call assert_equal('', getfontname('notexist'))
 
     " Valid font name. This is usually the real name of 7x13 by default.
-    let l:fname = '-Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-ISO10646-1'
+    let l:fname = '-misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1'
     call assert_equal(l:fname, getfontname(l:fname))
 
   elseif has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3')
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    318,
+/**/
     317,
 /**/
     316,