[Emacs-diffs] Changes to emacs/src/xfns.c

[Dave Love]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.577 emacs/src/xfns.c:1.578
*** emacs/src/xfns.c:1.577      Mon Mar 31 15:36:21 2003
--- emacs/src/xfns.c    Tue Apr  1 05:04:38 2003
***************
*** 1,5 ****
  /* Functions for the X window system.
!    Copyright (C) 1989, 92, 93, 94, 95, 96, 1997, 1998, 1999, 2000, 2001
       Free Software Foundation.
  
  This file is part of GNU Emacs.
--- 1,5 ----
  /* Functions for the X window system.
!    Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
       Free Software Foundation.
  
  This file is part of GNU Emacs.
***************
*** 6244,6249 ****
--- 6244,6257 ----
      {
        color->pixel = lookup_rgb_color (f, color->red, color->green,
                                       color->blue);
+       p = xpm_cache_color (f, color_name, color, h);
+     }
+   /* You get `opaque' at least from ImageMagick converting pbm to xpm
+      with transparency, and it's useful.  */
+   else if (strcmp ("opaque", color_name) == 0)
+     {
+       bzero (color, sizeof (XColor));  /* Is this necessary/correct?  */
+       color->pixel = FRAME_FOREGROUND_PIXEL (f);
        p = xpm_cache_color (f, color_name, color, h);
      }