# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969031327 0
# Node ID 1c5bd105d7dc7ce158b2198a3aeb1d78a1b5b7f6
# Parent  77a8522f11d4cd06959db86a78575cf836a2b67f
*** empty log message ***

diff -r 77a8522f11d4 -r 1c5bd105d7dc etc/NEWS
--- a/etc/NEWS	Fri Sep 15 15:21:42 2000 +0000
+++ b/etc/NEWS	Fri Sep 15 15:22:07 2000 +0000
@@ -2423,6 +2423,15 @@
 font).  FRAME is the frame on which the image will be displayed.
 FRAME nil or omitted means use the selected frame.
 
+** The function `image-mask-p' can be used to determine if an image
+has a mask bitmap.
+
+- Function: image-mask-p SPEC &optional FRAME
+
+Return t if image SPEC has a mask bitmap.
+FRAME is the frame on which the image will be displayed.  FRAME nil
+or omitted means use the selected frame.
+
 +++
 ** The function `find-image' can be used to find a usable image
 satisfying one of a list of specifications.
diff -r 77a8522f11d4 -r 1c5bd105d7dc lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Sep 15 15:21:42 2000 +0000
+++ b/lisp/ChangeLog	Fri Sep 15 15:22:07 2000 +0000
@@ -1,5 +1,7 @@
 2000-09-15  Gerd Moellmann  <gerd@gnu.org>
 
+	* toolbar/toolbar.el (toolbar-add-item): Use image-mask-p.
+
 	* image.el (create-image): Doc fix.
 
 	* toolbar/toolbar.el (toolbar-add-item): Use `:mask heuristic'
diff -r 77a8522f11d4 -r 1c5bd105d7dc src/ChangeLog
--- a/src/ChangeLog	Fri Sep 15 15:21:42 2000 +0000
+++ b/src/ChangeLog	Fri Sep 15 15:22:07 2000 +0000
@@ -1,5 +1,18 @@
 2000-09-15  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfns.c (ALLOC_XPM_COLORS): Define if we can use Emacs' color
+	allocation functions with the XPM lib.
+	(struct xpm_cached_color) [ALLOC_XPM_COLORS]: New structure.
+	(XPM_COLOR_CACHE_BUCKETS) [ALLOC_XPM_COLORS]: New macro.
+	(xpm_color_cache) [ALLOC_XPM_COLORS]: New variable.
+	(xpm_init_color_cache, xpm_free_color_cache, xpm_lookup_color)
+	(xpm_alloc_color, xpm_free_colors) [ALLOC_XPM_COLORS]: New
+	functions.
+	(xpm_load) [ALLOC_XPM_COLORS]: Use Emacs' own color allocation
+	functions, if possible, because these handle color allocation
+	failure more gracefully.
+	(Fimage_mask_p): New function.
+
 	* xfns.c (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
 	(Qedge_detection, Qheuristic): New symbols.
 	(syms_of_xfns): Initialize new symbols.