Mercurial > hg > xemacs-beta
comparison src/frame.c @ 5210:23f00bfd78a4
Merge.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Fri, 07 May 2010 14:35:00 +0100 |
parents | 94982b8f9485 |
children | 3889ef128488 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
5208:9fa29ec759e3 | 5210:23f00bfd78a4 |
---|---|
640 printing_unreadable_lisp_object (obj, XSTRING_DATA (frm->name)); | 640 printing_unreadable_lisp_object (obj, XSTRING_DATA (frm->name)); |
641 | 641 |
642 write_fmt_string (printcharfun, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" : | 642 write_fmt_string (printcharfun, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" : |
643 FRAME_TYPE_NAME (frm)); | 643 FRAME_TYPE_NAME (frm)); |
644 print_internal (frm->name, printcharfun, 1); | 644 print_internal (frm->name, printcharfun, 1); |
645 write_ascstring (printcharfun, " on "); | |
646 print_internal (frm->device, printcharfun, 0); | |
645 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); | 647 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); |
646 } | 648 } |
647 | 649 |
648 DEFINE_NODUMP_LISP_OBJECT ("frame", frame, | 650 DEFINE_NODUMP_LISP_OBJECT ("frame", frame, |
649 mark_frame, print_frame, 0, 0, 0, | 651 mark_frame, print_frame, 0, 0, 0, |