3 files changed, 14 insertions, 11 deletions

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 9c1fc7bef4e..a7c687d811d 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -1328,14 +1328,17 @@ fill_background_by_face (struct frame *f, struct face *face, int x, int y,
                          int width, int height)
 {
   cairo_t *cr = pgtk_begin_cr_clip (f);
+  double r, g, b, a;
 
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_rectangle (cr, x, y, width, height);
   cairo_clip (cr);
 
-  double r = ((face->background >> 16) & 0xff) / 255.0;
-  double g = ((face->background >> 8) & 0xff) / 255.0;
-  double b = ((face->background >> 0) & 0xff) / 255.0;
-  cairo_set_source_rgb (cr, r, g, b);
+  r = ((face->background >> 16) & 0xff) / 255.0;
+  g = ((face->background >> 8) & 0xff) / 255.0;
+  b = ((face->background >> 0) & 0xff) / 255.0;
+  a = f->alpha_background;
+  cairo_set_source_rgba (cr, r, g, b, a);
   cairo_paint (cr);
 
   if (face->stipple != 0)
@@ -1343,10 +1346,10 @@ fill_background_by_face (struct frame *f, struct face *face, int x, int y,
       cairo_pattern_t *mask
         = FRAME_DISPLAY_INFO (f)->bitmaps[face->stipple - 1].pattern;
 
-      double r = ((face->foreground >> 16) & 0xff) / 255.0;
-      double g = ((face->foreground >> 8) & 0xff) / 255.0;
-      double b = ((face->foreground >> 0) & 0xff) / 255.0;
-      cairo_set_source_rgb (cr, r, g, b);
+      r = ((face->foreground >> 16) & 0xff) / 255.0;
+      g = ((face->foreground >> 8) & 0xff) / 255.0;
+      b = ((face->foreground >> 0) & 0xff) / 255.0;
+      cairo_set_source_rgba (cr, r, g, b, a);
       cairo_mask (cr, mask);
     }
 
diff --git a/src/sfntfont.c b/src/sfntfont.c
index 600eac811d5..dbd244e772c 100644
--- a/src/sfntfont.c
+++ b/src/sfntfont.c
@@ -1804,7 +1804,7 @@ sfntfont_desc_to_entity (struct sfnt_font_desc *desc, int instance)
                       AREF (vector, 3));
       FONT_SET_STYLE (entity, FONT_SLANT_INDEX,
                       AREF (vector, 4));
-      ASET (entity, FONT_ADSTYLE_INDEX, AREF (vector, 1));      
+      ASET (entity, FONT_ADSTYLE_INDEX, AREF (vector, 1));
     }
   else
     {
@@ -3192,7 +3192,7 @@ sfntfont_open (struct frame *f, Lisp_Object font_entity,
                           AREF (tem, 3));
           FONT_SET_STYLE (font_object, FONT_SLANT_INDEX,
                           AREF (tem, 4));
-          ASET (font_object, FONT_ADSTYLE_INDEX, Qnil);   
+          ASET (font_object, FONT_ADSTYLE_INDEX, Qnil);
         }
     }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 69aa9bb9c33..d62a8d98317 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15588,7 +15588,7 @@ redisplay_tool_bar (struct frame *f)
                   h = (extra + rows - 1) / rows;
                   extra -= h;
                 }
-          
+
               display_tool_bar_line (&it, height + h);
             }
         }