Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/src/extents.c Mon Aug 13 10:29:43 2007 +0200 +++ b/src/extents.c Mon Aug 13 10:30:37 2007 +0200 @@ -3231,17 +3231,13 @@ assert (!NILP (obj) || extent_detached_p (extent)); - if (NILP (obj) && (flags & DE_MUST_HAVE_BUFFER)) + if ((NILP (obj) && (flags & DE_MUST_HAVE_BUFFER)) + || (extent_detached_p (extent) && (flags & DE_MUST_BE_ATTACHED))) { signal_simple_error ("extent doesn't belong to a buffer or string", extent_obj); } - if (extent_detached_p (extent) && (flags & DE_MUST_BE_ATTACHED)) - { - signal_simple_error ("extent cannot be detached", extent_obj); - } - return extent; }