From: Gerd Moellmann <gerd@gnu.org>
Date: Fri, 11 May 2001 13:07:15 +0000 (+0000)
Subject: (try_window_id): Fix the fix and set the right
X-Git-Tag: emacs-pretest-21.0.104~539
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d88a79d4a5f7ab9c893345a7ad68ffd6aad437e6;p=emacs.git

(try_window_id): Fix the fix and set the right
window_end_vpos.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index bda06d04156..bac865421b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,11 @@
 2001-05-11  Gerd Moellmann  <gerd@gnu.org>
 
-	* xdisp.c (try_window_id): Fix computation of window end in
-	the case that lines were deleted at the end of the window.
-	Add some more debug_method_adds.
+	* xdisp.c (try_window_id): Fix the fix and set the right
+	window_end_vpos.
+
+	* xdisp.c (try_window_id): Fix computation of window end in the
+	case that lines were deleted at the end of the window.  Add some
+	more debug_method_adds.
 
 	* xfaces.c (try_alternative_families): New function.
 	(try_font_list): Use it.  If ATTRS specifies a family, check
diff --git a/src/xdisp.c b/src/xdisp.c
index 97f8c81f642..f18f5ac5a2f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11707,7 +11707,7 @@ try_window_id (w)
 	}
 
       xassert (row != NULL);
-      w->window_end_vpos = make_number (vpos);
+      w->window_end_vpos = make_number (vpos + 1);
       w->window_end_pos = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
       w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
       xassert (w->window_end_bytepos >= 0);