--- a/src/ChangeLog	Sun Nov 04 22:50:59 2007 +0000
+++ b/src/ChangeLog	Mon Nov 05 14:59:24 2007 +0000
@@ -1,16 +1,27 @@
+2007-11-05  Didier Verna  <didier@xemacs.org>
+
+	* glyphs.c (potential_pixmap_file_instanciator): Fix comment
+	describing its behavior.
+	* glyphs.c (xbm_mask_file_munging): Update semantics of file and
+	mask_file arguments to reflect recent changes in
+	potential_pixmap_file_instanciator (see patch below).
+	* glyphs-x.c (autodetect_normalize): Update call to
+	xbm_mask_file_munging to reflect the above change.
+	* glyphs-gtk.c (autodetect_normalize): Ditto.
+
 2007-10-10  Didier Verna  <didier@xemacs.org>
 
-        * glyphs.c (potential_pixmap_file_instantiator): Make a difference
-        between not being able to locate a pixmap file, and not having a
-        console method to do so.
-        * glyphs.c (simple_image_type_normalize): Notice that difference,
-        and don't err when the method is unavailable.
-        * glyphs.c (xbm_normalize): Ditto.
-        * glyphs.c (xface_normalize): Ditto.
-        * glyphs.c (xpm_normalize): Ditto.
-        * glyphs-shared.c (shared_resource_normalize): Ditto.
-        * glyphs-x.c (x_locate_pixmap_file): Recognize ~ pathnames as
-        fully qualified.
+	* glyphs.c (potential_pixmap_file_instantiator): Make a difference
+	between not being able to locate a pixmap file, and not having a
+	console method to do so.
+	* glyphs.c (simple_image_type_normalize): Notice that difference,
+	and don't err when the method is unavailable.
+	* glyphs.c (xbm_normalize): Ditto.
+	* glyphs.c (xface_normalize): Ditto.
+	* glyphs.c (xpm_normalize): Ditto.
+	* glyphs-shared.c (shared_resource_normalize): Ditto.
+	* glyphs-x.c (x_locate_pixmap_file): Recognize ~ pathnames as
+	fully qualified.
 
 2007-10-03  Didier Verna  <didier@xemacs.org>