From: Kim F. Storm <storm@cua.dk>
Date: Wed, 7 Sep 2005 08:46:04 +0000 (+0000)
Subject: (try_window): Remove superfluous cursor_height calculation.
X-Git-Tag: emacs-pretest-22.0.90~7241
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=edf3d146cc73256b2c992a90e6379680c797d54e;p=emacs.git

(try_window): Remove superfluous cursor_height calculation.
Fixes crash reported by YAMAMOTO Mitsuharu.
---

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)
   if (check_margins
       && !MINI_WINDOW_P (w))
     {
-      int this_scroll_margin, cursor_height;
+      int this_scroll_margin;
 
       this_scroll_margin = max (0, scroll_margin);
       this_scroll_margin = min (this_scroll_margin, WINDOW_TOTAL_LINES (w) / 4);
       this_scroll_margin *= FRAME_LINE_HEIGHT (it.f);
-      cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
 
       if ((w->cursor.y < this_scroll_margin
 	   && CHARPOS (pos) > BEGV)