(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.

diff --git a/src/xdisp.c b/src/xdisp.c
index b32f43b97b9df8c125a95700361a91efec43c405..7ce461c18978d2c290e5e3dd4371bb6aa67d396c 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1898,7 +1898,7 @@ get_phys_cursor_geometry (w, row, glyph, heightp)
      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 @@ static Lisp_Object
 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 @@ get_line_height_property (it, prop)
      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 @@ x_produce_glyphs (it)
          else
            {
              Lisp_Object spacing;
-             int total = 0;
 
              it->phys_ascent = it->ascent;
              it->phys_descent = it->descent;
@@ -21574,7 +21572,7 @@ note_mode_line_or_margin_highlight (window, x, y, area)
 
          /* 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 )