# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1203821327 0
# Node ID 7289437eb685895446b2612b1d0d665ecd40edac
# Parent  5377fbc51e470fbff51ec684b5c2f7c9d03dbb37
*** empty log message ***

diff -r 5377fbc51e47 -r 7289437eb685 src/ChangeLog
--- a/src/ChangeLog	Sun Feb 24 02:37:13 2008 +0000
+++ b/src/ChangeLog	Sun Feb 24 02:48:47 2008 +0000
@@ -108,12 +108,10 @@
 	with a face already decided.
 	(x_produce_glyphs): Be sure to set it->ascent and it->descent to
 	non-negative.
-	(x_produce_glyphs): If the composition method is
-	..._WITH_GLYPH_STRING, call font_prepare_composition
-	unconditionally.
-
-	* xfns.c (x_make_gc): Use the default font id of the frame for
-	GCs.
+	(x_produce_glyphs): If the composition method is ..._WITH_GLYPH_STRING,
+	call font_prepare_composition unconditionally.
+
+	* xfns.c (x_make_gc): Use the default font id of the frame for GCs.
 
 	* xterm.h (struct x_display_info): New member font.
 
@@ -126,7 +124,7 @@
 
 	* ftxfont.c (ftxfont_default_fid): Delete it.
 	(ftxfont_open): Set xfont->fid to 0.
-	(ftxfont_end_for_frame): Clear data specifi to the frame and the
+	(ftxfont_end_for_frame): Clear data specific to the frame and the
 	font-driver.
 
 	* xftfont.c (xftfont_default_fid): Delete it.