[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100069: xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property (Bug#7123).

[Kenichi Handa]

------------------------------------------------------------
revno: 100069 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-09-29 09:56:45 +0900
message:
  xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth 
property (Bug#7123).
modified:
  src/ChangeLog
  src/xfont.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-28 13:39:22 +0000
+++ b/src/ChangeLog     2010-09-29 00:55:58 +0000
@@ -1,3 +1,8 @@
+2010-09-29  Kenichi Handa  <address@hidden>
+
+       * xfont.c (xfont_open): Fix setting of font->average_width from
+       :avgwidth property (Bug#7123).
+
 2010-09-28  Michael Albinus  <address@hidden>
 
        * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it

=== modified file 'src/xfont.c'
--- a/src/xfont.c       2010-01-13 08:35:10 +0000
+++ b/src/xfont.c       2010-09-29 00:52:03 +0000
@@ -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