diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-06-09 21:57:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-09 21:57:32 -0400 |
| commit | a581364acc301a7145991b3c6d33f0a2489abff5 (patch) | |
| tree | f1e99f7fa5ddc5651348fa5f8494ffe38fa320e3 /src | |
| parent | b3f6b3075188860454e6000c765f8483c5ca782a (diff) | |
| parent | 7db5ad4e4d4337e5ebbdf581a90af24126356ed2 (diff) | |
| download | rneovim-a581364acc301a7145991b3c6d33f0a2489abff5.tar.gz rneovim-a581364acc301a7145991b3c6d33f0a2489abff5.tar.bz2 rneovim-a581364acc301a7145991b3c6d33f0a2489abff5.zip | |
Merge pull request #4802 from brcolow/vim-7.4.1090
vim-patch:7.4.{1090,1094}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_hardcopy.vim | 58 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
3 files changed, 61 insertions, 2 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 4c4b46e159..4b0b5e8d26 100644 --- a/src/nvim/testdir/Makefile +++ b/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 \ diff --git a/src/nvim/testdir/test_hardcopy.vim b/src/nvim/testdir/test_hardcopy.vim new file mode 100644 index 0000000000..4629d17dd2 --- /dev/null +++ b/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 diff --git a/src/nvim/version.c b/src/nvim/version.c index 6095e543c1..0ca859186c 100644 --- a/src/nvim/version.c +++ b/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, |