comparison src/xdisp.c @ 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.

63383:12107da85908

     struct glyph_row *row;
     struct glyph *glyph;
     int *heightp;
{
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  int x, 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
     rectangle as wide as the glyph, but use a canonical character
     width instead.  */

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
     Vwith_echo_area_save_vector.  */
  vector = Vmode_line_unwind_vector;

static Lisp_Object
get_line_height_property (it, prop)
     struct it *it;
     Lisp_Object prop;
{
  Lisp_Object position, val;

  if (STRINGP (it->object))
    position = make_number (IT_STRING_CHARPOS (*it));
  else if (BUFFERP (it->object))
    position = make_number (IT_CHARPOS (*it));

	      extra_line_spacing = 0;
	    }
	  else
	    {
	      Lisp_Object spacing;
	      int total = 0;

	      it->phys_ascent = it->ascent;
	      it->phys_descent = it->descent;

	      if ((it->max_ascent > 0 || it->max_descent > 0)

		  ? (w->current_matrix)->nrows - 1
		  : 0);

	  /* If the re-rendering position is included in the last
	     re-rendering area, we should do nothing. */
	  if ( window == dpyinfo->mouse_face_window
	       && dpyinfo->mouse_face_beg_col <= vpos
	       && vpos < dpyinfo->mouse_face_end_col
	       && dpyinfo->mouse_face_beg_row == hpos )
	    return;

63384:e5a2d6aee2eb

     struct glyph_row *row;
     struct glyph *glyph;
     int *heightp;
{
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  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
     rectangle as wide as the glyph, but use a canonical character
     width instead.  */

static Lisp_Object
format_mode_line_unwind_data (obuf)
     struct buffer *obuf;
{
  Lisp_Object vector;

  /* Reduce consing by keeping one vector in
     Vwith_echo_area_save_vector.  */
  vector = Vmode_line_unwind_vector;

static Lisp_Object
get_line_height_property (it, prop)
     struct it *it;
     Lisp_Object prop;
{
  Lisp_Object position;

  if (STRINGP (it->object))
    position = make_number (IT_STRING_CHARPOS (*it));
  else if (BUFFERP (it->object))
    position = make_number (IT_CHARPOS (*it));

	      extra_line_spacing = 0;
	    }
	  else
	    {
	      Lisp_Object spacing;

	      it->phys_ascent = it->ascent;
	      it->phys_descent = it->descent;

	      if ((it->max_ascent > 0 || it->max_descent > 0)

		  ? (w->current_matrix)->nrows - 1
		  : 0);

	  /* If the re-rendering position is included in the last
	     re-rendering area, we should do nothing. */
	  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 )
	    return;