commit 233f956bd43279db1fb4d017acb4e56a1504addf
author K.Takata <kentkt@csc.jp> Mon Sep 04 07:46:59 2023 +0200
committer Christian Brabandt <cb@256bit.org> Mon Sep 04 07:46:59 2023 +0200
tree c27ef80190b502fa964030b3d7c0441642403744
parent f44cbe96fa44d10d6dd717e0a9f6ef0f104ee98a

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>

src/version.c

diff --git a/src/version.c b/src/version.c
index 6ba7443..717de12 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1861,
+/**/
     1860,
 /**/
     1859,

src/xxd/xxd.c

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index f8601eb..1ba2247 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -135,7 +135,7 @@
 # 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 @@
 	  else if (!STRNCMP(pw, "never", 5))
 	    color = 0;
 	  else if (!STRNCMP(pw, "auto", 4))
-	    ;	/* Do nothing. */
+	    color = enable_color();
 	  else
 	    exit_with_usage();
         }