From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Apr 2011 06:01:50 +0000 (-0700)
Subject: * font.c (font_find_for_lface, Ffont_get_glyphs): Remove unused vars.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~40
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78834453077412b2280d5418259ac99755950d49;p=emacs.git

* font.c (font_find_for_lface, Ffont_get_glyphs): Remove unused vars.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 821e663a311..02cdc170f5c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* font.c (font_find_for_lface, Ffont_get_glyphs): Remove unused vars.
+
 	* fns.c (substring_both): Remove var that is set but not used.
 	(sxhash): Redo loop for clarity and to avoid wraparound warning.
 
diff --git a/src/font.c b/src/font.c
index 6b2e2f2712d..02262e1cb81 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3071,7 +3071,7 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
 {
   Lisp_Object work;
   Lisp_Object frame, entities, val;
-  Lisp_Object size, foundry[3], *family, registry[3], adstyle[3];
+  Lisp_Object foundry[3], *family, registry[3], adstyle[3];
   int pixel_size;
   int i, j, k, l;
 
@@ -3102,7 +3102,6 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
   work = Fcopy_font_spec (spec);
   ASET (work, FONT_TYPE_INDEX, AREF (spec, FONT_TYPE_INDEX));
   XSETFRAME (frame, f);
-  size = AREF (spec, FONT_SIZE_INDEX);
   pixel_size = font_pixel_size (f, spec);
   if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
     {
@@ -4723,10 +4722,9 @@ the corresponding element is nil.  */)
       Lisp_Object g;
       int c = XFASTINT (chars[i]);
       unsigned code;
-      EMACS_INT cod;
       struct font_metrics metrics;
 
-      cod = code = font->driver->encode_char (font, c);
+      code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)
 	continue;
       g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);