comparison src/data.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 6c6d78781d59
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
2612 static void 2612 static void
2613 print_weak_list (Lisp_Object obj, Lisp_Object printcharfun, 2613 print_weak_list (Lisp_Object obj, Lisp_Object printcharfun,
2614 int UNUSED (escapeflag)) 2614 int UNUSED (escapeflag))
2615 { 2615 {
2616 if (print_readably) 2616 if (print_readably)
2617 printing_unreadable_lcrecord (obj, 0); 2617 printing_unreadable_lisp_object (obj, 0);
2618 2618
2619 write_fmt_string_lisp (printcharfun, "#<weak-list %s %S>", 2, 2619 write_fmt_string_lisp (printcharfun, "#<weak-list %s %S>", 2,
2620 encode_weak_list_type (XWEAK_LIST (obj)->type), 2620 encode_weak_list_type (XWEAK_LIST (obj)->type),
2621 XWEAK_LIST (obj)->list); 2621 XWEAK_LIST (obj)->list);
2622 } 2622 }
3088 static void 3088 static void
3089 print_weak_box (Lisp_Object obj, Lisp_Object printcharfun, 3089 print_weak_box (Lisp_Object obj, Lisp_Object printcharfun,
3090 int UNUSED (escapeflag)) 3090 int UNUSED (escapeflag))
3091 { 3091 {
3092 if (print_readably) 3092 if (print_readably)
3093 printing_unreadable_lcrecord (obj, 0); 3093 printing_unreadable_lisp_object (obj, 0);
3094 write_fmt_string (printcharfun, "#<weak-box>"); /* #### fix */ 3094 write_fmt_string (printcharfun, "#<weak-box>"); /* #### fix */
3095 } 3095 }
3096 3096
3097 static int 3097 static int
3098 weak_box_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 3098 weak_box_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)
3310 static void 3310 static void
3311 print_ephemeron (Lisp_Object obj, Lisp_Object printcharfun, 3311 print_ephemeron (Lisp_Object obj, Lisp_Object printcharfun,
3312 int UNUSED (escapeflag)) 3312 int UNUSED (escapeflag))
3313 { 3313 {
3314 if (print_readably) 3314 if (print_readably)
3315 printing_unreadable_lcrecord (obj, 0); 3315 printing_unreadable_lisp_object (obj, 0);
3316 write_fmt_string (printcharfun, "#<ephemeron>"); /* #### fix */ 3316 write_fmt_string (printcharfun, "#<ephemeron>"); /* #### fix */
3317 } 3317 }
3318 3318
3319 static int 3319 static int
3320 ephemeron_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) 3320 ephemeron_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase)