From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 2 Oct 2007 21:07:15 +0000 (+0000)
Subject: (adjust_markers_for_insert): Generalize assertion checks.
X-Git-Tag: emacs-pretest-23.0.90~10544
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86a56ef3739fd7e4f1abd0fc122fa6348b73bc36;p=emacs.git

(adjust_markers_for_insert): Generalize assertion checks.
---

diff --git a/src/insdel.c b/src/insdel.c
index cd8e2738f9a..5cde53864b7 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