From f17c527307661519a3eda9941123234236dcf4b3 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 7 Jul 2012 23:39:45 +0200 Subject: [PATCH] * xdisp.c (display_line): Avoid warning about implicit declaration of FRAME_FONT. --- src/ChangeLog | 3 +++ src/xdisp.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index d481d1f1c10..1f81954f2d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-07-07 Andreas Schwab + * 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 87f2e365198..2b2765e7f93 100644 --- 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)) { -- 2.39.2