* xdisp.c (display_line): Avoid warning about implicit declaration

of FRAME_FONT.

diff --git a/src/ChangeLog b/src/ChangeLog
index d481d1f1c106f2de54ff1d4a252189aa8c9647eb..1f81954f2d95d737f070b00ed7c5d2e518cb844a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-07  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * xdisp.c (display_line): Avoid warning about implicit declaration
+       of FRAME_FONT.
+
        * frame.c (get_frame_param): Define only if HAVE_WINDOW_SYSTEM.
 
        * lisp.h: Remove empty conditional.

diff --git a/src/xdisp.c b/src/xdisp.c
index 87f2e3651982666269a987d7ecc415c3b882a482..2b2765e7f9379a7b34bd58d6b895cd7198d497fc 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19770,6 +19770,7 @@ display_line (struct it *it)
                      produce_special_glyphs (it, IT_TRUNCATION);
                    }
                }
+#ifdef HAVE_WINDOW_SYSTEM
              else
                {
                  int stretch_width = it->last_visible_x - it->current_x;
@@ -19793,6 +19794,7 @@ display_line (struct it *it)
                    }
                  produce_special_glyphs (it, IT_TRUNCATION);
                }
+#endif
            }
          else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
            {