Mercurial > emacs

changeset 100126:dcdbc6ad9e02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(font_unparse_fcname): Fix use of uninitialized variable.
author Andreas Schwab <schwab@suse.de>
date Tue, 02 Dec 2008 22:47:20 +0000
parents e41ac6b691bb
children ca1811905ee1
files src/ChangeLog src/font.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Dec 02 22:34:12 2008 +0000
+++ b/src/ChangeLog	Tue Dec 02 22:47:20 2008 +0000
@@ -1,5 +1,7 @@
 2008-12-02  Andreas Schwab  <schwab@suse.de>
 
+	* font.c (font_unparse_fcname): Fix use of uninitialized variable.
+
 	* doprnt.c (doprnt1): Fix size of charbuf.
 
 2008-12-02  Chong Yidong  <cyd@stupidchicken.com>
--- a/src/font.c	Tue Dec 02 22:34:12 2008 +0000
+++ b/src/font.c	Tue Dec 02 22:47:20 2008 +0000
@@ -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)))