[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget 3fd8020 1/2: Fix for crash when displaying xwidget
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget 3fd8020 1/2: Fix for crash when displaying xwidget in a tty |
Date: |
Sat, 31 Jan 2015 20:09:35 +0000 |
branch: xwidget
commit 3fd802081f292b0a3a2fce8394067bbd9ce88f67
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
Fix for crash when displaying xwidget in a tty
Xwidgets are now handled the same as images in the tty case,
they are ignored.
---
src/xdisp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index 5da611e..d868633 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
);