aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-06 15:48:27 +0000
committerGerd Moellmann2000-11-06 15:48:27 +0000
commitcdb1fe495d228677248cc4a9a6081458df33d518 (patch)
tree08e52d8b8e6048c675b8769ffb5d1fcfd4dee11f /src
parent893c512968626dbe0d25548f5beaf6833b961028 (diff)
downloademacs-cdb1fe495d228677248cc4a9a6081458df33d518.tar.gz
emacs-cdb1fe495d228677248cc4a9a6081458df33d518.zip
(displayed_window_lines): Detect partially
visible lines at the bottom correctly.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 728d0f51a8a..e49e7b346ce 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-11-06 Gerd Moellmann <gerd@gnu.org>
2
3 * window.c (displayed_window_lines): Detect partially
4 visible lines at the bottom correctly.
5
12000-11-06 Stefan Monnier <monnier@cs.yale.edu> 62000-11-06 Stefan Monnier <monnier@cs.yale.edu>
2 7
3 * fileio.c (Fwrite_region): Use `visiting' rather than `visit' 8 * fileio.c (Fwrite_region): Use `visiting' rather than `visit'
diff --git a/src/window.c b/src/window.c
index 12b15424c28..4a4fecae574 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4351,7 +4351,8 @@ displayed_window_lines (w)
4351 int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f); 4351 int lines = (rest + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f);
4352 it.vpos += lines; 4352 it.vpos += lines;
4353 } 4353 }
4354 else if (bottom_y > height) 4354 else if (it.current_y < height && bottom_y > height)
4355 /* Partially visible line at the bottom. */
4355 ++it.vpos; 4356 ++it.vpos;
4356 4357
4357 return it.vpos; 4358 return it.vpos;