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 | 172ddb60c2401cd24c80a096709226e37592111f (patch) | |
| tree | 8724fa7ee3859c34cd26cd7f62c83268a3f07dc9 | |
| parent | b73568149f2f41a84b9b701ae512adbd79b2e93b (diff) | |
| download | vim-git-172ddb60c2401cd24c80a096709226e37592111f.tar.gz | |
updated for version 7.3.687v7.3.687
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 aa00517a3..b2cd159a8 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 ec61f9bd3..7be65c6be 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, |