comparison src/specifier.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 88bd4f3ef8e4
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
278 Lisp_Specifier *sp = XSPECIFIER (obj); 278 Lisp_Specifier *sp = XSPECIFIER (obj);
279 int count = specpdl_depth (); 279 int count = specpdl_depth ();
280 Lisp_Object the_specs; 280 Lisp_Object the_specs;
281 281
282 if (print_readably) 282 if (print_readably)
283 printing_unreadable_object ("#<%s-specifier 0x%x>", 283 printing_unreadable_object_fmt ("#<%s-specifier 0x%x>",
284 sp->methods->name, sp->header.uid); 284 sp->methods->name, NORMAL_LISP_OBJECT_UID (sp));
285 285
286 write_fmt_string (printcharfun, "#<%s-specifier global=", sp->methods->name); 286 write_fmt_string (printcharfun, "#<%s-specifier global=", sp->methods->name);
287 #if 0 287 #if 0
288 /* #### Not obvious this is useful, and overrides user settings; if we 288 /* #### Not obvious this is useful, and overrides user settings; if we
289 resurrect this, create variables like `print-specifier-length' so it 289 resurrect this, create variables like `print-specifier-length' so it
300 if (!NILP (sp->fallback)) 300 if (!NILP (sp->fallback))
301 { 301 {
302 write_fmt_string_lisp (printcharfun, " fallback=%S", 1, sp->fallback); 302 write_fmt_string_lisp (printcharfun, " fallback=%S", 1, sp->fallback);
303 } 303 }
304 unbind_to (count); 304 unbind_to (count);
305 write_fmt_string (printcharfun, " 0x%x>", sp->header.uid); 305 write_fmt_string (printcharfun, " 0x%x>", NORMAL_LISP_OBJECT_UID (sp));
306 } 306 }
307 307
308 #ifndef NEW_GC 308 #ifndef NEW_GC
309 static void 309 static void
310 finalize_specifier (Lisp_Object obj) 310 finalize_specifier (Lisp_Object obj)