diff options
| author | Joakim Verona | 2015-01-31 21:07:07 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-31 21:07:07 +0100 |
| commit | 3fd802081f292b0a3a2fce8394067bbd9ce88f67 (patch) | |
| tree | a04e59d9d6101042d48566a9ae4564a071098197 | |
| parent | ac94737e8d0d4ae737ce15b62c8aab23d759ba72 (diff) | |
| download | emacs-3fd802081f292b0a3a2fce8394067bbd9ce88f67.tar.gz emacs-3fd802081f292b0a3a2fce8394067bbd9ce88f67.zip | |
Fix for crash when displaying xwidget in a tty
Xwidgets are now handled the same as images in the tty case,
they are ignored.
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, | |||
| 5135 | #endif /* not HAVE_WINDOW_SYSTEM */ | 5135 | #endif /* not HAVE_WINDOW_SYSTEM */ |
| 5136 | || (CONSP (value) && EQ (XCAR (value), Qspace)) | 5136 | || (CONSP (value) && EQ (XCAR (value), Qspace)) |
| 5137 | #ifdef HAVE_XWIDGETS | 5137 | #ifdef HAVE_XWIDGETS |
| 5138 | || valid_xwidget_spec_p(value) | 5138 | || ((it ? FRAME_WINDOW_P (it->f) : frame_window_p) |
| 5139 | && valid_xwidget_spec_p(value)) | ||
| 5139 | #endif | 5140 | #endif |
| 5140 | ); | 5141 | ); |
| 5141 | 5142 | ||