comparison 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
comparison
equal deleted inserted replaced
5124:623d57b7fbe8 5125:b5df3737028a
158 int UNUSED (escapeflag)) 158 int UNUSED (escapeflag))
159 { 159 {
160 struct device *d = XDEVICE (obj); 160 struct device *d = XDEVICE (obj);
161 161
162 if (print_readably) 162 if (print_readably)
163 printing_unreadable_object ("#<device %s 0x%x>", 163 printing_unreadable_lcrecord (obj, XSTRING_DATA (d->name));
164 XSTRING_DATA (d->name), d->header.uid);
165 164
166 write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" : 165 write_fmt_string (printcharfun, "#<%s-device", !DEVICE_LIVE_P (d) ? "dead" :
167 DEVICE_TYPE_NAME (d)); 166 DEVICE_TYPE_NAME (d));
168 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d))) 167 if (DEVICE_LIVE_P (d) && !NILP (DEVICE_CONNECTION (d)))
169 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d)); 168 write_fmt_string_lisp (printcharfun, " on %S", 1, DEVICE_CONNECTION (d));
749 find_nonminibuffer_frame_not_on_device_predicate (Lisp_Object frame, 748 find_nonminibuffer_frame_not_on_device_predicate (Lisp_Object frame,
750 void *closure) 749 void *closure)
751 { 750 {
752 Lisp_Object device; 751 Lisp_Object device;
753 752
754 device = VOID_TO_LISP (closure); 753 device = GET_LISP_FROM_VOID (closure);
755 if (FRAME_MINIBUF_ONLY_P (XFRAME (frame))) 754 if (FRAME_MINIBUF_ONLY_P (XFRAME (frame)))
756 return 0; 755 return 0;
757 if (EQ (device, FRAME_DEVICE (XFRAME (frame)))) 756 if (EQ (device, FRAME_DEVICE (XFRAME (frame))))
758 return 0; 757 return 0;
759 return 1; 758 return 1;
761 760
762 Lisp_Object 761 Lisp_Object
763 find_nonminibuffer_frame_not_on_device (Lisp_Object device) 762 find_nonminibuffer_frame_not_on_device (Lisp_Object device)
764 { 763 {
765 return find_some_frame (find_nonminibuffer_frame_not_on_device_predicate, 764 return find_some_frame (find_nonminibuffer_frame_not_on_device_predicate,
766 LISP_TO_VOID (device)); 765 STORE_LISP_IN_VOID (device));
767 } 766 }
768 767
769 768
770 /* Delete device D. 769 /* Delete device D.
771 770