aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2004-07-25 22:15:03 +0000
committerKim F. Storm2004-07-25 22:15:03 +0000
commitf516e857f7a8eaf5381c5f24f46800e991c7eace (patch)
tree655f90c8953472519940b758c86f3a0b29b00e60 /src
parentf29ff8c7a4a0a3bded497ff08f64d3bb1b80c1b8 (diff)
downloademacs-f516e857f7a8eaf5381c5f24f46800e991c7eace.tar.gz
emacs-f516e857f7a8eaf5381c5f24f46800e991c7eace.zip
(move_it_in_display_line_to): If overflow-newline-into-fringe
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.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 4083ce7a438..071e85ae29d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5738,12 +5738,19 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
5738#ifdef HAVE_WINDOW_SYSTEM 5738#ifdef HAVE_WINDOW_SYSTEM
5739 if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)) 5739 if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
5740 { 5740 {
5741 if (!get_next_display_element (it) 5741 if (!get_next_display_element (it))
5742 || BUFFER_POS_REACHED_P ())
5743 { 5742 {
5744 result = MOVE_POS_MATCH_OR_ZV; 5743 result = MOVE_POS_MATCH_OR_ZV;
5745 break; 5744 break;
5746 } 5745 }
5746 if (BUFFER_POS_REACHED_P ())
5747 {
5748 if (ITERATOR_AT_END_OF_LINE_P (it))
5749 result = MOVE_POS_MATCH_OR_ZV;
5750 else
5751 result = MOVE_LINE_CONTINUED;
5752 break;
5753 }
5747 if (ITERATOR_AT_END_OF_LINE_P (it)) 5754 if (ITERATOR_AT_END_OF_LINE_P (it))
5748 { 5755 {
5749 result = MOVE_NEWLINE_OR_CR; 5756 result = MOVE_NEWLINE_OR_CR;