aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2005-09-07 08:46:04 +0000
committerKim F. Storm2005-09-07 08:46:04 +0000
commitedf3d146cc73256b2c992a90e6379680c797d54e (patch)
treecde4f75da8175f46f29ed0ec0088eb81348c918f /src
parent821f6daef748d7ec06612479d0d24037601fb31b (diff)
downloademacs-edf3d146cc73256b2c992a90e6379680c797d54e.tar.gz
emacs-edf3d146cc73256b2c992a90e6379680c797d54e.zip
(try_window): Remove superfluous cursor_height calculation.
Fixes crash reported by YAMAMOTO Mitsuharu.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 95f5a6709bf..ab3aae5fb91 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12830,12 +12830,11 @@ try_window (window, pos, check_margins)
12830 if (check_margins 12830 if (check_margins
12831 && !MINI_WINDOW_P (w)) 12831 && !MINI_WINDOW_P (w))
12832 { 12832 {
12833 int this_scroll_margin, cursor_height; 12833 int this_scroll_margin;
12834 12834
12835 this_scroll_margin = max (0, scroll_margin); 12835 this_scroll_margin = max (0, scroll_margin);
12836 this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 4); 12836 this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 4);
12837 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f); 12837 this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
12838 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
12839 12838
12840 if ((w->cursor.y < this_scroll_margin 12839 if ((w->cursor.y < this_scroll_margin
12841 && CHARPOS (pos) > BEGV) 12840 && CHARPOS (pos) > BEGV)