aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-04-04 22:12:02 -0700
committerPaul Eggert2011-04-04 22:12:02 -0700
commitbc7b66973101bbf8444e60f9f9e46bfc3f6bdab1 (patch)
treece7363ace5b61a693ca0ce4d7dcd26de9c210413
parent27ccc379bfd6d2daa50abba8b2c539f99d9093af (diff)
downloademacs-bc7b66973101bbf8444e60f9f9e46bfc3f6bdab1.tar.gz
emacs-bc7b66973101bbf8444e60f9f9e46bfc3f6bdab1.zip
* xfont.c (xfont_text_extents): Remove var that was set but not used.
-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 @@
12011-04-05 Paul Eggert <eggert@cs.ucla.edu> 12011-04-05 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * xfont.c (xfont_text_extents): Remove var that was set but not used.
4
3 * composite.c (composition_gstring_put_cache): Use unsigned integer. 5 * composite.c (composition_gstring_put_cache): Use unsigned integer.
4 6
52011-04-04 Paul Eggert <eggert@cs.ucla.edu> 72011-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
966{ 966{
967 XFontStruct *xfont = ((struct xfont_info *) font)->xfont; 967 XFontStruct *xfont = ((struct xfont_info *) font)->xfont;
968 int width = 0; 968 int width = 0;
969 int i, first, x; 969 int i, first;
970 970
971 if (metrics) 971 if (metrics)
972 memset (metrics, 0, sizeof (struct font_metrics)); 972 memset (metrics, 0, sizeof (struct font_metrics));
973 for (i = 0, x = 0, first = 1; i < nglyphs; i++) 973 for (i = 0, first = 1; i < nglyphs; i++)
974 { 974 {
975 XChar2b char2b; 975 XChar2b char2b;
976 static XCharStruct *pcm; 976 static XCharStruct *pcm;