Merge pull request #4802 from brcolow/vim-7.4.1090

vim-patch:7.4.{1090,1094}

src/nvim/testdir/Makefile

@@ -34,6 +34,7 @@ SCRIPTS := \
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = \
 	    test_cursor_func.res \
+	    test_hardcopy.res \
 	    test_help_tagjump.res \
 	    test_langmap.res \
 	    test_menu.res \

src/nvim/testdir/test_hardcopy.vim

@@ -0,0 +1,58 @@
+" Test :hardcopy
+
+func Test_printoptions_parsing()
+  " Only test that this doesn't throw an error.
+  set printoptions=left:5in,right:10pt,top:8mm,bottom:2pc
+  set printoptions=left:2in,top:30pt,right:16mm,bottom:3pc
+  set printoptions=header:3,syntax:y,number:7,wrap:n
+  set printoptions=duplex:short,collate:n,jobsplit:y,portrait:n
+  set printoptions=paper:10x14
+  set printoptions=paper:A3
+  set printoptions=paper:A4
+  set printoptions=paper:A5
+  set printoptions=paper:B4
+  set printoptions=paper:B5
+  set printoptions=paper:executive
+  set printoptions=paper:folio
+  set printoptions=paper:ledger
+  set printoptions=paper:legal
+  set printoptions=paper:letter
+  set printoptions=paper:quarto
+  set printoptions=paper:statement
+  set printoptions=paper:tabloid
+  set printoptions=formfeed:y
+  set printoptions=
+  set printoptions&
+endfunc
+
+func Test_printmbfont_parsing()
+  " Only test that this doesn't throw an error.
+  set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no
+  set printmbfont=
+  set printmbfont&
+endfunc
+
+func Test_printheader_parsing()
+  " Only test that this doesn't throw an error.
+  set printheader=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
+  set printheader=%<%f%h%m%r%=%b\ 0x%B\ \ %l,%c%V\ %P
+  set printheader=%<%f%=\ [%1*%M%*%n%R%H]\ %-19(%3l,%02c%03V%)%O'%02b'
+  set printheader=...%r%{VarExists('b:gzflag','\ [GZ]')}%h...
+  set printheader=
+  set printheader&
+endfunc
+
+" Test that :hardcopy produces a non-empty file.
+" We don't check much of the contents.
+func Test_with_syntax()
+  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

src/nvim/version.c

@@ -599,11 +599,11 @@ static int included_patches[] = {
   // 1097,
   1096,
   // 1095 NA
-  // 1094,
+  1094,
   1093,
   1092,
   1091,
-  // 1090,
+  1090,
   1089,
   1088,
   1087,