From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 21 Apr 2006 07:56:33 +0000 (+0000)
Subject: [MAC_OS] (xpm_load_image): Fill in background field
X-Git-Tag: emacs-pretest-22.0.90~3021
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b8ac8420248493a9dbf19aced274492ee030fe0;p=emacs.git

[MAC_OS] (xpm_load_image): Fill in background field
while we have ximg handy.
---

diff --git a/src/image.c b/src/image.c
index 10c402be119..e1962d87b0f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -4460,6 +4460,10 @@ xpm_load_image (f, img, contents, end)
   img->width = width;
   img->height = height;
 
+  /* Maybe fill in the background field while we have ximg handy. */
+  if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
+    IMAGE_BACKGROUND (img, f, ximg);
+
   x_put_x_image (f, ximg, img->pixmap, width, height);
   x_destroy_x_image (ximg);
   if (have_mask)