Include font.h for --without-x.

diff --git a/src/ChangeLog b/src/ChangeLog
index 32b8b6bd368d0de42159a7abebc370d82b16e40d..c45801feb0929136d9d216a00d0c39f74441c225 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * xdisp.c [!HAVE_WINDOW_SYSTEM]: Include font.h for --without-x.
+
 2008-05-27  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32font.c (compute_metrics): Rewrite an "else { if () ... else ... }"
@@ -5,8 +9,8 @@
 
 2008-05-27  Jason Rumney  <jasonr@gnu.org>
 
-        * w32font.c (w32font_open_internal): Determine if glyph indices
-        are likely to work here.
+       * w32font.c (w32font_open_internal): Determine if glyph indices
+       are likely to work here.
 
 2008-05-27  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 39940ec3f56e106ccd4490ff0b7613c35a96c8b2..9b934c8803dc1a38ef78e113b76da9de24720edc 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -200,9 +200,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "macterm.h"
 #endif
 
-#ifdef HAVE_WINDOW_SYSTEM
 #include "font.h"
-#endif /* HAVE_WINDOW_SYSTEM */
 
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)