* print.c (print_preprocess): Go to a deeper print_depth to avoid

	print_object loop.

diff --git a/src/ChangeLog b/src/ChangeLog
index 90d782faa208efc62cecd909061438fc899f6661..b26416b7839b32e51380faa71db8516018572151 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,13 @@
+2005-12-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * print.c (print_preprocess): Go to a deeper print_depth to avoid
+       print_object loop.
+
 2005-12-14  Kyotaro HORIGUCHI  <horiguti@meadowy.org>  (tiny change)
 
        * coding.c (code_convert_region_unwind): GCPRO arg.
 
+>>>>>>> 1.4762
 2005-12-12  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,

diff --git a/src/print.c b/src/print.c
index d563580ddd3d4bb75a37fdb007fb29d257a268ed..ed6b402763afae9857a62ec3bc27071dba3f7d32 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1313,7 +1313,13 @@ print_preprocess (obj)
 
   /* Give up if we go so deep that print_object will get an error.  */
   /* See similar code in print_object.  */
-  if (print_depth >= PRINT_CIRCLE)
+  /* Because print_preprocess "follows" nested lists in a slightly
+     different order from print_object, there is a risk of giving up
+     too soon.  In that case, a deeply nested circular list may cause
+     print_object to loop.  Using 3 * PRINT_CIRCLE should make this
+     possibility negligible, but at some point someone will have to
+     sit down and do a more careful analysis. -- cyd */
+  if (print_depth >= 3 * PRINT_CIRCLE)
     return;
 
   /* Avoid infinite recursion for circular nested structure