summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2005-02-15 23:04:45 +0000
committerKim F. Storm <storm@cua.dk>2005-02-15 23:04:45 +0000
commitd02d0705b396b0deed399af01a370e8c9de6f7e6 (patch)
tree964ebdbc60bfe96c80865c3cf290b7b91e591a0e /src
parent86e6158692dfe644fcd499585e68f01df14fa614 (diff)
downloademacs-d02d0705b396b0deed399af01a370e8c9de6f7e6.tar.gz
(BUFFER_POS_REACHED_P): Return true if pos reached and
at end of display vector.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index c7f446def55..c0489aa5ecb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5819,11 +5819,14 @@ move_it_in_display_line_to (it, to_charpos, to_x, op)
saved_glyph_row = it->glyph_row;
it->glyph_row = NULL;
-#define BUFFER_POS_REACHED_P() \
- ((op & MOVE_TO_POS) != 0 \
- && BUFFERP (it->object) \
- && IT_CHARPOS (*it) >= to_charpos \
- && it->method == next_element_from_buffer)
+#define BUFFER_POS_REACHED_P() \
+ ((op & MOVE_TO_POS) != 0 \
+ && BUFFERP (it->object) \
+ && IT_CHARPOS (*it) >= to_charpos \
+ && (it->method == next_element_from_buffer || \
+ (it->method == next_element_from_display_vector && \
+ it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
+
while (1)
{