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 <cb@256bit.org>
Co-authored-by: K.Takata <kentkt@csc.jp>
Co-authored-by: Aapo Rantalainen <aapo.rantalainen@gmail.com>

diff --git a/src/version.c b/src/version.c
index 6ba74438a6a5cf135496043a78c1b8a96095a1dd..717de12e2a3bebd1de379a0e701979dd4a290a42 100644 (file)
--- 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 f8601eb09d6f805aa816b169cce8bc2ae0efda2e..1ba22477fd94876671a75d93521917963c3a3298 100644 (file)
--- 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();
         }