To: vim_dev@googlegroups.com Subject: Patch 8.0.1537 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1537 Problem: Xxd does not skip NUL lines when using ebcdic. Solution: Check for a NUL before converting a character for ebcdic. (Tim Sell, closes #2668) Files: src/xxd/xxd.c *** ../vim-8.0.1536/src/xxd/xxd.c 2016-07-16 14:33:33.000000000 +0200 --- src/xxd/xxd.c 2018-02-24 17:59:32.181855627 +0100 *************** *** 827,832 **** --- 827,834 ---- for (i = 7; i >= 0; i--) l[++c] = (e & (1 << i)) ? '1' : '0'; } + if (e) + nonzero++; if (ebcdic) e = (e < 64) ? '.' : etoa64[e-64]; /* When changing this update definition of LLEN above. */ *************** *** 837,844 **** (e > 31 && e < 127) #endif ? e : '.'; - if (e) - nonzero++; n++; if (++p == cols) { --- 839,844 ---- *** ../vim-8.0.1536/src/version.c 2018-02-24 17:42:22.672168648 +0100 --- src/version.c 2018-02-24 18:30:16.393862704 +0100 *************** *** 780,781 **** --- 780,783 ---- { /* Add new patch number below this line */ + /**/ + 1537, /**/ -- If an elephant is left tied to a parking meter, the parking fee has to be paid just as it would for a vehicle. [real standing law in Florida, United States of America] /// 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 ///