aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-05-10 12:25:51 +0000
committerGerd Moellmann2001-05-10 12:25:51 +0000
commit23fca89114fcb4088e164fee3d94750651ebb947 (patch)
tree3cd1bfa1179905999e3ca1c64fb99b9b90fea304 /src
parent74cb6a624877a26b1c3b303c9508ace69877b571 (diff)
downloademacs-23fca89114fcb4088e164fee3d94750651ebb947.tar.gz
emacs-23fca89114fcb4088e164fee3d94750651ebb947.zip
(try_window_id): Add some xasserts.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f92f805d6c5..7e9b7b11284 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-05-10 Gerd Moellmann <gerd@gnu.org>
2
3 * xdisp.c (try_window_id): Add some xasserts.
4
12001-05-09 Gerd Moellmann <gerd@gnu.org> 52001-05-09 Gerd Moellmann <gerd@gnu.org>
2 6
3 * lisp.h (GLYPH_CHAR_VALID_P): Use CHAR_VALID_P. 7 * 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)
11655 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); 11655 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
11656 w->window_end_vpos 11656 w->window_end_vpos
11657 = make_number (MATRIX_ROW_VPOS (row, w->current_matrix)); 11657 = make_number (MATRIX_ROW_VPOS (row, w->current_matrix));
11658 xassert (w->window_end_bytepos >= 0);
11658 } 11659 }
11659 else if (last_text_row_at_end) 11660 else if (last_text_row_at_end)
11660 { 11661 {
@@ -11664,6 +11665,7 @@ try_window_id (w)
11664 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end); 11665 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
11665 w->window_end_vpos 11666 w->window_end_vpos
11666 = make_number (MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix)); 11667 = make_number (MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix));
11668 xassert (w->window_end_bytepos >= 0);
11667 } 11669 }
11668 else if (last_text_row) 11670 else if (last_text_row)
11669 { 11671 {
@@ -11676,6 +11678,7 @@ try_window_id (w)
11676 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row); 11678 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
11677 w->window_end_vpos 11679 w->window_end_vpos
11678 = make_number (MATRIX_ROW_VPOS (last_text_row, desired_matrix)); 11680 = make_number (MATRIX_ROW_VPOS (last_text_row, desired_matrix));
11681 xassert (w->window_end_bytepos >= 0);
11679 } 11682 }
11680 else if (first_unchanged_at_end_row == NULL 11683 else if (first_unchanged_at_end_row == NULL
11681 && last_text_row == NULL 11684 && last_text_row == NULL
@@ -11697,6 +11700,7 @@ try_window_id (w)
11697 row = MATRIX_ROW (w->desired_matrix, vpos); 11700 row = MATRIX_ROW (w->desired_matrix, vpos);
11698 w->window_end_pos = make_number (Z - MATRIX_ROW_END_CHARPOS (row)); 11701 w->window_end_pos = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
11699 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row); 11702 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
11703 xassert (w->window_end_bytepos >= 0);
11700 } 11704 }
11701 else 11705 else
11702 abort (); 11706 abort ();