From a20be06f97d45efabaa52ef107eb7959c0c623a2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 11 Nov 2022 21:24:18 +0000
Subject: patch 9.0.0860: MS-Windows: windres fails with clang 15.0.4

Problem:    MS-Windows: windres fails with clang 15.0.4.
Solution:   Use llvm-windres. (John Marriott)
---
 src/Make_cyg_ming.mak | 4 ++++
 src/version.c         | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 37dc26033d..ad48a4d122 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -227,7 +227,11 @@ endif
 ifeq ($(UNDER_CYGWIN),yes)
 WINDRES := $(CROSS_COMPILE)windres
 else
+ifeq ($(findstring clang,$(CC)),)
 WINDRES := windres
+else
+WINDRES := llvm-windres
+endif
 endif
 
 # Get the default ARCH.
diff --git a/src/version.c b/src/version.c
index fe55c0a1ab..0e991a3ff8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    860,
 /**/
     859,
 /**/
-- 
cgit v1.2.3