Mercurial > hg > xemacs-beta

comparison src/objects.c @ 5143:186aebf7f6c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
102 print_color_instance (Lisp_Object obj, Lisp_Object printcharfun, 102 print_color_instance (Lisp_Object obj, Lisp_Object printcharfun,
103 int escapeflag) 103 int escapeflag)
104 { 104 {
105 Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj); 105 Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
106 if (print_readably) 106 if (print_readably)
107 printing_unreadable_lcrecord (obj, 0); 107 printing_unreadable_lisp_object (obj, 0);
108 write_fmt_string_lisp (printcharfun, "#<color-instance %s", 1, c->name); 108 write_fmt_string_lisp (printcharfun, "#<color-instance %s", 1, c->name);
109 write_fmt_string_lisp (printcharfun, " on %s", 1, c->device); 109 write_fmt_string_lisp (printcharfun, " on %s", 1, c->device);
110 if (!NILP (c->device)) /* Vthe_null_color_instance */ 110 if (!NILP (c->device)) /* Vthe_null_color_instance */
111 MAYBE_DEVMETH (XDEVICE (c->device), print_color_instance, 111 MAYBE_DEVMETH (XDEVICE (c->device), print_color_instance,
112 (c, printcharfun, escapeflag)); 112 (c, printcharfun, escapeflag));
113 write_fmt_string (printcharfun, " 0x%x>", c->header.uid); 113 write_fmt_string (printcharfun, " 0x%x>", NORMAL_LISP_OBJECT_UID (c));
114 } 114 }
115 115
116 static void 116 static void
117 finalize_color_instance (Lisp_Object obj) 117 finalize_color_instance (Lisp_Object obj)
118 { 118 {
317 static void 317 static void
318 print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) 318 print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
319 { 319 {
320 Lisp_Font_Instance *f = XFONT_INSTANCE (obj); 320 Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
321 if (print_readably) 321 if (print_readably)
322 printing_unreadable_lcrecord (obj, 0); 322 printing_unreadable_lisp_object (obj, 0);
323 write_fmt_string_lisp (printcharfun, "#<font-instance %S", 1, f->name); 323 write_fmt_string_lisp (printcharfun, "#<font-instance %S", 1, f->name);
324 write_fmt_string_lisp (printcharfun, " on %s", 1, f->device); 324 write_fmt_string_lisp (printcharfun, " on %s", 1, f->device);
325 if (!NILP (f->device)) 325 if (!NILP (f->device))
326 { 326 {
327 MAYBE_DEVMETH (XDEVICE (f->device), print_font_instance, 327 MAYBE_DEVMETH (XDEVICE (f->device), print_font_instance,
328 (f, printcharfun, escapeflag)); 328 (f, printcharfun, escapeflag));
329 329
330 } 330 }
331 write_fmt_string (printcharfun, " 0x%x>", f->header.uid); 331 write_fmt_string (printcharfun, " 0x%x>", NORMAL_LISP_OBJECT_UID (f));
332 } 332 }
333 333
334 static void 334 static void
335 finalize_font_instance (Lisp_Object obj) 335 finalize_font_instance (Lisp_Object obj)
336 { 336 {