# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1285721523 -32400
# Node ID b3326b910a0c7789156a26964384e230c18caccf
# Parent  cdab39f6969810b6f36c5e08f33f500f97e3134a
xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property (Bug#7123).

diff -r cdab39f69698 -r b3326b910a0c src/ChangeLog
--- a/src/ChangeLog	Mon Sep 27 14:00:46 2010 +0900
+++ b/src/ChangeLog	Wed Sep 29 09:52:03 2010 +0900
@@ -1,3 +1,8 @@
+2010-09-29  Kenichi Handa  <handa@m17n.org>
+
+	* xfont.c (xfont_open): Fix setting of font->average_width from
+	:avgwidth property (Bug#7123).
+
 2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* xgselect.c (xg_select): Clear file descriptors not set from
diff -r cdab39f69698 -r b3326b910a0c src/xfont.c
--- a/src/xfont.c	Mon Sep 27 14:00:46 2010 +0900
+++ b/src/xfont.c	Wed Sep 29 09:52:03 2010 +0900
@@ -861,7 +861,7 @@
 
       val = Ffont_get (font_object, QCavgwidth);
       if (INTEGERP (val))
-	font->average_width = XINT (val);
+	font->average_width = XINT (val) / 10;
       if (font->average_width < 0)
 	font->average_width = - font->average_width;
       if (font->average_width == 0