From 770e2e6ed85e3c3fdf1f770ccbcb7f3120370c05 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Fri, 20 Jun 2008 01:53:32 +0000
Subject: * w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'
 for explicit `font' parameters. * frame.c (x_set_font): Remove unexplained
 call to fix inf-recursion.

---
 src/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/ChangeLog')

diff --git a/src/ChangeLog b/src/ChangeLog
index bd8d02017ae..43f9f1f2154 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* w32fns.c, xfnc.c (x_default_font_parameter): Only set `font-param'
+	for explicit `font' parameters.
+
+	* frame.c (x_set_font): Remove unexplained call to fix inf-recursion.
+
 2008-06-19  Kenichi Handa  <handa@m17n.org>
 
 	* frame.c: Include <ctype.h>.
-- 
cgit v1.2.1