[Emacs-diffs] Changes to emacs/src/w32term.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.231 emacs/src/w32term.c:1.232
*** emacs/src/w32term.c:1.231   Sun Sep 11 20:32:10 2005
--- emacs/src/w32term.c Fri Oct  7 07:40:06 2005
***************
*** 1567,1573 ****
    else
      x = s->x;
  
!   if (s->for_overlaps_p || (s->background_filled_p && s->hl != DRAW_CURSOR))
      SetBkMode (s->hdc, TRANSPARENT);
    else
      SetBkMode (s->hdc, OPAQUE);
--- 1567,1573 ----
    else
      x = s->x;
  
!   if (s->for_overlaps || (s->background_filled_p && s->hl != DRAW_CURSOR))
      SetBkMode (s->hdc, TRANSPARENT);
    else
      SetBkMode (s->hdc, OPAQUE);
***************
*** 2448,2454 ****
    /* If S draws into the background of its successor, draw the
       background of the successor first so that S can draw into it.
       This makes S->next use XDrawString instead of XDrawImageString.  */
!   if (s->next && s->right_overhang && !s->for_overlaps_p)
      {
        xassert (s->next->img == NULL);
        x_set_glyph_string_gc (s->next);
--- 2448,2454 ----
    /* If S draws into the background of its successor, draw the
       background of the successor first so that S can draw into it.
       This makes S->next use XDrawString instead of XDrawImageString.  */
!   if (s->next && s->right_overhang && !s->for_overlaps)
      {
        xassert (s->next->img == NULL);
        x_set_glyph_string_gc (s->next);
***************
*** 2461,2467 ****
  
    /* Draw relief (if any) in advance for char/composition so that the
       glyph string can be drawn over it.  */
!   if (!s->for_overlaps_p
        && s->face->box != FACE_NO_BOX
        && (s->first_glyph->type == CHAR_GLYPH
          || s->first_glyph->type == COMPOSITE_GLYPH))
--- 2461,2467 ----
  
    /* Draw relief (if any) in advance for char/composition so that the
       glyph string can be drawn over it.  */
!   if (!s->for_overlaps
        && s->face->box != FACE_NO_BOX
        && (s->first_glyph->type == CHAR_GLYPH
          || s->first_glyph->type == COMPOSITE_GLYPH))
***************
*** 2487,2493 ****
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps_p)
        s->background_filled_p = 1;
        else
          x_draw_glyph_string_background (s, 0);
--- 2487,2493 ----
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps)
        s->background_filled_p = 1;
        else
          x_draw_glyph_string_background (s, 0);
***************
*** 2495,2501 ****
        break;
  
      case COMPOSITE_GLYPH:
!       if (s->for_overlaps_p || s->gidx > 0)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 1);
--- 2495,2501 ----
        break;
  
      case COMPOSITE_GLYPH:
!       if (s->for_overlaps || s->gidx > 0)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 1);
***************
*** 2506,2512 ****
        abort ();
      }
  
!   if (!s->for_overlaps_p)
      {
        /* Draw underline.  */
        if (s->face->underline_p
--- 2506,2512 ----
        abort ();
      }
  
!   if (!s->for_overlaps)
      {
        /* Draw underline.  */
        if (s->face->underline_p