Merge from trunk

1 files changed, 6 insertions, 7 deletions

diff --git a/src/print.c b/src/print.c
index 09519d93cfe..01e490dcbad 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1765,9 +1765,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
         }
       else if (WINDOWP (obj))
         {
-          int len;
-          strout ("#<window ", -1, -1, printcharfun);
-          len = sprintf (buf, "%p", XWINDOW (obj));
+          void *ptr = XWINDOW (obj);
+          int len = sprintf (buf, "#<window %p", ptr);
           strout (buf, len, len, printcharfun);
           if (BUFFERP (XWINDOW (obj)->contents))
             {
@@ -1798,6 +1797,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
           ptrdiff_t real_size, size;
           int len;
 #if 0
+          void *ptr = h;
           strout ("#<hash-table", -1, -1, printcharfun);
           if (SYMBOLP (h->test))
             {
@@ -1810,9 +1810,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
               len = sprintf (buf, "%"pD"d/%"pD"d", h->count, ASIZE (h->next));
               strout (buf, len, len, printcharfun);
             }
-          len = sprintf (buf, " %p", h);
+          len = sprintf (buf, " %p>", ptr);
           strout (buf, len, len, printcharfun);
-          PRINTCHAR ('>');
 #endif
           /* Implement a readable output, e.g.:
             #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */
@@ -1892,6 +1891,7 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
       else if (FRAMEP (obj))
         {
           int len;
+          void *ptr = XFRAME (obj);
           Lisp_Object frame_name = XFRAME (obj)->name;
 
           strout ((FRAME_LIVE_P (XFRAME (obj))
@@ -1907,9 +1907,8 @@ print_object (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag)
                 frame_name = build_string ("*INVALID*FRAME*NAME*");
             }
           print_string (frame_name, printcharfun);
-          len = sprintf (buf, " %p", XFRAME (obj));
+          len = sprintf (buf, " %p>", ptr);
           strout (buf, len, len, printcharfun);
-          PRINTCHAR ('>');
         }
       else if (FONTP (obj))
         {