diff options
| author | K.Takata <kentkt@csc.jp> | 2023-09-04 07:46:59 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2023-09-04 07:46:59 +0200 |
| commit | 233f956bd43279db1fb4d017acb4e56a1504addf (patch) | |
| tree | c27ef80190b502fa964030b3d7c0441642403744 | |
| parent | f44cbe96fa44d10d6dd717e0a9f6ef0f104ee98a (diff) | |
patch 9.0.1861: xxd: issue when -R is specified several timesv9.0.1861
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 <cb@256bit.org>
Co-authored-by: K.Takata <kentkt@csc.jp>
Co-authored-by: Aapo Rantalainen <aapo.rantalainen@gmail.com>
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index 6ba74438a6..717de12e2a 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1861, +/**/ 1860, /**/ 1859, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index f8601eb09d..1ba22477fd 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(); } |