--- a/lisp/ChangeLog	Sun Mar 07 00:40:34 2010 +0900
+++ b/lisp/ChangeLog	Sat Mar 06 21:14:08 2010 -0600
@@ -1,3 +1,12 @@
+2010-03-06  Ben Wing  <ben@xemacs.org>
+
+	* test-harness.el:
+	* test-harness.el (test-harness-backtrace): New.
+	* test-harness.el (test-harness-assertion-failure-do-debug):
+	* test-harness.el (test-harness-unexpected-error-do-debug):
+	Use the print settings from edebug.el to make backtraces not
+	be so huge.
+
 2010-03-06  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* bytecomp.el (byte-compile-compiled-obj-to-list):

--- a/lisp/test-harness.el	Sun Mar 07 00:40:34 2010 +0900
+++ b/lisp/test-harness.el	Sat Mar 06 21:14:08 2010 -0600
@@ -194,6 +194,12 @@
     (kill-buffer input-buffer)
     ))
 
+(defsubst test-harness-backtrace ()
+  "Display a reasonable-size backtrace."
+  (let ((print-escape-newlines t)
+	(print-length 50))
+    (backtrace nil t)))
+
 (defsubst test-harness-assertion-failure-do-debug (error-info)
   "Maybe enter debugger or display a backtrace on assertion failure.
 ERROR-INFO is a cons of the args (SIG . DATA) that were passed to `signal'.
@@ -206,7 +212,7 @@
 		test-harness-assertion-failure-enter-debugger)
 	   (funcall debugger 'error error-info))
 	  (test-harness-assertion-failure-show-backtrace
-	   (backtrace nil t)))))
+	   (test-harness-backtrace)))))
 
 (defsubst test-harness-unexpected-error-do-debug (error-info)
   "Maybe enter debugger or display a backtrace on unexpected error.
@@ -220,7 +226,7 @@
 		test-harness-unexpected-error-enter-debugger)
 	   (funcall debugger 'error error-info))
 	  (test-harness-unexpected-error-show-backtrace
-	   (backtrace nil t)))))
+	   (test-harness-backtrace)))))
 
 (defsubst test-harness-unexpected-error-condition-handler (error-info context-msg)
   "Condition handler for when unexpected errors occur.

--- a/src/ChangeLog	Sun Mar 07 00:40:34 2010 +0900
+++ b/src/ChangeLog	Sat Mar 06 21:14:08 2010 -0600
@@ -1,3 +1,8 @@
+2010-03-06  Ben Wing  <ben@xemacs.org>
+
+	* frame.c (change_frame_size_1):
+	Add a comment about where FRAME_PIXWIDTH/FRAME_PIXHEIGHT is set.
+	
 2010-03-05  Ben Wing  <ben@xemacs.org>
 
 	* frame.c:

--- a/src/frame.c	Sun Mar 07 00:40:34 2010 +0900
+++ b/src/frame.c	Sat Mar 06 21:14:08 2010 -0600
@@ -3696,6 +3696,22 @@
     /* Frame has just one top-level window.  */
     set_window_pixheight (FRAME_ROOT_WINDOW (f), paned_pixheight, 0);
 
+  /* Set the value of FRAME_WIDTH/FRAME_HEIGHT and
+     FRAME_CHARWIDTH/FRAME_CHARHEIGHT.
+
+     Question: Where is FRAME_PIXWIDTH/FRAME_PIXHEIGHT set?
+     Answer: In the device-specific code, as a result of a callback from
+     the window system indicating that the frame has changed size.
+     This happens:
+
+     (1) in the WM_SIZE processing in event-msw.c
+     (2) in update_various_frame_slots() called from EmacsFrameResize()
+         (called from Xt when the frame is resized) in EmacsFrame.c for X
+     (3) in resize_event_cb() in frame-gtk.c
+     (4) For TTY's, there is no such callback, so we have to set it
+         ourselves.
+  */
+
   FRAME_HEIGHT (f) = newheight;
   if (FRAME_TTY_P (f))
     f->pixheight = newheight;