Mercurial > hg > xemacs-beta
diff src/buffer.c @ 5126:2a462149bd6a ben-lisp-object
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Feb 2010 19:04:27 -0600 |
| parents | b5df3737028a 6f2158fa75ed |
| children | a9c41067dd88 |
line wrap: on
line diff
--- a/src/buffer.c Wed Feb 24 01:58:04 2010 -0600 +++ b/src/buffer.c Wed Feb 24 19:04:27 2010 -0600 @@ -1,7 +1,7 @@ /* Buffer manipulation primitives for XEmacs. Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004, 2010 Ben Wing. This file is part of XEmacs. @@ -2870,10 +2870,9 @@ slot of buffer_local_flags and vice-versa. Must be done after all DEFVAR_BUFFER_LOCAL() calls. */ #define MARKED_SLOT(slot) \ - if ((XINT (buffer_local_flags.slot) != -2 && \ - XINT (buffer_local_flags.slot) != -3) \ - != !(NILP (XBUFFER (Vbuffer_local_symbols)->slot))) \ - ABORT (); + assert ((XINT (buffer_local_flags.slot) != -2 && \ + XINT (buffer_local_flags.slot) != -3) \ + == !(NILP (XBUFFER (Vbuffer_local_symbols)->slot))); #include "bufslots.h" {