diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-22 11:15:23 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-22 11:15:23 -0700 |
| commit | 85fece3ec2ac88faec0ae3da5417d6e60b10cc63 (patch) | |
| tree | a6a72b462548f9f78a28d9508299582db361d87b /src/scroll.c | |
| parent | 94a807ac4e785c6387ddac4380a924a7859ab3f2 (diff) | |
| download | emacs-85fece3ec2ac88faec0ae3da5417d6e60b10cc63.tar.gz | |
GLYPH_DEBUG fixes
The following patches are for when GLYPH_DEBUG && !XASSERT.
* dispextern.h (trace_redisplay_p, dump_glyph_string):
* dispnew.c (flush_stdout):
* xdisp.c (dump_glyph_row, dump_glyph_matrix, dump_glyph):
Mark as externally visible.
* dispnew.c (check_window_matrix_pointers): Now static.
* dispnew.c (window_to_frame_vpos):
* xfns.c (unwind_create_frame):
* xterm.c (x_check_font): Remove unused local.
* scroll.c (CHECK_BOUNDS):
* xfaces.c (cache_fache): Rename local to avoid shadowing.
* xfns.c, w32fns.c (image_cache_refcount, dpyinfo_refcount): Now static.
* xdisp.c (check_window_end): Now a no-op if !XASSERTS.
(debug_first_unchanged_at_end_vpos, debug_last_unchanged_at_beg_vpos)
(debug_dvpos, debug_dy, debug_delta, debug_delta_bytes, debug_end_vpos):
Now static.
(debug_method_add): Use va_list and vsprintf rather than relying
on undefined behavior with wrong number of arguments.
(dump_glyph, dump_glyph_row, Fdump_glyph_matrix):
Don't assume ptrdiff_t and EMACS_INT are the same width as int.
In this code, it's OK to assume C99 behavior for ptrdiff_t formats
since we're not interested in debugging glyphs with old libraries.
* xfaces.c (cache_face): Move debugging code earlier; this pacifies
GCC 4.6.0's static checking.
Diffstat (limited to 'src/scroll.c')
| -rw-r--r-- | src/scroll.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scroll.c b/src/scroll.c index ba012874460..6291936a541 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -268,10 +268,10 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, # define CHECK_BOUNDS \ do \ { \ - int k; \ - for (k = 0; k < window_size; ++k) \ - xassert (copy_from[k] == -1 \ - || (copy_from[k] >= 0 && copy_from[k] < window_size)); \ + int ck; \ + for (ck = 0; ck < window_size; ++ck) \ + xassert (copy_from[ck] == -1 \ + || (copy_from[ck] >= 0 && copy_from[ck] < window_size)); \ } \ while (0); #endif |