patch 9.0.2067: xxd: coloring was disabled on Cygwin

Commit: 
https://github.com/vim/vim/commit/c4a403860353ff35dc47e2a52818e771fa228083
Author: Ken Takata <[email protected]>
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 <[email protected]>
    Co-authored-by: Ken Takata <[email protected]>

diff --git a/src/version.c b/src/version.c
index e45d7fa0b..1ae5c9871 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2067,
 /**/
     2066,
 /**/
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 94a0e6146..c90bc027e 100644
--- 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

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/E1qvjZt-005CDL-7M%40256bit.org.

Raspunde prin e-mail lui