[SCM] archer-tromey-python: * python/python.c (print_children): Wrap after ",".

[SCM] archer-tromey-python: * python/python.c (print_children): Wrap after ",".

[tromey]

The branch, archer-tromey-python has been updated
       via  7a5b414ecee8a41ec23abf555747f521e7e82c05 (commit)
      from  836057878b4e1c6ca0ccfe6d66e943ad7c79ab14 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 7a5b414ecee8a41ec23abf555747f521e7e82c05
Author: Tom Tromey <tromey@redhat.com>
Date:   Mon Dec 15 10:54:03 2008 -0700

    	* python/python.c (print_children): Wrap after ",".

-----------------------------------------------------------------------

Summary of changes:
 gdb/ChangeLog       |    4 ++++
 gdb/python/python.c |   13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a854c1d..d147835 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-15  Tom Tromey  <tromey@redhat.com>
 
+	* python/python.c (print_children): Wrap after ",".
+
+2008-12-15  Tom Tromey  <tromey@redhat.com>
+
 	* python/python.c (print_children): Respect "set print arrays".
 
 2008-12-15  Thiago Jung Bauermann  <bauerman@br.ibm.com>
diff --git a/gdb/python/python.c b/gdb/python/python.c
index e7c3d7a..9a1d321 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -1092,10 +1092,15 @@ print_children (PyObject *printer, const char *hint,
       else if (! is_map || i % 2 == 0)
 	fputs_filtered (pretty ? "," : ", ", stream);
 
-      if (pretty && (! is_map || i % 2 == 0))
+      if (! is_map || i % 2 == 0)
 	{
-	  fputs_filtered ("\n", stream);
-	  print_spaces_filtered (2 + 2 * recurse, stream);
+	  if (pretty)
+	    {
+	      fputs_filtered ("\n", stream);
+	      print_spaces_filtered (2 + 2 * recurse, stream);
+	    }
+	  else
+	    wrap_here (n_spaces (2 + 2 *recurse));
 	}
 
       if (is_map && i % 2 == 0)
@@ -1132,8 +1137,6 @@ print_children (PyObject *printer, const char *hint,
 
       if (is_map && i % 2 == 0)
 	fputs_filtered ("] = ", stream);
-      else if (! pretty)
-	wrap_here (n_spaces (2 + 2 * recurse));
 
       do_cleanups (inner_cleanup);
     }


hooks/post-receive
--
Repository for Project Archer.