* xfaces.c (face_for_overlay_string): Remove unused local.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9ac301efed06b66ded1cc5d429c63d67b3acbdd5..f65380abf333b3b52811b2abc84a7823aba7620e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,7 @@
 2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * xfaces.c (face_at_buffer_position): Remove unused local.
-       (face_at_buffer_position, face_for_overlay_string):
-       Don't assume buffer size fits in 'int'.
+       * xfaces.c (face_at_buffer_position, face_for_overlay_string):
+       Don't assume buffer size fits in 'int'.  Remove unused local.
 
        Use C99-style 'extern inline' if available.
        * buffer.h (BUFFER_INLINE):

diff --git a/src/xfaces.c b/src/xfaces.c
index d6b9aae09090a9613b31f40f66b848ec2fdfe738..9d264253115dd332550ff3da03132e2279dda3a5 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6144,7 +6144,6 @@ face_for_overlay_string (struct window *w, ptrdiff_t pos,
   struct frame *f = XFRAME (WVAR (w, frame));
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
-  Lisp_Object frame;
   ptrdiff_t endpos;
   Lisp_Object propname = mouse ? Qmouse_face : Qface;
   Lisp_Object limit1, end;
@@ -6154,7 +6153,6 @@ face_for_overlay_string (struct window *w, ptrdiff_t pos,
      to use the frame and buffer of W, but right now it doesn't.  */
   /* eassert (XBUFFER (w->buffer) == current_buffer); */
 
-  XSETFRAME (frame, f);
   XSETFASTINT (position, pos);
 
   endpos = ZV;