summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xfont.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 787b3e2f448..65488a6eedd 100644
--- 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 3e0fcd2cd75..8a3cacdd9f5 100644
--- 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;