diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-02 02:33:13 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-02 02:33:13 -0700 |
| commit | c0ce93fddb70b23d9c7a5f9c822b75c75fc6cec0 (patch) | |
| tree | dc5213d5cedefe19ad2ecefbcade4463d836ed7a | |
| parent | 56adbe62a5c90ec0935d751fa311d41eb6d86a39 (diff) | |
| download | emacs-c0ce93fddb70b23d9c7a5f9c822b75c75fc6cec0.tar.gz | |
* xfaces.c (face_for_overlay_string): Remove unused local.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9ac301efed0..f65380abf33 100644 --- 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 d6b9aae0909..9d264253115 100644 --- 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; |