From: Joakim Verona <joakim@verona.se>
Date: Sat, 31 Jan 2015 20:07:07 +0000 (+0100)
Subject: Fix for crash when displaying xwidget in a tty
X-Git-Tag: emacs-25.0.90~2574
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fd802081f292b0a3a2fce8394067bbd9ce88f67;p=emacs.git

Fix for crash when displaying xwidget in a tty

Xwidgets are now handled the same as images in the tty case,
they are ignored.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 5da611e0565..d868633e25c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5135,7 +5135,8 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
 #endif /* not HAVE_WINDOW_SYSTEM */
              || (CONSP (value) && EQ (XCAR (value), Qspace))
 #ifdef HAVE_XWIDGETS
-             || valid_xwidget_spec_p(value)
+             || ((it ? FRAME_WINDOW_P (it->f) : frame_window_p)
+		 && valid_xwidget_spec_p(value))
 #endif
              );