[COMMIT] Print multiple values with #<INTERNAL OBJECT (XEmacs bug?) ...>, too

[Aidan Kehoe]

APPROVE COMMIT

NOTE: This patch has been committed.

# HG changeset patch
# User Aidan Kehoe <kehoea at parhasard.net>
# Date 1267536051 0
# Node ID 47bcef7b0b44d8888c1ab66120fa3d6c0b8e9e85
# Parent  1ee30d3f9dd0ba716661dbebeb7ebf71d3eca3ba
Print multiple values with #<INTERNAL OBJECT (XEmacs bug?) ...>, too

2010-03-02  Aidan Kehoe  <kehoea at parhasard.net>

	* eval.c (print_multiple_value):
	Say #<INTERNAL OBJECT (XEmacs bug?) ...> when printing these, for
	consistency with the rest of the print code.

diff -r 1ee30d3f9dd0 -r 47bcef7b0b44 src/ChangeLog
--- a/src/ChangeLog	Tue Mar 02 13:02:36 2010 +0000
+++ b/src/ChangeLog	Tue Mar 02 13:20:51 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-02  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* eval.c (print_multiple_value):
+	Say #<INTERNAL OBJECT (XEmacs bug?) ...> when printing these, for
+	consistency with the rest of the print code.
+
 2010-03-01  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* lisp.h (PARSE_KEYWORDS): New macro, for parsing keyword
diff -r 1ee30d3f9dd0 -r 47bcef7b0b44 src/eval.c
--- a/src/eval.c	Tue Mar 02 13:02:36 2010 +0000
+++ b/src/eval.c	Tue Mar 02 13:20:51 2010 +0000
@@ -4608,10 +4608,9 @@
       printing_unreadable_object ("multiple values");
     }
 
-  if (0 == count)
-    {
-      write_msg_string (printcharfun, "#<zero-length multiple value>");
-    }
+  write_fmt_string (printcharfun,
+                    "#<INTERNAL OBJECT (XEmacs bug?) %d multiple values,"
+                    " data (", count);
 
   for (index = 0; index < count;)
     {
@@ -4632,9 +4631,11 @@
 
       if (count > 1 && index < count)
         {
-          write_ascstring (printcharfun, " ;\n");
-        }
-    }
+          write_ascstring (printcharfun, " ");
+        }
+    }
+
+  write_fmt_string (printcharfun, ") 0x%lx>", (unsigned long) XPNTR (obj));
 }
 
 static Lisp_Object


-- 
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
  -- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research