master 57753ed761 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Po Lu]

branch: master
commit 57753ed76146c14b69716837083842a9c84d5b09
Merge: d7e1ed17d9 4d1968b4c9
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 src/print.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/print.c b/src/print.c
index 214f1d12c1..9f3d8317ae 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1524,16 +1524,21 @@ print_vectorlike (Lisp_Object obj, Lisp_Object 
printcharfun, bool escapeflag,
     case PVEC_XWIDGET:
 #ifdef HAVE_XWIDGETS
       {
+       if (NILP (XXWIDGET (obj)->buffer))
+         print_c_string ("#<killed xwidget>", printcharfun);
+       else
+         {
 #ifdef USE_GTK
-       int len = sprintf (buf, "#<xwidget %u %p>",
-                          XXWIDGET (obj)->xwidget_id,
-                          XXWIDGET (obj)->widget_osr);
+           int len = sprintf (buf, "#<xwidget %u %p>",
+                              XXWIDGET (obj)->xwidget_id,
+                              XXWIDGET (obj)->widget_osr);
 #else
-       int len = sprintf (buf, "#<xwidget %u %p>",
-                          XXWIDGET (obj)->xwidget_id,
-                          XXWIDGET (obj)->xwWidget);
+           int len = sprintf (buf, "#<xwidget %u %p>",
+                              XXWIDGET (obj)->xwidget_id,
+                              XXWIDGET (obj)->xwWidget);
 #endif
-       strout (buf, len, len, printcharfun);
+           strout (buf, len, len, printcharfun);
+         }
        break;
       }
 #else