comparison src/w32term.c @ 109431:799b50142743

Merge from mainline.

109430:0b8608a36b55

			struct draw_fringe_bitmap_params *p)
{
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  HDC hdc;
  struct face *face = p->face;
  int rowY;

  hdc = get_frame_dc (f);

  if (!p->overlay_p)
    {

      if (bx >= 0 && nx > 0)
	w32_fill_area (f, hdc, face->background, bx, by, nx, ny);
    }

  /* Must clip because of partially visible lines.  */
  rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y);
  if (p->y < rowY)
    {
      /* Adjust position of "bottom aligned" bitmap on partially
	 visible last row.  */
      int oldY = row->y;
      int oldVH = row->visible_height;
      row->visible_height = p->h;
      row->y -= rowY - p->y;
      w32_clip_to_row (w, row, -1, hdc);
      row->y = oldY;
      row->visible_height = oldVH;
    }
  else
    w32_clip_to_row (w, row, -1, hdc);

  if (p->which && p->which < max_fringe_bmp)
    {
      HBITMAP pixmap = fringe_bmp[p->which];
      HDC compat_hdc;

109431:799b50142743

			struct draw_fringe_bitmap_params *p)
{
  struct frame *f = XFRAME (WINDOW_FRAME (w));
  HDC hdc;
  struct face *face = p->face;

  hdc = get_frame_dc (f);

  if (!p->overlay_p)
    {

      if (bx >= 0 && nx > 0)
	w32_fill_area (f, hdc, face->background, bx, by, nx, ny);
    }

  /* Must clip because of partially visible lines.  */
  w32_clip_to_row (w, row, -1, hdc);

  if (p->which && p->which < max_fringe_bmp)
    {
      HBITMAP pixmap = fringe_bmp[p->which];
      HDC compat_hdc;