(forward_to_next_line_start): When taking the shortcut

at the start of the function, check that the \n in it->c is
from the iterator's current position.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5a8a8d06a0f..295595ea95b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2001-02-22  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (forward_to_next_line_start): When taking the shortcut
+        at the start of the function, check that the \n in it->c is
+        from the iterator's current position.
+        
         * xdisp.c (handle_single_display_prop): Add parameter
         DISPLAY_REPLACED_BEFORE_P.  If it is non-zero ignore display
         properties which replace the display of text with something else.
diff --git a/src/xdisp.c b/src/xdisp.c
index 4782b3b0e07..3da744c9c73 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3517,7 +3517,9 @@ 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 (it->what == IT_CHARACTER && it->c == '\n')
+  if (it->what == IT_CHARACTER
+      && it->c == '\n'
+      && CHARPOS (it->position) == IT_CHARPOS (*it))
     {
       set_iterator_to_next (it, 0);
       it->c = 0;