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  <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 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))
 	    {