master 3f0f0712da3: Merge from savannah/emacs-30

[Andrea Corallo]

branch: master
commit 3f0f0712da30f97a029e38b9506b66f177be562c
Merge: d883f9a1f35 671ad83026e
Author: Andrea Corallo <acorallo@gnu.org>
Commit: Andrea Corallo <acorallo@gnu.org>

    Merge from savannah/emacs-30
    
    671ad83026e Fix bug#70697 with respect to fringe bitmaps
    15c591bad62 Fix byte-compiler warning in calc.el
    
    # Conflicts:
    #       lisp/calc/calc.el
---
 lisp/calc/calc.el |  3 +--
 src/pgtkterm.c    | 15 +--------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 8b2277e5973..f92e4958e33 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -341,8 +341,7 @@ See calc-embedded-open-plain."
 
 (defcustom calc-embedded-open-close-new-formula-alist
   nil
-  "Alist of major modes with pairs of new formula delimiters used by
-`calc-embedded'."
+  "Alist of major modes with pairs of new formula delimiters used by 
calc-embedded."
   :type '(alist :key-type (symbol :tag "Major mode")
                 :value-type (list (string :tag "Opening new formula delimiter")
                                   (string :tag "Closing new formula 
delimiter"))))
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