Mercurial > hg > xemacs-beta
comparison src/mule-charset.c @ 5117:3742ea8250b5 ben-lisp-object ben-lisp-object-final-ws-year-2005
Checking in final CVS version of workspace 'ben-lisp-object'
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 26 Dec 2009 00:20:27 -0600 |
parents | facf3239ba30 |
children | e0db3c197671 |
comparison
equal
deleted
inserted
replaced
5116:e56f73345619 | 5117:3742ea8250b5 |
---|---|
177 { XD_UNION, offsetof (Lisp_Charset, from_unicode_table), | 177 { XD_UNION, offsetof (Lisp_Charset, from_unicode_table), |
178 XD_INDIRECT (1, 0), { &from_unicode_description }, XD_FLAG_NO_KKCC }, | 178 XD_INDIRECT (1, 0), { &from_unicode_description }, XD_FLAG_NO_KKCC }, |
179 { XD_END } | 179 { XD_END } |
180 }; | 180 }; |
181 | 181 |
182 DEFINE_LRECORD_IMPLEMENTATION ("charset", charset, | 182 DEFINE_LISP_OBJECT ("charset", charset, |
183 1, /* dumpable flag */ | 183 mark_charset, print_charset, 0, |
184 mark_charset, print_charset, 0, | |
185 0, 0, charset_description, Lisp_Charset); | 184 0, 0, charset_description, Lisp_Charset); |
186 /* Make a new charset. */ | 185 /* Make a new charset. */ |
187 /* #### SJT Should generic properties be allowed? */ | 186 /* #### SJT Should generic properties be allowed? */ |
188 static Lisp_Object | 187 static Lisp_Object |
189 make_charset (int id, Lisp_Object name, int rep_bytes, | 188 make_charset (int id, Lisp_Object name, int rep_bytes, |
195 Lisp_Object obj; | 194 Lisp_Object obj; |
196 Lisp_Charset *cs; | 195 Lisp_Charset *cs; |
197 | 196 |
198 if (!overwrite) | 197 if (!overwrite) |
199 { | 198 { |
200 cs = ALLOC_LCRECORD_TYPE (Lisp_Charset, &lrecord_charset); | 199 obj = ALLOC_LISP_OBJECT (charset); |
201 obj = wrap_charset (cs); | 200 cs = XCHARSET (obj); |
202 | 201 |
203 if (final) | 202 if (final) |
204 { | 203 { |
205 /* some charsets do not have final characters. This includes | 204 /* some charsets do not have final characters. This includes |
206 ASCII, Control-1, Composite, and the two faux private | 205 ASCII, Control-1, Composite, and the two faux private |
931 /************************************************************************/ | 930 /************************************************************************/ |
932 | 931 |
933 void | 932 void |
934 syms_of_mule_charset (void) | 933 syms_of_mule_charset (void) |
935 { | 934 { |
936 INIT_LRECORD_IMPLEMENTATION (charset); | 935 INIT_LISP_OBJECT (charset); |
937 | 936 |
938 DEFSUBR (Fcharsetp); | 937 DEFSUBR (Fcharsetp); |
939 DEFSUBR (Ffind_charset); | 938 DEFSUBR (Ffind_charset); |
940 DEFSUBR (Fget_charset); | 939 DEFSUBR (Fget_charset); |
941 DEFSUBR (Fcharset_list); | 940 DEFSUBR (Fcharset_list); |