]> git.eshelyaron.com Git - emacs.git/commitdiff
(move_it_in_display_line_to): If overflow-newline-into-fringe
authorKim F. Storm <storm@cua.dk>
Sun, 25 Jul 2004 22:15:03 +0000 (22:15 +0000)
committerKim F. Storm <storm@cua.dk>
Sun, 25 Jul 2004 22:15:03 +0000 (22:15 +0000)
is enabled, return MOVE_LINE_CONTINUED rather than MOVE_POS_MATCH_OR_ZV
if target position is at end of display line but char is not a newline.

src/xdisp.c

index 4083ce7a438d346faa55f26325f48c54abfc5ef2..071e85ae29d0520d45ecd9fad65184ab09b18c77 100644 (file)
@@ -5738,12 +5738,19 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
 #ifdef HAVE_WINDOW_SYSTEM
                          if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                            {
-                             if (!get_next_display_element (it)
-                                 || BUFFER_POS_REACHED_P ())
+                             if (!get_next_display_element (it))
                                {
                                  result = MOVE_POS_MATCH_OR_ZV;
                                  break;
                                }
+                             if (BUFFER_POS_REACHED_P ())
+                               {
+                                 if (ITERATOR_AT_END_OF_LINE_P (it))
+                                   result = MOVE_POS_MATCH_OR_ZV;
+                                 else
+                                   result = MOVE_LINE_CONTINUED;
+                                 break;
+                               }
                              if (ITERATOR_AT_END_OF_LINE_P (it))
                                {
                                  result = MOVE_NEWLINE_OR_CR;