Mercurial > emacs

changeset 95343:6ea8f16fb374

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include font.h for --without-x.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 27 May 2008 14:12:42 +0000
parents c91624c7baa3
children 02f76f79f115
files src/ChangeLog src/xdisp.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue May 27 08:56:38 2008 +0000
+++ b/src/ChangeLog	Tue May 27 14:12:42 2008 +0000
@@ -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>
 
--- a/src/xdisp.c	Tue May 27 08:56:38 2008 +0000
+++ b/src/xdisp.c	Tue May 27 14:12:42 2008 +0000
@@ -200,9 +200,7 @@
 #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)