comparison src/database.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
215 int UNUSED (escapeflag)) 215 int UNUSED (escapeflag))
216 { 216 {
217 Lisp_Database *db = XDATABASE (obj); 217 Lisp_Database *db = XDATABASE (obj);
218 218
219 if (print_readably) 219 if (print_readably)
220 printing_unreadable_lcrecord (obj, 0); 220 printing_unreadable_lisp_object (obj, 0);
221 221
222 write_fmt_string_lisp (printcharfun, "#<database \"%s\" (%s/%s/", 222 write_fmt_string_lisp (printcharfun, "#<database \"%s\" (%s/%s/",
223 3, db->fname, db->funcs->get_type (db), 223 3, db->fname, db->funcs->get_type (db),
224 db->funcs->get_subtype (db)); 224 db->funcs->get_subtype (db));
225 225
230 230
231 write_fmt_string_lisp (printcharfun, "coding: %s ", 1, 231 write_fmt_string_lisp (printcharfun, "coding: %s ", 1,
232 XSYMBOL_NAME (XCODING_SYSTEM_NAME 232 XSYMBOL_NAME (XCODING_SYSTEM_NAME
233 (db->coding_system))); 233 (db->coding_system)));
234 234
235 write_fmt_string (printcharfun, "0x%x>", db->header.uid); 235 write_fmt_string (printcharfun, "0x%x>", NORMAL_LISP_OBJECT_UID (db));
236 } 236 }
237 237
238 static void 238 static void
239 finalize_database (Lisp_Object obj) 239 finalize_database (Lisp_Object obj)
240 { 240 {