diff src/lisp.h @ 5180:4cd28c29a7a1

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 22:52:01 -0500
parents 14fda1dbdb26 97eb4942aec8
children a00bfbd64e0a
line wrap: on
line diff
--- a/src/lisp.h	Mon Mar 29 22:47:55 2010 -0500
+++ b/src/lisp.h	Mon Mar 29 22:52:01 2010 -0500
@@ -1546,8 +1546,8 @@
 typedef struct Lisp_Event Lisp_Event; /* "events.h" */
 typedef struct Lisp_Face Lisp_Face;   /* "faces-impl.h" */
 typedef struct Lisp_Process Lisp_Process; /* "procimpl.h" */
-typedef struct Lisp_Color_Instance Lisp_Color_Instance; /* objects-impl.h */
-typedef struct Lisp_Font_Instance Lisp_Font_Instance; /* objects-impl.h */
+typedef struct Lisp_Color_Instance Lisp_Color_Instance; /* fontcolor-impl.h */
+typedef struct Lisp_Font_Instance Lisp_Font_Instance; /* fontcolor-impl.h */
 typedef struct Lisp_Image_Instance Lisp_Image_Instance; /* glyphs.h */
 typedef struct Lisp_Gui_Item Lisp_Gui_Item;