aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2000-12-11 02:20:55 +0000
committerMiles Bader2000-12-11 02:20:55 +0000
commit59ec59ae7aa91c47c56c19faec3dd43a051d9325 (patch)
tree6e255f12c3cdeeff9367215cc594f6f75f4f327f
parentca98cd37912088bd7c7fd02c8da265d13d71bb4f (diff)
downloademacs-59ec59ae7aa91c47c56c19faec3dd43a051d9325.tar.gz
emacs-59ec59ae7aa91c47c56c19faec3dd43a051d9325.zip
(displayed_window_lines): Don't round up when converting empty space at
bottom to lines.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2ad78bfe2ff..9c9d7070a82 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-12-11 Miles Bader <miles@gnu.org>
2
3 * window.c (displayed_window_lines): Don't round up when
4 converting empty space at bottom to lines.
5
12000-12-09 Stefan Monnier <monnier@cs.yale.edu> 62000-12-09 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * syntax.c (scan_lists): Check that the right quote char has the 8 * syntax.c (scan_lists): Check that the right quote char has the
diff --git a/src/window.c b/src/window.c
index 223ef072386..5a54f46091c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4479,7 +4479,7 @@ displayed_window_lines (w)
4479 { 4479 {
4480 struct frame *f = XFRAME (w->frame); 4480 struct frame *f = XFRAME (w->frame);
4481 int rest = height - bottom_y; 4481 int rest = height - bottom_y;
4482 int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); 4482 int lines = rest / CANON_Y_UNIT (f);
4483 it.vpos += lines; 4483 it.vpos += lines;
4484 } 4484 }
4485 4485