comparison 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
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1 /* Buffer manipulation primitives for XEmacs. 1 /* Buffer manipulation primitives for XEmacs.
2 Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc. 2 Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing. 4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004, 2010 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
2868 2868
2869 /* Check for DEFVAR_BUFFER_LOCAL without initializing the corresponding 2869 /* Check for DEFVAR_BUFFER_LOCAL without initializing the corresponding
2870 slot of buffer_local_flags and vice-versa. Must be done after all 2870 slot of buffer_local_flags and vice-versa. Must be done after all
2871 DEFVAR_BUFFER_LOCAL() calls. */ 2871 DEFVAR_BUFFER_LOCAL() calls. */
2872 #define MARKED_SLOT(slot) \ 2872 #define MARKED_SLOT(slot) \
2873 if ((XINT (buffer_local_flags.slot) != -2 && \ 2873 assert ((XINT (buffer_local_flags.slot) != -2 && \
2874 XINT (buffer_local_flags.slot) != -3) \ 2874 XINT (buffer_local_flags.slot) != -3) \
2875 != !(NILP (XBUFFER (Vbuffer_local_symbols)->slot))) \ 2875 == !(NILP (XBUFFER (Vbuffer_local_symbols)->slot)));
2876 ABORT ();
2877 #include "bufslots.h" 2876 #include "bufslots.h"
2878 2877
2879 { 2878 {
2880 Lisp_Object scratch = Fget_buffer_create (QSscratch); 2879 Lisp_Object scratch = Fget_buffer_create (QSscratch);
2881 Fset_buffer (scratch); 2880 Fset_buffer (scratch);