patch 7.4.1094

Problem:    Test for :hardcopy fails on MS-Windows.
Solution:   Check for the +postscript feature.

diff --git a/src/testdir/test_hardcopy.vim b/src/testdir/test_hardcopy.vim
index c2145c13fc6fa8b5bf052f6bd68a6b80a2efbeff..4629d17dd22bdf199f9591f2047ca05bdf82e9b4 100644 (file)
--- 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 2567cb5819b77a2131c5ae04cde0ca3ff601f055..e0d94fda3fa30942ccb8a71846aa1c8a76aa5291 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1094,
 /**/
     1093,
 /**/