Mercurial > hg > xemacs-beta
comparison src/objects-impl.h @ 5140:e5380fdaf8f1
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:34 -0600 |
| parents | 7be849cb8828 |
| children |
comparison
equal
deleted
inserted
replaced
| 5139:a48ef26d87ee | 5140:e5380fdaf8f1 |
|---|---|
| 123 * Color Instance Object * | 123 * Color Instance Object * |
| 124 ****************************************************************************/ | 124 ****************************************************************************/ |
| 125 | 125 |
| 126 struct Lisp_Color_Instance | 126 struct Lisp_Color_Instance |
| 127 { | 127 { |
| 128 struct LCRECORD_HEADER header; | 128 NORMAL_LISP_OBJECT_HEADER header; |
| 129 Lisp_Object name; | 129 Lisp_Object name; |
| 130 Lisp_Object device; | 130 Lisp_Object device; |
| 131 | 131 |
| 132 /* See comment in struct console about console variants. */ | 132 /* See comment in struct console about console variants. */ |
| 133 enum console_variant color_instance_type; | 133 enum console_variant color_instance_type; |
| 143 * Font Instance Object * | 143 * Font Instance Object * |
| 144 ****************************************************************************/ | 144 ****************************************************************************/ |
| 145 | 145 |
| 146 struct Lisp_Font_Instance | 146 struct Lisp_Font_Instance |
| 147 { | 147 { |
| 148 struct LCRECORD_HEADER header; | 148 NORMAL_LISP_OBJECT_HEADER header; |
| 149 Lisp_Object name; /* the instantiator used to create the font instance */ | 149 Lisp_Object name; /* the instantiator used to create the font instance */ |
| 150 Lisp_Object truename; /* used by the device-specific methods; we need to | 150 Lisp_Object truename; /* used by the device-specific methods; we need to |
| 151 call them to get the truename (#### in reality, | 151 call them to get the truename (#### in reality, |
| 152 they all probably just store the truename here | 152 they all probably just store the truename here |
| 153 if they know it, and nil otherwise; we should | 153 if they know it, and nil otherwise; we should |
