(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.

diff --git a/src/xdisp.c b/src/xdisp.c
index 4f82767906cb28d093502c5d8ed391765ec9d47c..fabc1e108a5d11ca8fe64f7414ee609a827fc1ed 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5777,6 +5777,8 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
                                  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 @@ display_line (it)
                                  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 @@ display_line (it)
                {
                  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))
                    {