Mercurial > hg > xemacs-beta
diff src/device.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | 623d57b7fbe8 ae48681c47fa |
children | a9c41067dd88 |
line wrap: on
line diff
--- a/src/device.c Wed Jan 20 07:05:57 2010 -0600 +++ b/src/device.c Wed Feb 24 01:58:04 2010 -0600 @@ -160,8 +160,7 @@ struct device *d = XDEVICE (obj); if (print_readably) - printing_unreadable_object ("#<device %s 0x%x>", - XSTRING_DATA (d->name), d->header.uid); + printing_unreadable_lcrecord (obj, XSTRING_DATA (d->name)); write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" : DEVICE_TYPE_NAME (d)); @@ -751,7 +750,7 @@ { Lisp_Object device; - device = VOID_TO_LISP (closure); + device = GET_LISP_FROM_VOID (closure); if (FRAME_MINIBUF_ONLY_P (XFRAME (frame))) return 0; if (EQ (device, FRAME_DEVICE (XFRAME (frame)))) @@ -763,7 +762,7 @@ find_nonminibuffer_frame_not_on_device (Lisp_Object device) { return find_some_frame (find_nonminibuffer_frame_not_on_device_predicate, - LISP_TO_VOID (device)); + STORE_LISP_IN_VOID (device)); }