diff options
author | Gerd Moellmann <gerd@gnu.org> | 2000-11-17 15:39:14 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2000-11-17 15:39:14 +0000 |
commit | 100b593bc44ae68260a6762dc2264c916179bce3 (patch) | |
tree | 958ed6e1bda3f0c753e7175fbb7bf985f1cb0d38 | |
parent | 96403ac1398236e5cde80de8135e480ff0cbe5fa (diff) | |
download | emacs-100b593bc44ae68260a6762dc2264c916179bce3.tar.gz |
(pos_visible_p): Compute the default character height
differently.
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/xdisp.c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6096177d1f0..236433bba20 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-11-17 Gerd Moellmann <gerd@gnu.org> + + * xdisp.c (pos_visible_p): Compute the default character height + differently. + 2000-11-16 Gerd Moellmann <gerd@gnu.org> * xdisp.c (pos_visible_p): Handle case that we reach ZV without diff --git a/src/xdisp.c b/src/xdisp.c index e75ae762687..9b4df8444d4 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1002,8 +1002,15 @@ pos_visible_p (w, charpos, fully, exact_mode_line_heights_p) ? it.max_ascent + it.max_descent : last_height); } - else - line_height = FONT_HEIGHT (FRAME_FONT (XFRAME (w->frame))); + else + { + /* Use the default character height. */ + it.what = IT_CHARACTER; + it.c = ' '; + it.len = 1; + PRODUCE_GLYPHS (&it); + line_height = it.ascent + it.descent; + } } line_bottom_y = line_top_y + line_height; |