# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1191359235 0
# Node ID c7d378d22b2428e9be5bda1aa0c5f953b90f456a
# Parent  695c195058e76ab518eb0b89216bd4a02277dfeb
(adjust_markers_for_insert): Generalize assertion checks.

diff -r 695c195058e7 -r c7d378d22b24 src/insdel.c
--- a/src/insdel.c	Tue Oct 02 21:06:16 2007 +0000
+++ b/src/insdel.c	Tue Oct 02 21:07:15 2007 +0000
@@ -415,13 +415,8 @@
 
   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 @@
   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