diff options
| -rw-r--r-- | src/testdir/test_gui.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index fbea706bd..14c0ca1f4 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -10,9 +10,10 @@ func SetUp() set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0 endif - " Gnome insists on creating $HOME/.gnome2/, and we're going to abide by - " that, taking care to have the font cache work normally. - if $XDG_CACHE_HOME == '' + " Gnome insists on creating $HOME/.gnome2/, set $HOME to avoid changing the + " actual home directory. But avoid triggering fontconfig by setting the + " cache directory. Only needed for Unix. + if $XDG_CACHE_HOME == '' && exists('g:tester_HOME') let $XDG_CACHE_HOME = g:tester_HOME . '/.cache' endif call mkdir('Xhome') diff --git a/src/version.c b/src/version.c index 3aa178691..944dfc9fc 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 */ /**/ + 278, +/**/ 277, /**/ 276, |