summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi SUGAWARA <peanutsjamjam@gmail.com>2021-10-17 16:09:08 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-17 16:09:08 +0100
commit34a364877f0c726cdc0779e6999fded9ba959ebe (patch)
tree7a74e7f3f9a5675f2ca0c632cf4e18fe00b921ea
parentf4d8b76d304dabc39c06d2344cd4c7b28484811b (diff)
downloadvim-git-34a364877f0c726cdc0779e6999fded9ba959ebe.tar.gz
patch 8.2.3529: xxd usage output is incompletev8.2.3529
Problem: Xxd usage output is incomplete. Solution: Add "bytes" to "-g" flag. (Atsushi Sugawara, closes #8944)
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/xxd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index b1fc4dc10..77eb6e1d9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3529,
+/**/
3528,
/**/
3527,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 698971a86..4e352034e 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -224,7 +224,7 @@ exit_with_usage(void)
fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n");
fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n");
fprintf(stderr, " -e little-endian dump (incompatible with -ps,-i,-r).\n");
- fprintf(stderr, " -g number of octets per group in normal output. Default 2 (-e: 4).\n");
+ fprintf(stderr, " -g bytes number of octets per group in normal output. Default 2 (-e: 4).\n");
fprintf(stderr, " -h print this summary.\n");
fprintf(stderr, " -i output in C include file style.\n");
fprintf(stderr, " -l len stop after <len> octets.\n");