From: Kim F. Storm <storm@cua.dk>
Date: Sun, 21 Nov 2004 14:59:40 +0000 (+0000)
Subject: (move_it_in_display_line_to, display_line): Restore
X-Git-Tag: ttn-vms-21-2-B4~3776
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=03802f0d9edebe85eec7089c0a0ba7a938afd7dd;p=emacs.git

(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 4f82767906c..fabc1e108a5 100644
--- 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))
 		    {