comparison src/buffer.c @ 5143:186aebf7f6c6

merge
author Ben Wing <ben@xemacs.org>
date Sat, 13 Mar 2010 11:38:54 -0600
parents f965e31a35f0
children 1fae11d56ad2
comparison
equal deleted inserted replaced
5140:e5380fdaf8f1 5143:186aebf7f6c6
300 struct buffer *b = XBUFFER (obj); 300 struct buffer *b = XBUFFER (obj);
301 301
302 if (print_readably) 302 if (print_readably)
303 { 303 {
304 if (!BUFFER_LIVE_P (b)) 304 if (!BUFFER_LIVE_P (b))
305 printing_unreadable_object ("#<killed buffer>"); 305 printing_unreadable_object_fmt ("#<killed buffer>");
306 else 306 else
307 printing_unreadable_object ("#<buffer %s>", XSTRING_DATA (b->name)); 307 printing_unreadable_object_fmt ("#<buffer %s>", XSTRING_DATA (b->name));
308 } 308 }
309 else if (!BUFFER_LIVE_P (b)) 309 else if (!BUFFER_LIVE_P (b))
310 write_ascstring (printcharfun, "#<killed buffer>"); 310 write_ascstring (printcharfun, "#<killed buffer>");
311 else if (escapeflag) 311 else if (escapeflag)
312 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name); 312 write_fmt_string_lisp (printcharfun, "#<buffer %S>", 1, b->name);
2173 1, /* mark bit */ \ 2173 1, /* mark bit */ \
2174 1, /* c_readonly bit */ \ 2174 1, /* c_readonly bit */ \
2175 1 /* lisp_readonly bit */ \ 2175 1 /* lisp_readonly bit */ \
2176 }, \ 2176 }, \
2177 0, /* next */ \ 2177 0, /* next */ \
2178 0, /* uid */ \
2179 0 /* free */ \
2180 }, \ 2178 }, \
2181 &(buffer_local_flags.field_name), \ 2179 &(buffer_local_flags.field_name), \
2182 forward_type \ 2180 forward_type \
2183 }, \ 2181 }, \
2184 magicfun \ 2182 magicfun \