From e2d1c334ee88067e16351e091ece95f6c6f24af5 Mon Sep 17 00:00:00 2001
From: Foxe Chen <chen.foxe@gmail.com>
Date: Mon, 1 Jun 2026 19:46:46 +0000
Subject: [PATCH] patch 9.2.0582: GTK4: compile error when XFONTSET is defined

Problem:  GTK4: compile error when XFONTSET is defined
          (simozz)
Solution: Undefine FEAT_XFONTSET when GTK4 UI is defined
          (Foxe Chen)

fixes:  #20404
closes: #20406

Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/feature.h | 4 ++++
 src/version.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/feature.h b/src/feature.h
index 46508f74bb..92c4b1374b 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -444,6 +444,10 @@
 # else
 // #  define FEAT_XFONTSET
 # endif
+#else
+# if defined(USE_GTK4)
+#  undef FEAT_XFONTSET
+# endif
 #endif
 
 /*
diff --git a/src/version.c b/src/version.c
index 44bc20abdc..02fc6a82f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    582,
 /**/
     581,
 /**/