From: Po Lu <luangruo@yahoo.com>
Date: Tue, 9 Jul 2024 06:10:07 +0000 (+0800)
Subject: Fix bug#70697 with respect to fringe bitmaps
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41d066d5f9ba06ca3bc8d623cc03e7baf84e4818;p=emacs.git

Fix bug#70697 with respect to fringe bitmaps

* src/pgtkterm.c (pgtk_draw_fringe_bitmap): Always call
`fill_background_by_face' for clearing backgrounds of fringe
bitmaps.  (bug#70697)

(cherry picked from commit 671ad83026e0f9727a809311d43fd7a57403b33b)
---

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 49b7ea406f8..839bfdce988 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -3594,20 +3594,7 @@ pgtk_draw_fringe_bitmap (struct window *w, struct glyph_row *row,
   pgtk_clip_to_row (w, row, ANY_AREA, cr);
 
   if (p->bx >= 0 && !p->overlay_p)
-    {
-      /* In case the same realized face is used for fringes and for
-         something displayed in the text (e.g. face `region' on
-         mono-displays, the fill style may have been changed to
-         FillSolid in pgtk_draw_glyph_string_background.  */
-      if (face->stipple)
-	fill_background_by_face (f, face, p->bx, p->by, p->nx, p->ny);
-      else
-	{
-	  pgtk_set_cr_source_with_color (f, face->background, true);
-	  cairo_rectangle (cr, p->bx, p->by, p->nx, p->ny);
-	  cairo_fill (cr);
-	}
-    }
+    fill_background_by_face (f, face, p->bx, p->by, p->nx, p->ny);
 
   if (p->which
       && p->which < max_fringe_bmp