Mercurial > emacs
changeset 58399:af23c201a4fc
(move_it_in_display_line_to, display_line): Restore
saved_face_id if overflow-newline-into-fringe is enabled and line
is continued before or in middle of element from display vector.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sun, 21 Nov 2004 14:59:40 +0000 |
| parents | 797032ecbb43 |
| children | dc2e2d79f580 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sun Nov 21 14:58:40 2004 +0000 +++ b/src/xdisp.c Sun Nov 21 14:59:40 2004 +0000 @@ -5777,6 +5777,8 @@ 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 */ } @@ -14785,6 +14787,8 @@ row->continued_p = 0; row->exact_window_width_line_p = 1; } + else if (it->method == next_element_from_display_vector) + it->face_id = it->saved_face_id; } #endif /* HAVE_WINDOW_SYSTEM */ } @@ -14955,12 +14959,10 @@ { if (!get_next_display_element (it)) { -#ifdef HAVE_WINDOW_SYSTEM it->continuation_lines_width = 0; row->ends_at_zv_p = 1; row->exact_window_width_line_p = 1; break; -#endif /* HAVE_WINDOW_SYSTEM */ } if (ITERATOR_AT_END_OF_LINE_P (it)) {