aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-06-28 11:50:27 +0400
committerDmitry Antipov2012-06-28 11:50:27 +0400
commita54e2c050b9cf161cbccc3dd4628f8ef6b64f519 (patch)
tree447eb906b698dee37a17779ea15f448079b8f54b /src/window.c
parent1c9bd87017e4b5f7f56e734277ff6e0a0ebb51d6 (diff)
downloademacs-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/window.c')
-rw-r--r--src/window.c12
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
2035 candidate_p = 1; 2035 candidate_p = 1;
2036 else if (NILP (all_frames)) 2036 else if (NILP (all_frames))
2037 { 2037 {
2038 xassert (WINDOWP (owindow)); 2038 eassert (WINDOWP (owindow));
2039 candidate_p = EQ (w->frame, XWINDOW (owindow)->frame); 2039 candidate_p = EQ (w->frame, XWINDOW (owindow)->frame);
2040 } 2040 }
2041 else if (EQ (all_frames, Qvisible)) 2041 else if (EQ (all_frames, Qvisible))
@@ -4010,8 +4010,8 @@ grow_mini_window (struct window *w, int delta)
4010 struct window *r; 4010 struct window *r;
4011 Lisp_Object root, value; 4011 Lisp_Object root, value;
4012 4012
4013 xassert (MINI_WINDOW_P (w)); 4013 eassert (MINI_WINDOW_P (w));
4014 xassert (delta >= 0); 4014 eassert (delta >= 0);
4015 4015
4016 root = FRAME_ROOT_WINDOW (f); 4016 root = FRAME_ROOT_WINDOW (f);
4017 r = XWINDOW (root); 4017 r = XWINDOW (root);
@@ -4043,7 +4043,7 @@ shrink_mini_window (struct window *w)
4043 Lisp_Object root, value; 4043 Lisp_Object root, value;
4044 EMACS_INT size; 4044 EMACS_INT size;
4045 4045
4046 xassert (MINI_WINDOW_P (w)); 4046 eassert (MINI_WINDOW_P (w));
4047 4047
4048 size = XINT (w->total_lines); 4048 size = XINT (w->total_lines);
4049 if (size > 1) 4049 if (size > 1)
@@ -4721,7 +4721,7 @@ scroll_command (Lisp_Object n, int direction)
4721{ 4721{
4722 ptrdiff_t count = SPECPDL_INDEX (); 4722 ptrdiff_t count = SPECPDL_INDEX ();
4723 4723
4724 xassert (eabs (direction) == 1); 4724 eassert (eabs (direction) == 1);
4725 4725
4726 /* If selected window's buffer isn't current, make it current for 4726 /* If selected window's buffer isn't current, make it current for
4727 the moment. But don't screw up if window_scroll gets an error. */ 4727 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. */)
5686 if (NILP (leaf_windows[i]->buffer)) 5686 if (NILP (leaf_windows[i]->buffer))
5687 { 5687 {
5688 /* Assert it's not reused as a combination. */ 5688 /* Assert it's not reused as a combination. */
5689 xassert (NILP (leaf_windows[i]->hchild) 5689 eassert (NILP (leaf_windows[i]->hchild)
5690 && NILP (leaf_windows[i]->vchild)); 5690 && NILP (leaf_windows[i]->vchild));
5691 free_window_matrices (leaf_windows[i]); 5691 free_window_matrices (leaf_windows[i]);
5692 } 5692 }