summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-15 15:56:35 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-15 15:56:35 +0100
commitccb80989f2779c8441f7f15d160fb2141bd1676d (patch)
tree92b7ba48b5bbc92149cfff1b56881f70730e11f9
parent24c4d539eed33e8073f8f9fe2bee497bbba935a4 (diff)
patch 7.4.1094v7.4.1094
Problem: Test for :hardcopy fails on MS-Windows. Solution: Check for the +postscript feature.
-rw-r--r--src/testdir/test_hardcopy.vim18
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 8 deletions
diff --git a/src/testdir/test_hardcopy.vim b/src/testdir/test_hardcopy.vim
index c2145c13fc..4629d17dd2 100644
--- a/src/testdir/test_hardcopy.vim
+++ b/src/testdir/test_hardcopy.vim
@@ -45,12 +45,14 @@ endfunc
" Test that :hardcopy produces a non-empty file.
" We don't check much of the contents.
func Test_with_syntax()
- set printoptions=syntax:y
- syn on
- hardcopy > Xhardcopy
- let lines = readfile('Xhardcopy')
- call assert_true(len(lines) > 20)
- call assert_true(lines[0] =~ 'PS-Adobe')
- call delete('Xhardcopy')
- set printoptions&
+ if has('postscript')
+ set printoptions=syntax:y
+ syn on
+ hardcopy > Xhardcopy
+ let lines = readfile('Xhardcopy')
+ call assert_true(len(lines) > 20)
+ call assert_true(lines[0] =~ 'PS-Adobe')
+ call delete('Xhardcopy')
+ set printoptions&
+ endif
endfunc
diff --git a/src/version.c b/src/version.c
index 2567cb5819..e0d94fda3f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1094,
+/**/
1093,
/**/
1092,