diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:27 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-06-28 11:50:27 +0400 |
| commit | a54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch) | |
| tree | 447eb906b698dee37a17779ea15f448079b8f54b /src/window.c | |
| parent | 1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff) | |
| download | emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.gz emacs-a54e2c050b9cf161cbccc3dd4628f8ef6b64f519.tar.bz2 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/window.c')
| -rw-r--r-- | src/window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/window.c b/src/window.c index 05749c12bb9..f640a54b283 100644 --- a/src/window.c +++ b/src/window.c @@ -2035,7 +2035,7 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf candidate_p = 1; else if (NILP (all_frames)) { - xassert (WINDOWP (owindow)); + eassert (WINDOWP (owindow)); candidate_p = EQ (w->frame, XWINDOW (owindow)->frame); } else if (EQ (all_frames, Qvisible)) @@ -4010,8 +4010,8 @@ grow_mini_window (struct window *w, int delta) struct window *r; Lisp_Object root, value; - xassert (MINI_WINDOW_P (w)); - xassert (delta >= 0); + eassert (MINI_WINDOW_P (w)); + eassert (delta >= 0); root = FRAME_ROOT_WINDOW (f); r = XWINDOW (root); @@ -4043,7 +4043,7 @@ shrink_mini_window (struct window *w) Lisp_Object root, value; EMACS_INT size; - xassert (MINI_WINDOW_P (w)); + eassert (MINI_WINDOW_P (w)); size = XINT (w->total_lines); if (size > 1) @@ -4721,7 +4721,7 @@ scroll_command (Lisp_Object n, int direction) { ptrdiff_t count = SPECPDL_INDEX (); - xassert (eabs (direction) == 1); + eassert (eabs (direction) == 1); /* If selected window's buffer isn't current, make it current for the moment. But don't screw up if window_scroll gets an error. */ @@ -5686,7 +5686,7 @@ the return value is nil. Otherwise the value is t. */) if (NILP (leaf_windows[i]->buffer)) { /* Assert it's not reused as a combination. */ - xassert (NILP (leaf_windows[i]->hchild) + eassert (NILP (leaf_windows[i]->hchild) && NILP (leaf_windows[i]->vchild)); free_window_matrices (leaf_windows[i]); } |