comparison src/extents.c @ 276:6330739388db r21-0b36

Import from CVS: tag r21-0b36
author cvs
date Mon, 13 Aug 2007 10:30:37 +0200
parents c5d627a313b1
children 7df0dd720c89
comparison
equal deleted inserted replaced
275:a68ae4439f57 276:6330739388db
3229 if (BUFFERP (obj) && !BUFFER_LIVE_P (XBUFFER (obj))) 3229 if (BUFFERP (obj) && !BUFFER_LIVE_P (XBUFFER (obj)))
3230 obj = extent_object (extent) = Qnil; 3230 obj = extent_object (extent) = Qnil;
3231 3231
3232 assert (!NILP (obj) || extent_detached_p (extent)); 3232 assert (!NILP (obj) || extent_detached_p (extent));
3233 3233
3234 if (NILP (obj) && (flags & DE_MUST_HAVE_BUFFER)) 3234 if ((NILP (obj) && (flags & DE_MUST_HAVE_BUFFER))
3235 || (extent_detached_p (extent) && (flags & DE_MUST_BE_ATTACHED)))
3235 { 3236 {
3236 signal_simple_error ("extent doesn't belong to a buffer or string", 3237 signal_simple_error ("extent doesn't belong to a buffer or string",
3237 extent_obj); 3238 extent_obj);
3238 }
3239
3240 if (extent_detached_p (extent) && (flags & DE_MUST_BE_ATTACHED))
3241 {
3242 signal_simple_error ("extent cannot be detached", extent_obj);
3243 } 3239 }
3244 3240
3245 return extent; 3241 return extent;
3246 } 3242 }
3247 3243