From: Yee Cheng Chin <ychin.git@gmail.com>
Date: Sun, 21 Jun 2026 13:35:06 +0000 (+0000)
Subject: patch 9.2.0687: popup_image_composites_frames() has improper if block scope
X-Git-Tag: v9.2.0687^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63174f6c3859dd9d6832a318222a665d73858a2d;p=thirdparty%2Fvim.git

patch 9.2.0687: popup_image_composites_frames() has improper if block scope

Problem:  popup_image_composites_frames() has improper if block scope
Solution: Add curly braces to properly scope the if block
          (Yee Cheng Chin).

If the ifdef conditions within the if block evaluates to false, then the
generated code will have the if block apply to the next statement
instead. Use a curly brace to properly scope the if block.

related: #20478
closes:  #20584

Signed-off-by: Yee Cheng Chin <ychin.git@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/popupwin.c b/src/popupwin.c
index 02ecffbfd9..d3d27a2e17 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2070,6 +2070,7 @@ popup_image_composites_frames(void)
 {
 # ifdef FEAT_GUI
     if (gui.in_use)
+    {
 #  ifdef FEAT_IMAGE_CAIRO
 	// Cairo paints the image with OPERATOR_OVER onto gui.surface, so
 	// a swapped-in RGBA frame needs the cells repainted underneath.
@@ -2081,6 +2082,7 @@ popup_image_composites_frames(void)
 	// render nodes, so there is no blitting in the first place.
 	return false;
 #  endif
+    }
 # endif
 # ifdef FEAT_IMAGE_SIXEL
     // Sixel P2=1 transparency: unpainted pixels keep their previous
diff --git a/src/version.c b/src/version.c
index c640b1c60c..75976074d8 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 */
+/**/
+    687,
 /**/
     686,
 /**/