# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1698262205 -7200
# Node ID 38b0ea4d17cc4920bdf011c9d485138b4f4d218a
# Parent  9d818145bd760571e20b74433a873e71239631ef
patch 9.0.2067: xxd: coloring was disabled on Cygwin

Commit: https://github.com/vim/vim/commit/c4a403860353ff35dc47e2a52818e771fa228083
Author: Ken Takata <kentkt@csc.jp>
Date:   Wed Oct 25 21:17:35 2023 +0200

    patch 9.0.2067: xxd: coloring was disabled on Cygwin

    Problem:  xxd: coloring was disabled on Cygwin
    Solution: don't include WIN32

    xxd: Fix that color was disabled on Cygwin

    "windows.h" was unintentionally included on Cygwin since 9.0.1834.
    This accidentally disabled coloring on Cygwin.
    Stop including "windows.h" on Cygwin.

    closes: #13414

    Signed-off-by: Christian Brabandt <cb@256bit.org>
    Co-authored-by: Ken Takata <kentkt@csc.jp>

diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2067,
+/**/
     2066,
 /**/
     2065,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -88,6 +88,8 @@
 #endif
 #if defined(WIN32) || defined(CYGWIN)
 # include <io.h>	/* for setmode() */
+#endif
+#ifdef WIN32
 # include <windows.h>
 #endif
 #ifdef UNIX
@@ -136,7 +138,7 @@ extern void perror __P((char *));
 # endif
 #endif
 
-char version[] = "xxd 2023-10-24 by Juergen Weigert et al.";
+char version[] = "xxd 2023-10-25 by Juergen Weigert et al.";
 #ifdef WIN32
 char osver[] = " (Win32)";
 #else