From f2c74bf38322ec715bb93c259e3570c015af78cf Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 5 Jul 2014 11:24:07 +0300 Subject: [PATCH] A better fix for bug #17942. src/xdisp.c (pos_visible_p): If CHARPOS is at beginning of window, and there is a display property at that position, don't call move_it_to to move to a position before window start. --- src/ChangeLog | 6 +++--- src/xdisp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index dde148dc165..a3210b557c7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,8 @@ 2014-07-05 Eli Zaretskii - * xdisp.c (pos_visible_p): If CHARPOS is at BEGV, and there is a - display property at BEGV, don't call move_it_to to move to a - position before BEGV. (Bug#17942) + * xdisp.c (pos_visible_p): If CHARPOS is at beginning of window, + and there is a display property at that position, don't call + move_it_to to move to a position before window start. (Bug#17942) 2014-07-05 Stefan Monnier diff --git a/src/xdisp.c b/src/xdisp.c index f5ddf828314..f49710b21e5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1585,7 +1585,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, /* Move to the last buffer position before the display property. */ start_display (&it3, w, top); - if (start > BEGV) + if (start > CHARPOS (top)) move_it_to (&it3, start - 1, -1, -1, -1, MOVE_TO_POS); /* Move forward one more line if the position before the display string is a newline or if it is the -- 2.11.4.GIT