comparison src/mule-charset.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children 78f53ef88e17
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
442 Lisp_Object reg) 442 Lisp_Object reg)
443 { 443 {
444 struct Lisp_Charset *cs; 444 struct Lisp_Charset *cs;
445 Lisp_Object obj = Qnil; 445 Lisp_Object obj = Qnil;
446 446
447 cs = (struct Lisp_Charset *) alloc_lcrecord (sizeof (struct Lisp_Charset), 447 cs = alloc_lcrecord_type (struct Lisp_Charset, lrecord_charset);
448 lrecord_charset);
449 XSETCHARSET (obj, cs); 448 XSETCHARSET (obj, cs);
450 449
451 CHARSET_NAME (cs) = name; 450 CHARSET_NAME (cs) = name;
452 CHARSET_LEADING_BYTE (cs) = leading_byte; 451 CHARSET_LEADING_BYTE (cs) = leading_byte;
453 CHARSET_REP_BYTES (cs) = rep_bytes; 452 CHARSET_REP_BYTES (cs) = rep_bytes;
566 void *charset_list_closure) 565 void *charset_list_closure)
567 { 566 {
568 /* This function can GC */ 567 /* This function can GC */
569 Lisp_Object key, contents; 568 Lisp_Object key, contents;
570 Lisp_Object *charset_list; 569 Lisp_Object *charset_list;
571 struct charset_list_closure *chcl = charset_list_closure; 570 struct charset_list_closure *chcl =
571 (struct charset_list_closure*) charset_list_closure;
572 CVOID_TO_LISP (key, hash_key); 572 CVOID_TO_LISP (key, hash_key);
573 VOID_TO_LISP (contents, hash_contents); 573 VOID_TO_LISP (contents, hash_contents);
574 charset_list = chcl->charset_list; 574 charset_list = chcl->charset_list;
575 575
576 *charset_list = Fcons (XCHARSET_NAME (contents), *charset_list); 576 *charset_list = Fcons (XCHARSET_NAME (contents), *charset_list);