aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2005-01-23 00:50:52 +0000
committerKim F. Storm <[email protected]>2005-01-23 00:50:52 +0000
commit78465f3a8c37972ebff48b6c961196472fceef16 (patch)
tree5c7e32e5fc3ff476b01b67a866a91a39cd77dcb2
parentbed83ee4dd0caeb301232cf56dcc8e7f62406bba (diff)
(pos_visible_p): Fix calculation of y.
Clear last_height before calling line_bottom_y to get real height.
-rw-r--r--src/xdisp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 17ee38f6fc..f1877c494c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1292,7 +1292,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
if (IT_CHARPOS (it) >= charpos)
{
int top_y = it.current_y;
- int bottom_y = line_bottom_y (&it);
+ int bottom_y = (last_height = 0, line_bottom_y (&it));
int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
if (top_y < window_top_y)
@@ -1302,7 +1302,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, exact_mode_line_heights_p)
if (visible_p && x)
{
*x = it.current_x;
- *y = max (top_y + it.max_ascent - it.ascent, window_top_y);
+ *y = max (top_y + max (0, it.max_ascent - it.ascent), window_top_y);
if (rtop)
{
*rtop = max (0, window_top_y - top_y);