From: Miles Bader <miles@gnu.org>
Date: Wed, 25 Oct 2000 13:14:16 +0000 (+0000)
Subject: (pos_visible_p): Don't add `it.current_y' twice.
X-Git-Tag: emacs-pretest-21.0.90~577
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5789b65af2b248c62a703aa9af87aa4f7350823;p=emacs.git

(pos_visible_p): Don't add `it.current_y' twice.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a2865c12b47..e0446868e68 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-25  Miles Bader  <miles@gnu.org>
+
+	* xdisp.c (pos_visible_p): Don't add `it.current_y' twice.
+
 2000-10-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* window.c (pos_fully_visible_p): Removed.
diff --git a/src/xdisp.c b/src/xdisp.c
index 9bf8aa9ef6d..bcb285ae134 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -954,9 +954,9 @@ pos_visible_p (w, charpos, fully)
       int line_height;
 
       if (it.max_ascent == 0 && it.max_descent == 0)
-	line_height = it.current_y + last_height;
+	line_height = last_height;
       else
-	line_height = it.current_y + it.max_ascent + it.max_descent;
+	line_height = it.max_ascent + it.max_descent;
       
       *fully = it.current_y + line_height <= it.last_visible_y;
       visible_p = 1;