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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.938 emacs/src/xdisp.c:1.939
*** emacs/src/xdisp.c:1.938     Sun Nov 21 12:33:35 2004
--- emacs/src/xdisp.c   Sun Nov 21 14:59:40 2004
***************
*** 5777,5782 ****
--- 5777,5784 ----
                                  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,14790 ****
--- 14787,14794 ----
                                  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,14966 ****
                {
                  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))
                    {
--- 14959,14968 ----