* xfont.c (xfont_text_extents): Remove var that was set but not used.

diff --git a/src/ChangeLog b/src/ChangeLog
index 787b3e2f44809569745a266a1228bfb587048d18..65488a6eeddf57c7516b2f08fcc3ce360cfb76e1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xfont.c (xfont_text_extents): Remove var that was set but not used.
+
        * composite.c (composition_gstring_put_cache): Use unsigned integer.
 
 2011-04-04  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/xfont.c b/src/xfont.c
index 3e0fcd2cd7506df66e95df288ea58ef457f7f9ce..8a3cacdd9f5406e1c20ce3975893b3ca40e8dae4 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -966,11 +966,11 @@ xfont_text_extents (struct font *font, unsigned int *code, int nglyphs, struct f
 {
   XFontStruct *xfont = ((struct xfont_info *) font)->xfont;
   int width = 0;
-  int i, first, x;
+  int i, first;
 
   if (metrics)
     memset (metrics, 0, sizeof (struct font_metrics));
-  for (i = 0, x = 0, first = 1; i < nglyphs; i++)
+  for (i = 0, first = 1; i < nglyphs; i++)
     {
       XChar2b char2b;
       static XCharStruct *pcm;