From 233f956bd43279db1fb4d017acb4e56a1504addf Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Mon, 4 Sep 2023 07:46:59 +0200 Subject: [PATCH] patch 9.0.1861: xxd: issue when -R is specified several times Problem: xxd: issue when -R is specified several times Solution: Fix command line parsing See: https://github.com/vim/vim/pull/12986#issuecomment-1704375892 closes: #13021 Signed-off-by: Christian Brabandt Co-authored-by: K.Takata Co-authored-by: Aapo Rantalainen --- src/version.c | 2 ++ src/xxd/xxd.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/version.c b/src/version.c index 6ba74438a..717de12e2 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1861, /**/ 1860, /**/ diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index f8601eb09..1ba22477f 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -135,7 +135,7 @@ extern void perror __P((char *)); # endif #endif -char version[] = "xxd 2023-09-01 by Juergen Weigert et al."; +char version[] = "xxd 2023-09-04 by Juergen Weigert et al."; #ifdef WIN32 char osver[] = " (Win32)"; #else @@ -759,7 +759,7 @@ main(int argc, char *argv[]) else if (!STRNCMP(pw, "never", 5)) color = 0; else if (!STRNCMP(pw, "auto", 4)) - ; /* Do nothing. */ + color = enable_color(); else exit_with_usage(); }