comparison src/macterm.c @ 59655:369714ad80ed

(x_draw_glyph_string_box): Fix last_x for full width rows.

59654:9a3b84758dc1

  int width, left_x, right_x, top_y, bottom_y, last_x, raised_p;
  int left_p, right_p;
  struct glyph *last_glyph;
  Rect clip_rect;

  last_x = window_box_right (s->w, s->area);
  if (s->row->full_width_p
      && !s->w->pseudo_window_p)
    {
      last_x += WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH (s->w);
      if (s->area != RIGHT_MARGIN_AREA
	  || WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (s->w))
	last_x += WINDOW_RIGHT_FRINGE_WIDTH (s->w);
    }

  /* The glyph that may have a right box line.  */
  last_glyph = (s->cmp || s->img
		? s->first_glyph
		: s->first_glyph + s->nchars - 1);

59655:369714ad80ed

  int width, left_x, right_x, top_y, bottom_y, last_x, raised_p;
  int left_p, right_p;
  struct glyph *last_glyph;
  Rect clip_rect;

  last_x = ((s->row->full_width_p && !s->w->pseudo_window_p)
	    ? WINDOW_RIGHT_EDGE_X (s->w)
	    : window_box_right (s->w, s->area));

  /* The glyph that may have a right box line.  */
  last_glyph = (s->cmp || s->img
		? s->first_glyph
		: s->first_glyph + s->nchars - 1);