Commit f17c5273 authored by Andreas Schwab's avatar Andreas Schwab

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

of FRAME_FONT.
parent 298819b9
2012-07-07 Andreas Schwab <schwab@linux-m68k.org> 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. * frame.c (get_frame_param): Define only if HAVE_WINDOW_SYSTEM.
* lisp.h: Remove empty conditional. * lisp.h: Remove empty conditional.
......
...@@ -19770,6 +19770,7 @@ display_line (struct it *it) ...@@ -19770,6 +19770,7 @@ display_line (struct it *it)
produce_special_glyphs (it, IT_TRUNCATION); produce_special_glyphs (it, IT_TRUNCATION);
} }
} }
#ifdef HAVE_WINDOW_SYSTEM
else else
{ {
int stretch_width = it->last_visible_x - it->current_x; int stretch_width = it->last_visible_x - it->current_x;
...@@ -19793,6 +19794,7 @@ display_line (struct it *it) ...@@ -19793,6 +19794,7 @@ display_line (struct it *it)
} }
produce_special_glyphs (it, IT_TRUNCATION); produce_special_glyphs (it, IT_TRUNCATION);
} }
#endif
} }
else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)) else if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment