(forward_to_next_line_start): Check for newlines,

not end of line, which includes CR.

diff --git a/src/xdisp.c b/src/xdisp.c
index ac16e694b575ff1d7e211c2fa25e478231fa18e1..15e52cde5aa26feb5333c42ffa6ebb4d5ebe83e1 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3411,7 +3411,7 @@ forward_to_next_line_start (it, skipped_p)
 
   /* If already on a newline, just consume it to avoid unintended
      skipping over invisible text below.  */
-  if (ITERATOR_AT_END_OF_LINE_P (it))
+  if (it->what == IT_CHARACTER && it->c == '\n')
     {
       set_iterator_to_next (it, 0);
       return 1;
@@ -3431,7 +3431,7 @@ forward_to_next_line_start (it, skipped_p)
         && get_next_display_element (it)
         && !newline_found_p)
     {
-      newline_found_p = ITERATOR_AT_END_OF_LINE_P (it);
+      newline_found_p = it->what == IT_CHARACTER && it->c == '\n';
       set_iterator_to_next (it, 0);
       if (!STRINGP (it->string))
        ++n;