[Emacs-diffs] /srv/bzr/emacs/trunk r109397: * xfaces.c (face_for_overlay_string): Remove unused local.

[Paul Eggert]

------------------------------------------------------------
revno: 109397
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-08-02 02:33:13 -0700
message:
  * xfaces.c (face_for_overlay_string): Remove unused local.
modified:
  src/ChangeLog
  src/xfaces.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-02 09:20:01 +0000
+++ b/src/ChangeLog     2012-08-02 09:33:13 +0000
@@ -1,8 +1,7 @@
 2012-08-02  Paul Eggert  <address@hidden>
 
-       * 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):

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2012-08-02 09:20:01 +0000
+++ b/src/xfaces.c      2012-08-02 09:33:13 +0000
@@ -6144,7 +6144,6 @@
   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 @@
      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;