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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.1064 emacs/src/xdisp.c:1.1065
*** emacs/src/xdisp.c:1.1064    Sat Oct 29 20:03:42 2005
--- emacs/src/xdisp.c   Sun Oct 30 20:08:09 2005
***************
*** 15679,15685 ****
--- 15679,15687 ----
                        produce_special_glyphs (it, IT_CONTINUATION);
                      row->continued_p = 1;
  
+                     it->current_x = x_before;
                      it->continuation_lines_width += x;
+                     extend_face_to_end_of_line (it);
  
                      if (nglyphs > 1 && i > 0)
                        {
***************
*** 16214,16220 ****
    while (CONSP (tail))
      {
        tem = XCAR (tail);
!       
        if (EQ (elt, tem))
        {
          /* Splice out the link TAIL.  */
--- 16216,16222 ----
    while (CONSP (tail))
      {
        tem = XCAR (tail);
! 
        if (EQ (elt, tem))
        {
          /* Splice out the link TAIL.  */
***************
*** 18778,18796 ****
  {
    /* If the face of this glyph string has to be drawn to the end of
       the drawing area, set S->extends_to_end_of_line_p.  */
-   struct face *default_face = FACE_FROM_ID (s->f, DEFAULT_FACE_ID);
  
    if (start == s->row->used[s->area]
        && s->area == TEXT_AREA
!       && ((s->hl == DRAW_NORMAL_TEXT
!          && (s->row->fill_line_p
!              || s->face->background != default_face->background
!              || s->face->stipple != default_face->stipple
!              || s->row->mouse_face_p))
!         || s->hl == DRAW_MOUSE_FACE
!         || ((s->hl == DRAW_IMAGE_RAISED || s->hl == DRAW_IMAGE_SUNKEN)
!             && s->row->fill_line_p)))
!       s->extends_to_end_of_line_p = 1;
  
    /* If S extends its face to the end of the line, set its
       background_width to the distance to the right edge of the drawing
--- 18780,18794 ----
  {
    /* If the face of this glyph string has to be drawn to the end of
       the drawing area, set S->extends_to_end_of_line_p.  */
  
    if (start == s->row->used[s->area]
        && s->area == TEXT_AREA
!       && ((s->row->fill_line_p
!          && (s->hl == DRAW_NORMAL_TEXT
!              || s->hl == DRAW_IMAGE_RAISED
!              || s->hl == DRAW_IMAGE_SUNKEN))
!         || s->hl == DRAW_MOUSE_FACE))
!     s->extends_to_end_of_line_p = 1;
  
    /* If S extends its face to the end of the line, set its
       background_width to the distance to the right edge of the drawing