Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 327:03446687b7cc r21-0-61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0-61
author cvs
date Mon, 13 Aug 2007 10:48:16 +0200
parents 33bdb3d4b97f
children 7347b34c275b
line wrap: on
line diff
--- a/src/glyphs.c	Mon Aug 13 10:47:36 2007 +0200
+++ b/src/glyphs.c	Mon Aug 13 10:48:16 2007 +0200
@@ -466,8 +466,12 @@
 			      Lisp_Object contype,
 			      Lisp_Object dest_mask)
 {
+  struct gcpro gcpro1;
+  
+  GCPRO1(instantiator);
+
   if (IMAGE_INSTANCEP (instantiator))
-    return instantiator;
+    RETURN_UNGCPRO (instantiator);
 
   if (STRINGP (instantiator))
     instantiator = process_image_string_instantiator (instantiator, contype,
@@ -484,9 +488,9 @@
     struct image_instantiator_methods * meths =
       decode_image_instantiator_format (XVECTOR_DATA (instantiator)[0],
 					ERROR_ME);
-    return IIFORMAT_METH_OR_GIVEN (meths, normalize,
+    RETURN_UNGCPRO (IIFORMAT_METH_OR_GIVEN (meths, normalize,
 				   (instantiator, contype),
-				   instantiator);
+				   instantiator));
   }
 }