diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:24:58 +0000 |
| commit | c73bd236f75b742ad4642ec94798987ae6e3e1e8 (patch) | |
| tree | ef5edc8db557fc1d25a17c379e4ae63a38b3ba5c /src/insdel.c | |
| parent | ecb21060d5c1752d41d7a742be565c59b5fcb855 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-c73bd236f75b742ad4642ec94798987ae6e3e1e8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'src/insdel.c')
| -rw-r--r-- | src/insdel.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/insdel.c b/src/insdel.c index 059a3c47d1b..0b10534db2f 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -415,13 +415,8 @@ adjust_markers_for_insert (from, from_byte, to, to_byte, before_markers) for (m = BUF_MARKERS (current_buffer); m; m = m->next) { - /* In a single-byte buffer, a marker's two positions must be - equal. */ - if (Z == Z_BYTE) - { - if (m->charpos != m->bytepos) - abort (); - } + eassert (m->bytepos >= m->charpos + && m->bytepos - m->charpos <= Z_BYTE - Z); if (m->bytepos == from_byte) { @@ -468,9 +463,7 @@ adjust_point (nchars, nbytes) BUF_PT_BYTE (current_buffer) += nbytes; /* In a single-byte buffer, the two positions must be equal. */ - if (ZV == ZV_BYTE - && PT != PT_BYTE) - abort (); + eassert (PT_BYTE >= PT && PT_BYTE - PT <= ZV_BYTE - ZV); } /* Adjust markers for a replacement of a text at FROM (FROM_BYTE) of |