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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.131 emacs/src/macterm.c:1.132
*** emacs/src/macterm.c:1.131   Tue Oct  4 09:20:38 2005
--- emacs/src/macterm.c Fri Oct  7 07:39:37 2005
***************
*** 2320,2326 ****
         XDrawImageString is usually faster than XDrawString.)  Always
         use XDrawImageString when drawing the cursor so that there is
         no chance that characters under a box cursor are invisible.  */
!       if (s->for_overlaps_p
          || (s->background_filled_p && s->hl != DRAW_CURSOR))
  #endif
        {
--- 2320,2326 ----
         XDrawImageString is usually faster than XDrawString.)  Always
         use XDrawImageString when drawing the cursor so that there is
         no chance that characters under a box cursor are invisible.  */
!       if (s->for_overlaps
          || (s->background_filled_p && s->hl != DRAW_CURSOR))
  #endif
        {
***************
*** 3271,3277 ****
       draw a cursor, 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
        && s->next->hl != DRAW_CURSOR)
      {
        xassert (s->next->img == NULL);
--- 3271,3277 ----
       draw a cursor, 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
        && s->next->hl != DRAW_CURSOR)
      {
        xassert (s->next->img == NULL);
***************
*** 3285,3291 ****
  
    /* 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))
--- 3285,3291 ----
  
    /* 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))
***************
*** 3311,3317 ****
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps_p)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 0);
--- 3311,3317 ----
        break;
  
      case CHAR_GLYPH:
!       if (s->for_overlaps)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 0);
***************
*** 3319,3325 ****
        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);
--- 3319,3325 ----
        break;
  
      case COMPOSITE_GLYPH:
!       if (s->for_overlaps || s->gidx > 0)
        s->background_filled_p = 1;
        else
        x_draw_glyph_string_background (s, 1);
***************
*** 3330,3336 ****
        abort ();
      }
  
!   if (!s->for_overlaps_p)
      {
        /* Draw underline.  */
        if (s->face->underline_p)
--- 3330,3336 ----
        abort ();
      }
  
!   if (!s->for_overlaps)
      {
        /* Draw underline.  */
        if (s->face->underline_p)