From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 28 Jul 2012 07:59:34 +0000 (+0300)
Subject: Fix --without-x build.
X-Git-Tag: emacs-24.2.90~1047
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df81cd291bc12c494fdeaeb7849ad7ef754dbbc1;p=emacs.git

Fix --without-x build.

 src/xdisp.c (init_iterator): Don't reference tip_frame in a build
 --without-x.  (Bug#11742)
---

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  <eliz@gnu.org>
+
+	* xdisp.c (init_iterator): Don't reference tip_frame in a build
+	--without-x.  (Bug#11742)
+
 2012-07-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	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)
 	{