Mercurial > vim

changeset 33158:e8805650fec1 v9.0.1861

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.1861: xxd: issue when -R is specified several times Commit: https://github.com/vim/vim/commit/233f956bd43279db1fb4d017acb4e56a1504addf Author: K.Takata <kentkt@csc.jp> Date: Mon Sep 4 07:46:59 2023 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Mon, 04 Sep 2023 08:00:03 +0200
parents 7d08c4bc859c
children 90b7e7236474
files src/version.c src/xxd/xxd.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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();
         }