upstream

[gnu-emacs] / src / print.c

diff --git a/src/print.c b/src/print.c
index 40e0fb6b8558e30ad62ebabd2a73748b8574d151..c5c03274f77e636564c3082c0301a09ed6143241 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -36,7 +36,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "termhooks.h"         /* For struct terminal.  */
 #include "font.h"
-
+#ifdef HAVE_XWIDGETS
+#include "xwidget.h"
+#endif
 Lisp_Object Qstandard_output;
 
 static Lisp_Object Qtemp_buffer_setup_hook;
@@ -1763,6 +1765,13 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
          strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun);
          PRINTCHAR ('>');
        }
+#ifdef HAVE_XWIDGETS
+      else if (XXWIDGETP (obj))
+       {
+         strout ("#<xwidget ", -1, -1, printcharfun);
+         PRINTCHAR ('>');
+       }
+#endif      
       else if (WINDOWP (obj))
        {
          strout ("#<window ", -1, -1, printcharfun);
@@ -2149,7 +2158,7 @@ shared once again when the text is read back.  */);
   Vprint_gensym = Qnil;
 
   DEFVAR_LISP ("print-circle", Vprint_circle,
-              doc: /* *Non-nil means print recursive structures using #N= and #N# syntax.
+              doc: /* Non-nil means print recursive structures using #N= and #N# syntax.
 If nil, printing proceeds recursively and may lead to
 `max-lisp-eval-depth' being exceeded or an error may occur:
 \"Apparently circular structure being printed.\"  Also see
@@ -2161,7 +2170,7 @@ where N is a positive decimal integer.  */);
   Vprint_circle = Qnil;
 
   DEFVAR_LISP ("print-continuous-numbering", Vprint_continuous_numbering,
-              doc: /* *Non-nil means number continuously across print calls.
+              doc: /* Non-nil means number continuously across print calls.
 This affects the numbers printed for #N= labels and #M# references.
 See also `print-circle', `print-gensym', and `print-number-table'.
 This variable should not be set with `setq'; bind it with a `let' instead.  */);