From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 28 Apr 2024 08:52:09 +0000 (+0300)
Subject: Fix the MS-Windows build broken by a recent commit
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=886f14ed9ff3548bf958800fe8a4509b0d9bc7c3;p=emacs.git

Fix the MS-Windows build broken by a recent commit

* src/w32term.c (w32_draw_glyph_string): Move 'foreground'
declaration to where it belongs.

(cherry picked from commit b329358334712671de38f919c99d1434026aa8f2)
---

diff --git a/src/w32term.c b/src/w32term.c
index a0037e6e090..64dbafab3fd 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2657,6 +2657,7 @@ w32_draw_glyph_string (struct glyph_string *s)
             {
               unsigned long thickness, position;
               int y;
+	      COLORREF foreground;
 
               if (s->prev
 		  && ((s->prev->face->underline == FACE_UNDERLINE_SINGLE)
@@ -2679,7 +2680,6 @@ w32_draw_glyph_string (struct glyph_string *s)
 		  BOOL use_underline_position_properties;
 		  Lisp_Object val = (WINDOW_BUFFER_LOCAL_VALUE
 				     (Qunderline_minimum_offset, s->w));
-		  COLORREF foreground;
 
 		  if (FIXNUMP (val))
 		    minimum_offset = max (0, XFIXNUM (val));