Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-330

2 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fe6031f5a3f..154143c44b6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xfaces.c (face_at_buffer_position): Remove unused vars.
+
 2008-02-01  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * ccl.c (CCL_WRITE_CHAR): Fix overflow checking.
diff --git a/src/xfaces.c b/src/xfaces.c
index 4f3509ebd30..c00dade631b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -8220,8 +8220,6 @@ face_for_overlay_string (w, pos, region_beg, region_end,
   struct frame *f = XFRAME (w->frame);
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
-  int i, noverlays;
-  Lisp_Object *overlay_vec;
   Lisp_Object frame;
   int endpos;
   Lisp_Object propname = mouse ? Qmouse_face : Qface;