2 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e00d388404..c575045c72b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 1999-11-02  Gerd Moellmann  <gerd@gnu.org>
 
+        * xfns.c (QCuser_data): New.
+        (syms_of_xfns): Initialize QCuser_data.
+        (parse_image_spec): Ignore :user-data DATA properties.
+
         * xdisp.c (display_line): Set charpos of first glyph in blank
         lines not corresponding to any text to -1, even if no glyphs are
         filled in in that line.
diff --git a/src/xfns.c b/src/xfns.c
index 7ab5de9c1c7..399da6d6fd9 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5441,7 +5441,7 @@ Lisp_Object Qxbm;
 Lisp_Object QCtype, QCdata, QCascent, QCmargin, QCrelief;
 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
 Lisp_Object QCalgorithm, QCcolor_symbols, QCheuristic_mask;
-Lisp_Object QCindex;
+Lisp_Object QCindex, QCuser_data;
 
 /* Other symbols.  */
 
@@ -5622,6 +5622,10 @@ parse_image_spec (spec, keywords, nkeywords, type, allow_other_keys_p)
       value = XCAR (plist);
       plist = XCDR (plist);
 
+      /* Always ignore :user-data DATA.  */
+      if (EQ (key, QCuser_data))
+        continue;
+
       /* Find key in KEYWORDS.  Error if not found.  */
       for (i = 0; i < nkeywords; ++i)
         if (strcmp (keywords[i].name, XSYMBOL (key)->name->data) == 0)
@@ -10424,6 +10428,8 @@ Each element of the list is a symbol for a supported image type.");
   staticpro (&QCpt_height);
   QCindex = intern (":index");
   staticpro (&QCindex);
+  QCuser_data = intern (":user-data");
+  staticpro (&QCuser_data);
   Qpbm = intern ("pbm");
   staticpro (&Qpbm);