From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 10 May 2001 12:25:51 +0000 (+0000)
Subject: (try_window_id): Add some xasserts.
X-Git-Tag: emacs-pretest-21.0.104~551
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23fca89114fcb4088e164fee3d94750651ebb947;p=emacs.git

(try_window_id): Add some xasserts.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f92f805d6c5..7e9b7b11284 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-10  Gerd Moellmann  <gerd@gnu.org>
+
+	* xdisp.c (try_window_id): Add some xasserts.
+
 2001-05-09  Gerd Moellmann  <gerd@gnu.org>
 
 	* lisp.h (GLYPH_CHAR_VALID_P): Use CHAR_VALID_P.
diff --git a/src/xdisp.c b/src/xdisp.c
index a0466038527..f9b9cb3c9ab 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11655,6 +11655,7 @@ try_window_id (w)
       w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
       w->window_end_vpos
 	= make_number (MATRIX_ROW_VPOS (row, w->current_matrix));
+      xassert (w->window_end_bytepos >= 0);
     }
   else if (last_text_row_at_end)
     {
@@ -11664,6 +11665,7 @@ try_window_id (w)
 	= Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
       w->window_end_vpos
 	= make_number (MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix));
+      xassert (w->window_end_bytepos >= 0);
     }
   else if (last_text_row)
     {
@@ -11676,6 +11678,7 @@ try_window_id (w)
 	= Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
       w->window_end_vpos
 	= make_number (MATRIX_ROW_VPOS (last_text_row, desired_matrix));
+      xassert (w->window_end_bytepos >= 0);
     }
   else if (first_unchanged_at_end_row == NULL
 	   && last_text_row == NULL
@@ -11697,6 +11700,7 @@ try_window_id (w)
       row = MATRIX_ROW (w->desired_matrix, vpos);
       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);
     }
   else
     abort ();