From df81cd291bc12c494fdeaeb7849ad7ef754dbbc1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Jul 2012 10:59:34 +0300 Subject: [PATCH] Fix --without-x build. src/xdisp.c (init_iterator): Don't reference tip_frame in a build --without-x. (Bug#11742) --- src/ChangeLog | 5 +++++ src/xdisp.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 42b92de5c26..8d0e7caf4ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-28 Eli Zaretskii + + * xdisp.c (init_iterator): Don't reference tip_frame in a build + --without-x. (Bug#11742) + 2012-07-27 Paul Eggert Adjust GDB to reflect pvec_type changes (Bug#12036). diff --git a/src/xdisp.c b/src/xdisp.c index ecb9f0d50c9..a11b117f067 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2736,7 +2736,11 @@ init_iterator (struct it *it, struct window *w, frames when the fringes are turned off. But leave the dimensions zero for tooltip frames, as these glyphs look ugly there and also sabotage calculations of tooltip dimensions in x-show-tip. */ - if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame))) +#ifdef HAVE_WINDOW_SYSTEM + if (!(FRAME_WINDOW_P (it->f) + && FRAMEP (tip_frame) + && it->f == XFRAME (tip_frame))) +#endif { if (it->line_wrap == TRUNCATE) { -- 2.39.2