diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-09 16:14:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-09 16:14:53 +0100 |
| commit | a9f8ffb6345f5b246944c73b9861fcc53eaa5228 (patch) | |
| tree | b043d202b866a34cf9492857e569741f61b312ba | |
| parent | 43dded8c59c0647a70dd52c3125783945d90ae5a (diff) | |
| download | vim-git-a9f8ffb6345f5b246944c73b9861fcc53eaa5228.tar.gz | |
patch 8.0.0318: small mistake in 7x13 font namev8.0.0318
Problem: Small mistake in 7x13 font name.
Solution: Use ISO 8859-1 name instead of 10646-1. (Kazunobu Kuriyama)
| -rw-r--r-- | src/testdir/test_gui.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 3361649a1..283b0ccb8 100644 --- 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 index 50c6fb1dd..1448e981d 100644 --- 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, |