Mercurial > hg > xemacs-beta

comparison src/buffer.h @ 5140:e5380fdaf8f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 05:38:34 -0600
parents a9c41067dd88
children 308d34e9f07d
comparison
equal deleted inserted replaced
5139:a48ef26d87ee 5140:e5380fdaf8f1
78 #define NUM_MOVED_POSITIONS 10 78 #define NUM_MOVED_POSITIONS 10
79 79
80 struct buffer_text 80 struct buffer_text
81 { 81 {
82 #ifdef NEW_GC 82 #ifdef NEW_GC
83 struct lrecord_header header; 83 NORMAL_LISP_OBJECT_HEADER header;
84 #endif /* NEW_GC */ 84 #endif /* NEW_GC */
85 Ibyte *beg; /* Actual address of buffer contents. */ 85 Ibyte *beg; /* Actual address of buffer contents. */
86 Bytebpos gpt; /* Index of gap in buffer. */ 86 Bytebpos gpt; /* Index of gap in buffer. */
87 Charbpos bufgpt; /* Equivalent as a Charbpos. */ 87 Charbpos bufgpt; /* Equivalent as a Charbpos. */
88 Bytebpos z; /* Index of end of buffer. */ 88 Bytebpos z; /* Index of end of buffer. */
142 }; 142 };
143 143
144 #ifdef NEW_GC 144 #ifdef NEW_GC
145 typedef struct buffer_text Lisp_Buffer_Text; 145 typedef struct buffer_text Lisp_Buffer_Text;
146 146
147 DECLARE_LRECORD (buffer_text, Lisp_Buffer_Text); 147 DECLARE_LISP_OBJECT (buffer_text, Lisp_Buffer_Text);
148 148
149 #define XBUFFER_TEXT(x) \ 149 #define XBUFFER_TEXT(x) \
150 XRECORD (x, buffer_text, Lisp_Buffer_Text) 150 XRECORD (x, buffer_text, Lisp_Buffer_Text)
151 #define wrap_buffer_text(p) wrap_record (p, buffer_text) 151 #define wrap_buffer_text(p) wrap_record (p, buffer_text)
152 #define BUFFER_TEXT_P(x) RECORDP (x, buffer_text) 152 #define BUFFER_TEXT_P(x) RECORDP (x, buffer_text)
155 #endif /* NEW_GC */ 155 #endif /* NEW_GC */
156 156
157 157
158 struct buffer 158 struct buffer
159 { 159 {
160 struct LCRECORD_HEADER header; 160 NORMAL_LISP_OBJECT_HEADER header;
161 161
162 /* This structure holds the coordinates of the buffer contents 162 /* This structure holds the coordinates of the buffer contents
163 in ordinary buffers. In indirect buffers, this is not used. */ 163 in ordinary buffers. In indirect buffers, this is not used. */
164 struct buffer_text own_text; 164 struct buffer_text own_text;
165 165
266 #define MARKED_SLOT(x) Lisp_Object x; 266 #define MARKED_SLOT(x) Lisp_Object x;
267 #include "bufslots.h" 267 #include "bufslots.h"
268 #undef MARKED_SLOT 268 #undef MARKED_SLOT
269 }; 269 };
270 270
271 DECLARE_LRECORD (buffer, struct buffer); 271 DECLARE_LISP_OBJECT (buffer, struct buffer);
272 #define XBUFFER(x) XRECORD (x, buffer, struct buffer) 272 #define XBUFFER(x) XRECORD (x, buffer, struct buffer)
273 #define wrap_buffer(p) wrap_record (p, buffer) 273 #define wrap_buffer(p) wrap_record (p, buffer)
274 #define BUFFERP(x) RECORDP (x, buffer) 274 #define BUFFERP(x) RECORDP (x, buffer)
275 #define CHECK_BUFFER(x) CHECK_RECORD (x, buffer) 275 #define CHECK_BUFFER(x) CHECK_RECORD (x, buffer)
276 #define CONCHECK_BUFFER(x) CONCHECK_RECORD (x, buffer) 276 #define CONCHECK_BUFFER(x) CONCHECK_RECORD (x, buffer)