Commit: patch 9.2.0643: Missing Image ifdefs

[Christian Brabandt]

patch 9.2.0643: Missing Image ifdefs

Commit: https://github.com/vim/vim/commit/667a011bc2b3611bd321764fbaa1313cbfe82b7c
Author: Foxe Chen <chen...@gmail.com>
Date: Sun Jun 14 15:24:44 2026 +0000

patch 9.2.0643: Missing Image ifdefs

Problem: Missing Image ifdefs
Solution: Add missing FEAT_IMAGE_GDK ifdefs (Foxe Chen).

closes: #20516

Signed-off-by: Foxe Chen <chen...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/drawscreen.c b/src/drawscreen.c
index 58b54c3b3..be5f77a53 100644
--- a/src/drawscreen.c
+++ b/src/drawscreen.c
@@ -449,7 +449,8 @@ update_screen(int type_arg)
}
#endif

-#if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO)
+#if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+ || defined(FEAT_IMAGE_GDK)
// GUI only: the cursor redraw and other late blits paint directly onto
// the canvas and may damage the popup images blitted by update_popups();
// restore the image layer. No-op in terminal mode.
diff --git a/src/popupwin.c b/src/popupwin.c
index ac2158f78..e5c936400 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2076,8 +2076,9 @@ popup_image_composites_frames(void)
// The surface is composed off-screen before it is exposed, so the
// repaint cannot flicker there.
return true;
-# else
- // GDI blits with SRCCOPY: a full replace, no residue.
+# elif defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_GDK)
+ // GDI blits with SRCCOPY: a full replace, no residue. GDK uses retained
+ // render nodes, so there is no blitting in the first place.
return false;
# endif
# endif
@@ -7147,7 +7148,8 @@ popup_images_invalidate(void)
* here would instead paint a lower zindex image over the cells of a
* higher zindex popup drawn on top of it.
*/
-# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO)
+# if defined(FEAT_IMAGE_GDI) || defined(FEAT_IMAGE_CAIRO) \
+ || defined(FEAT_IMAGE_GDK)
void
update_popup_images(void)
{
diff --git a/src/version.c b/src/version.c
index 4611e8488..edb973731 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 643,
/**/
642,
/**/