[Emacs-diffs] Changes to emacs/src/ChangeLog

[Chong Yidong]

Index: emacs/src/ChangeLog
diff -u emacs/src/ChangeLog:1.4762 emacs/src/ChangeLog:1.4763
--- emacs/src/ChangeLog:1.4762  Wed Dec 14 00:43:36 2005
+++ emacs/src/ChangeLog Wed Dec 14 20:49:46 2005
@@ -1,7 +1,13 @@
+2005-12-14  Chong Yidong  <address@hidden>
+
+       * print.c (print_preprocess): Go to a deeper print_depth to avoid
+       print_object loop.
+
 2005-12-14  Kyotaro HORIGUCHI  <address@hidden>  (tiny change)
 
        * coding.c (code_convert_region_unwind): GCPRO arg.
 
+>>>>>>> 1.4762
 2005-12-12  Jan Dj,Ad(Brv  <address@hidden>
 
        * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,