Mercurial > emacs
changeset 63384:e5a2d6aee2eb
(note_mode_line_or_margin_highlight): Lisp_Object/int mixup.
(get_phys_cursor_geometry, format_mode_line_unwind_data)
(get_line_height_property, x_produce_glyphs): Remove unused vars.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 13 Jun 2005 20:49:14 +0000 |
| parents | 12107da85908 |
| children | 882b78bf566b |
| files | src/xdisp.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon Jun 13 20:47:42 2005 +0000 +++ b/src/xdisp.c Mon Jun 13 20:49:14 2005 +0000 @@ -1898,7 +1898,7 @@ int *heightp; { struct frame *f = XFRAME (WINDOW_FRAME (w)); - int x, y, wd, h, h0, y0; + int y, wd, h, h0, y0; /* Compute the width of the rectangle to draw. If on a stretch glyph, and `x-stretch-block-cursor' is nil, don't draw a @@ -8252,7 +8252,6 @@ format_mode_line_unwind_data (obuf) struct buffer *obuf; { - int i = 0; Lisp_Object vector; /* Reduce consing by keeping one vector in @@ -19201,7 +19200,7 @@ struct it *it; Lisp_Object prop; { - Lisp_Object position, val; + Lisp_Object position; if (STRINGP (it->object)) position = make_number (IT_STRING_CHARPOS (*it)); @@ -19552,7 +19551,6 @@ else { Lisp_Object spacing; - int total = 0; it->phys_ascent = it->ascent; it->phys_descent = it->descent; @@ -21574,7 +21572,7 @@ /* If the re-rendering position is included in the last re-rendering area, we should do nothing. */ - if ( window == dpyinfo->mouse_face_window + if ( EQ (window, dpyinfo->mouse_face_window) && dpyinfo->mouse_face_beg_col <= vpos && vpos < dpyinfo->mouse_face_end_col && dpyinfo->mouse_face_beg_row == hpos )