diff options
| author | Bram Moolenaar <bram@vim.org> | 2012-10-11 04:44:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2012-10-11 04:44:33 +0200 |
| commit | 4ac8256d8698910182db042fd80e3642130065bf (patch) | |
| tree | 63ea3362452ecf1253b0ea108ba0fa60b3e1744b | |
| parent | 31bd8fb4a00f6bb21de5c6d33375e26f60a2760d (diff) | |
| download | vim-4ac8256d8698910182db042fd80e3642130065bf.tar.gz | |
Problem: Test 16 fails when $DISPLAY is not set.
Solution: Skip the test when $DISPLAY is not set.
| -rw-r--r-- | src/testdir/test16.in | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test16.in b/src/testdir/test16.in index aa00517a..b2cd159a 100644 --- a/src/testdir/test16.in +++ b/src/testdir/test16.in @@ -2,6 +2,7 @@ Tests for resetting "secure" flag after GUI has started. For KDE set a font, empty 'guifont' may cause a hang. STARTTEST +:if $DISPLAY == "" | e! test.ok | wq! test.out | endif :set exrc secure :if has("gui_kde") : set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0 diff --git a/src/version.c b/src/version.c index ec61f9bd..7be65c6b 100644 --- a/src/version.c +++ b/src/version.c @@ -720,6 +720,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 687, +/**/ 686, /**/ 685, |