From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 27 May 2008 14:12:42 +0000 (+0000)
Subject: Include font.h for --without-x.
X-Git-Tag: emacs-pretest-23.0.90~5264
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5dd5d9eb1aa5d061d1c631f678c1628c9a7225bd;p=emacs.git

Include font.h for --without-x.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 32b8b6bd368..c45801feb09 100644
--- 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 39940ec3f56..9b934c8803d 100644
--- 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)