summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 99921577b07..32cd7b3e813 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-16 Paul Eggert <eggert@cs.ucla.edu>
+
+ * font.c (Ffont_shape_gstring): Remove unused local.
+
2012-09-16 Glenn Morris <rgm@gnu.org>
* Makefile.in (clean): No longer run nextstep's clean.
diff --git a/src/font.c b/src/font.c
index fc970254a62..1f22fee88ee 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4303,7 +4303,7 @@ GSTRING. */)
{
struct font *font;
Lisp_Object font_object, n, glyph;
- ptrdiff_t i, j, from, to;
+ ptrdiff_t i, from, to;
if (! composition_gstring_p (gstring))
signal_error ("Invalid glyph-string: ", gstring);