# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1519494306 -3600
# Node ID 7f1a5e8d82890e8c172a918f2f7cac1d993bf165
# Parent  a918cd8aa387b8c6e1232efdfaad38975bc71b1d
patch 8.0.1537: xxd does not skip NUL lines when using ebcdic

commit https://github.com/vim/vim/commit/085346f5a1ab5828b1fd80990d93172440c54724
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 24 18:30:55 2018 +0100

    patch 8.0.1537: xxd does not skip NUL lines when using ebcdic

    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)

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1537,
+/**/
     1536,
 /**/
     1535,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -827,6 +827,8 @@ main(int argc, char *argv[])
 	  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,8 +839,6 @@ main(int argc, char *argv[])
 	  (e > 31 && e < 127)
 #endif
 	  ? e : '.';
-      if (e)
-	nonzero++;
       n++;
       if (++p == cols)
 	{