diff options
| author | Miles Bader | 2000-10-25 13:14:16 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-10-25 13:14:16 +0000 |
| commit | d5789b65af2b248c62a703aa9af87aa4f7350823 (patch) | |
| tree | b7227c8e9e237c40b0b1287db8782f470353ddaf | |
| parent | 4ecda532670bff07eb8104331806a8fe7ff0012b (diff) | |
| download | emacs-d5789b65af2b248c62a703aa9af87aa4f7350823.tar.gz emacs-d5789b65af2b248c62a703aa9af87aa4f7350823.zip | |
(pos_visible_p): Don't add `it.current_y' twice.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a2865c12b47..e0446868e68 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-10-25 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (pos_visible_p): Don't add `it.current_y' twice. | ||
| 4 | |||
| 1 | 2000-10-25 Gerd Moellmann <gerd@gnu.org> | 5 | 2000-10-25 Gerd Moellmann <gerd@gnu.org> |
| 2 | 6 | ||
| 3 | * window.c (pos_fully_visible_p): Removed. | 7 | * 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) | |||
| 954 | int line_height; | 954 | int line_height; |
| 955 | 955 | ||
| 956 | if (it.max_ascent == 0 && it.max_descent == 0) | 956 | if (it.max_ascent == 0 && it.max_descent == 0) |
| 957 | line_height = it.current_y + last_height; | 957 | line_height = last_height; |
| 958 | else | 958 | else |
| 959 | line_height = it.current_y + it.max_ascent + it.max_descent; | 959 | line_height = it.max_ascent + it.max_descent; |
| 960 | 960 | ||
| 961 | *fully = it.current_y + line_height <= it.last_visible_y; | 961 | *fully = it.current_y + line_height <= it.last_visible_y; |
| 962 | visible_p = 1; | 962 | visible_p = 1; |