To: vim_dev@googlegroups.com Subject: Patch 8.2.2269 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2269 Problem: Not all :hardcopy code covered by tests. Solution: Test more combinations. (Dominique Pellé, closes #7595) Files: src/testdir/test_hardcopy.vim *** ../vim-8.2.2268/src/testdir/test_hardcopy.vim 2020-03-15 18:27:39.164063651 +0100 --- src/testdir/test_hardcopy.vim 2021-01-01 21:31:42.588672941 +0100 *************** *** 10,17 **** --- 10,19 ---- \ 'left:2in,top:30pt,right:16mm,bottom:3pc', \ 'header:3,syntax:y,number:y,wrap:n', \ 'header:3,syntax:n,number:y,wrap:y', + \ 'header:0,syntax:a,number:y,wrap:y', \ 'duplex:short,collate:n,jobsplit:y,portrait:n', \ 'duplex:long,collate:y,jobsplit:n,portrait:y', + \ 'duplex:off,collate:y,jobsplit:y,portrait:y', \ 'paper:10x14', \ 'paper:A3', \ 'paper:A4', *************** *** 46,53 **** endfunc func Test_printmbfont() ! " Print a small help page which contains tabs to cover code that expands tabs to spaces. ! help help syn on for opt in [':WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no', --- 48,55 ---- endfunc func Test_printmbfont() ! " Print a help page which contains tabs, underlines (etc) to recover more code. ! help syntax.txt syn on for opt in [':WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no', *************** *** 70,81 **** " digraph.txt has plenty of non-latin1 characters. help digraph.txt ! set printmbcharset=ISO10646 printencoding=utf-8 printmbfont=r:WadaMin-Regular ! ! hardcopy > Xhardcopy_printmbcharset ! let lines = readfile('Xhardcopy_printmbcharset') ! call assert_true(len(lines) > 20) ! call assert_true(lines[0] =~ 'PS-Adobe') set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:') --- 72,88 ---- " digraph.txt has plenty of non-latin1 characters. help digraph.txt ! set printmbcharset=ISO10646 printencoding=utf-8 ! for courier in ['yes', 'no'] ! for ascii in ['yes', 'no'] ! exe 'set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-BoldItalic' ! \ .. ',c:' .. courier .. ',a:' .. ascii ! hardcopy > Xhardcopy_printmbcharset ! let lines = readfile('Xhardcopy_printmbcharset') ! call assert_true(len(lines) > 20) ! call assert_true(lines[0] =~ 'PS-Adobe') ! endfor ! endfor set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:') *** ../vim-8.2.2268/src/version.c 2021-01-01 21:05:51.222773812 +0100 --- src/version.c 2021-01-01 21:32:57.576258974 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2269, /**/ -- If your nose runs, and your feet smell, you might be upside down. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///