*** empty log message ***

2 files changed, 12 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index d391ac19b81..1c5bf51b2c4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1375,7 +1375,8 @@ IMAGE is an image specification.
 Image specifications are lists of the form `(image PROPS)' where PROPS
 is a property list whose keys are keyword symbols.  Each
 specifications must contain a property `:type TYPE' with TYPE being a
-symbol specifying the image type, e.g. `xbm'.
+symbol specifying the image type, e.g. `xbm'.  Properties not
+described below are ignored.
 
 The following is a list of properties all image types share.
 
@@ -1418,13 +1419,6 @@ search for the image in `data-directory'.  Some image types support
 building images from data.  When this is done, no `:file' property
 may be present in the image specification.
 
-`:user-data DATA'
-
-This property can be used to store user-defined data along with an
-image specification.  Please note that two image specifications are
-equal only if their user-defined data properties are equal.
-
-
 *** Supported image types
 
 **** XBM, image type `xbm'.
diff --git a/src/ChangeLog b/src/ChangeLog
index 6240729fe15..338f6b86fad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+1999-11-10  Gerd Moellmann  <gerd@gnu.org>
+
+        * xfns.c (QCuser_data): Removed.
+        (syms_of_xfns): Initialization of QCuser_data removed.
+        (parse_image_spec): Don't handle :user-data specially.  Allow
+        unknown keys.  Remove parameter ALLOW_OTHER_KEYS.
+        (xbm_image_p, xbm_load, xpm_image_p, pbm_image_p, png_image_p)
+        (tiff_image_p, jpeg_image_p, gif_image_p, gs_image_p): Call
+        parse_image_spec accordingly.
+
 1999-11-09  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
         * cmds.c (Fbeginning_of_line): Doc fix.