3 files changed, 24 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index f41d227c323..38a8a6b6b7e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2423,6 +2423,15 @@ character units (fractions of the width/height of the frame's default
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f05d56c6cd..7d742e7ffbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 15f88c91a58..00a9f4f426a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.