[Emacs-diffs] emacs/src ChangeLog font.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/12/02 22:47:22

Modified files:
        src            : ChangeLog font.c 

Log message:
        (font_unparse_fcname): Fix use of uninitialized variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7144&r2=1.7145
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7144
retrieving revision 1.7145
diff -u -b -r1.7144 -r1.7145
--- ChangeLog   2 Dec 2008 22:34:12 -0000       1.7144
+++ ChangeLog   2 Dec 2008 22:47:20 -0000       1.7145
@@ -1,5 +1,7 @@
 2008-12-02  Andreas Schwab  <address@hidden>
 
+       * font.c (font_unparse_fcname): Fix use of uninitialized variable.
+
        * doprnt.c (doprnt1): Fix size of charbuf.
 
 2008-12-02  Chong Yidong  <address@hidden>

Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- font.c      1 Dec 2008 20:14:45 -0000       1.92
+++ font.c      2 Dec 2008 22:47:21 -0000       1.93
@@ -1598,7 +1598,6 @@
   Lisp_Object family, foundry;
   Lisp_Object tail, val;
   int point_size;
-  int dpi;
   int i, len = 1;
   char *p;
   Lisp_Object styles[3];
@@ -1653,7 +1652,7 @@
     }
 
   if (INTEGERP (AREF (font, FONT_DPI_INDEX)))
-    len += sprintf (work, ":dpi=%d", dpi);
+    len += sprintf (work, ":dpi=%d", XINT (AREF (font, FONT_DPI_INDEX)));
   if (INTEGERP (AREF (font, FONT_SPACING_INDEX)))
     len += strlen (":spacing=100");
   if (INTEGERP (AREF (font, FONT_AVGWIDTH_INDEX)))