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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.941 emacs/src/xdisp.c:1.942
*** emacs/src/xdisp.c:1.941     Mon Nov 22 23:26:02 2004
--- emacs/src/xdisp.c   Wed Nov 24 11:29:46 2004
***************
*** 5862,5867 ****
--- 5862,5869 ----
                  result = MOVE_NEWLINE_OR_CR;
                  break;
                }
+             if (it->method == next_element_from_display_vector)
+               it->face_id = it->saved_face_id;
            }
  #endif /* HAVE_WINDOW_SYSTEM */
          result = MOVE_LINE_TRUNCATED;
***************
*** 14628,14635 ****
       hscrolled.  This may stop at an x-position < IT->first_visible_x
       if the first glyph is partially visible or if we hit a line end.  */
    if (it->current_x < it->first_visible_x)
!     move_it_in_display_line_to (it, ZV, it->first_visible_x,
!                               MOVE_TO_POS | MOVE_TO_X);
  
    /* Get the initial row height.  This is either the height of the
       text hscrolled, if there is any, or zero.  */
--- 14630,14641 ----
       hscrolled.  This may stop at an x-position < IT->first_visible_x
       if the first glyph is partially visible or if we hit a line end.  */
    if (it->current_x < it->first_visible_x)
!     {
!       move_it_in_display_line_to (it, ZV, it->first_visible_x,
!                                 MOVE_TO_POS | MOVE_TO_X);
!       if (it->method == next_element_from_display_vector)
!       it->face_id = it->saved_face_id;
!     }
  
    /* Get the initial row height.  This is either the height of the
       text hscrolled, if there is any, or zero.  */
***************
*** 14970,14975 ****
--- 14976,14983 ----
                      row->exact_window_width_line_p = 1;
                      goto at_end_of_line;
                    }
+                 if (it->method == next_element_from_display_vector)
+                   it->face_id = it->saved_face_id;
                }
            }
  #endif /* HAVE_WINDOW_SYSTEM */