changeset 10857:20d71d305d1c v8.0.0318

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)
author Christian Brabandt <cb@256bit.org>
date Thu, 09 Feb 2017 16:15:05 +0100
parents 0679b8261115
children c2b6fecdbb04
files src/testdir/test_gui.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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')
--- 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,