aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-09-16 14:18:00 -0700
committerPaul Eggert2012-09-16 14:18:00 -0700
commit634b8cacd6cc0557c1963ad7409db247963046d2 (patch)
tree9a32535e723a40abf63024c2ef48485a809db20b /src
parent518650a581ac8716801ae17cc39d83db672ffa2a (diff)
downloademacs-634b8cacd6cc0557c1963ad7409db247963046d2.tar.gz
emacs-634b8cacd6cc0557c1963ad7409db247963046d2.zip
* font.c (Ffont_shape_gstring): Remove unused local.
Diffstat (limited to 'src')
-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 @@
12012-09-16 Paul Eggert <eggert@cs.ucla.edu>
2
3 * font.c (Ffont_shape_gstring): Remove unused local.
4
12012-09-16 Glenn Morris <rgm@gnu.org> 52012-09-16 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (clean): No longer run nextstep's clean. 7 * 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. */)
4303{ 4303{
4304 struct font *font; 4304 struct font *font;
4305 Lisp_Object font_object, n, glyph; 4305 Lisp_Object font_object, n, glyph;
4306 ptrdiff_t i, j, from, to; 4306 ptrdiff_t i, from, to;
4307 4307
4308 if (! composition_gstring_p (gstring)) 4308 if (! composition_gstring_p (gstring))
4309 signal_error ("Invalid glyph-string: ", gstring); 4309 signal_error ("Invalid glyph-string: ", gstring);