# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1273239300 -3600
# Node ID 23f00bfd78a4677d45a05baa14dd320017c0ae9c
# Parent  9fa29ec759e3e23b73e1219018051160287002f9# Parent  94982b8f9485370bdba468f085768444d6b52f36
Merge.

diff -r 9fa29ec759e3 -r 23f00bfd78a4 src/ChangeLog
--- a/src/ChangeLog	Thu Apr 29 16:16:47 2010 +0100
+++ b/src/ChangeLog	Fri May 07 14:35:00 2010 +0100
@@ -137,6 +137,12 @@
 	various hash methods with the correct number of arguments, fixing
 	the Win32 build. Thank you Vin.
 
+2010-04-06  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* frame.c (print_frame):
+	When printing a frame, print its device, making the output of
+	#'frame-list a lot more helpful if using gnuclient.
+
 2010-04-04  Ben Wing  <ben@xemacs.org>
 
 	* font-mgr.c:
diff -r 9fa29ec759e3 -r 23f00bfd78a4 src/frame.c
--- a/src/frame.c	Thu Apr 29 16:16:47 2010 +0100
+++ b/src/frame.c	Fri May 07 14:35:00 2010 +0100
@@ -642,6 +642,8 @@
   write_fmt_string (printcharfun, "#<%s-frame ", !FRAME_LIVE_P (frm) ? "dead" :
 		    FRAME_TYPE_NAME (frm));
   print_internal (frm->name, printcharfun, 1);
+  write_ascstring (printcharfun, " on ");
+  print_internal (frm->device, printcharfun, 0);
   write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj));
 }