diff options
| author | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-06-28 11:50:27 +0400 |
| commit | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch) | |
| tree | 447eb906b698dee37a17779ea15f448079b8f54b /src/scroll.c | |
| parent | 1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff) | |
| download | emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.gz emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.zip | |
Generalize run-time debugging checks.
* configure.in (ENABLE_CHECKING): Update comment.
* src/dispextern.h (XASSERTS): Remove.
* src/fontset.c (xassert): Remove.
Convert from xassert to eassert.
* src/alloc.c: Convert from xassert to eassert.
* src/bidi.c: Likewise.
* src/dispnew.c: Likewise.
* src/fns.c: Likewise.
* src/fringe.c: Likewise.
* src/ftfont.c: Likewise.
* src/gtkutil.c: Likewise.
* src/image.c: Likewise.
* src/keyboard.c: Likewise.
* src/menu.c: Likewise.
* src/process.c: Likewise.
* src/scroll.c: Likewise.
* src/sound.c: Likewise.
* src/term.c: Likewise.
* src/w32console.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/window.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xselect.c: Likewise.
* src/xterm.c: Likewise.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scroll.c b/src/scroll.c index abc5c17400a..603e04575f6 100644 --- a/src/scroll.c +++ b/src/scroll.c | |||
| @@ -270,7 +270,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 270 | { \ | 270 | { \ |
| 271 | int ck; \ | 271 | int ck; \ |
| 272 | for (ck = 0; ck < window_size; ++ck) \ | 272 | for (ck = 0; ck < window_size; ++ck) \ |
| 273 | xassert (copy_from[ck] == -1 \ | 273 | eassert (copy_from[ck] == -1 \ |
| 274 | || (copy_from[ck] >= 0 && copy_from[ck] < window_size)); \ | 274 | || (copy_from[ck] >= 0 && copy_from[ck] < window_size)); \ |
| 275 | } \ | 275 | } \ |
| 276 | while (0); | 276 | while (0); |
| @@ -317,8 +317,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 317 | { | 317 | { |
| 318 | /* Best thing done here is no insert or delete, i.e. a write. */ | 318 | /* Best thing done here is no insert or delete, i.e. a write. */ |
| 319 | --i, --j; | 319 | --i, --j; |
| 320 | xassert (i >= 0 && i < window_size); | 320 | eassert (i >= 0 && i < window_size); |
| 321 | xassert (j >= 0 && j < window_size); | 321 | eassert (j >= 0 && j < window_size); |
| 322 | copy_from[i] = j; | 322 | copy_from[i] = j; |
| 323 | retained_p[j] = 1; | 323 | retained_p[j] = 1; |
| 324 | 324 | ||
| @@ -368,7 +368,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | for (k = 0; k < window_size; ++k) | 370 | for (k = 0; k < window_size; ++k) |
| 371 | xassert (copy_from[k] >= 0 && copy_from[k] < window_size); | 371 | eassert (copy_from[k] >= 0 && copy_from[k] < window_size); |
| 372 | 372 | ||
| 373 | /* Perform the row swizzling. */ | 373 | /* Perform the row swizzling. */ |
| 374 | mirrored_line_dance (current_matrix, unchanged_at_top, window_size, | 374 | mirrored_line_dance (current_matrix, unchanged_at_top, window_size, |
| @@ -728,7 +728,7 @@ do_direct_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, | |||
| 728 | place they belong. */ | 728 | place they belong. */ |
| 729 | int n_to_write = p->writecount; | 729 | int n_to_write = p->writecount; |
| 730 | write_follows_p = 1; | 730 | write_follows_p = 1; |
| 731 | xassert (n_to_write > 0); | 731 | eassert (n_to_write > 0); |
| 732 | 732 | ||
| 733 | if (i > j) | 733 | if (i > j) |
| 734 | { | 734 | { |