[Emacs-diffs] /srv/bzr/emacs/trunk r109242: Fix --without-x build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109242
fixes bug: http://debbugs.gnu.org/11742
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-07-28 10:59:34 +0300
message:
  Fix --without-x build.
  
   src/xdisp.c (init_iterator): Don't reference tip_frame in a build
   --without-x.  (Bug#11742)
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-27 20:50:02 +0000
+++ b/src/ChangeLog     2012-07-28 07:59:34 +0000
@@ -1,3 +1,8 @@
+2012-07-28  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (init_iterator): Don't reference tip_frame in a build
+       --without-x.  (Bug#11742)
+
 2012-07-27  Paul Eggert  <address@hidden>
 
        Adjust GDB to reflect pvec_type changes (Bug#12036).

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-27 09:24:34 +0000
+++ b/src/xdisp.c       2012-07-28 07:59:34 +0000
@@ -2736,7 +2736,11 @@
      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)
        {