upstream

1 files changed, 9 insertions, 9 deletions

diff --git a/src/intervals.c b/src/intervals.c
index 49d61b2f9b0..e508f968963 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -199,13 +199,13 @@ intervals_equal (INTERVAL i0, INTERVAL i1)
       i0_sym = XCAR (i0_cdr);
       i0_cdr = XCDR (i0_cdr);
       if (!CONSP (i0_cdr))
-        return 0;               /* abort (); */
+        return 0;
       i1_val = i1->plist;
       while (CONSP (i1_val) && !EQ (XCAR (i1_val), i0_sym))
         {
           i1_val = XCDR (i1_val);
           if (!CONSP (i1_val))
-            return 0;           /* abort (); */
+            return 0;
           i1_val = XCDR (i1_val);
         }
 
@@ -223,7 +223,7 @@ intervals_equal (INTERVAL i0, INTERVAL i1)
 
       i1_cdr = XCDR (i1_cdr);
       if (!CONSP (i1_cdr))
-        return 0;               /* abort (); */
+        return 0;
       i1_cdr = XCDR (i1_cdr);
     }
 
@@ -1253,7 +1253,7 @@ delete_interval (register INTERVAL i)
       else if (STRINGP (owner))
         set_string_intervals (owner, parent);
       else
-        abort ();
+        emacs_abort ();
 
       return;
     }
@@ -1408,7 +1408,7 @@ offset_intervals (struct buffer *buffer, ptrdiff_t start, ptrdiff_t length)
                                     start, length);
   else
     {
-      IF_LINT (if (length < - TYPE_MAXIMUM (ptrdiff_t)) abort ();)
+      lint_assume (- TYPE_MAXIMUM (ptrdiff_t) <= length);
       adjust_intervals_for_deletion (buffer, start, -length);
     }
 }
@@ -1468,7 +1468,7 @@ merge_interval_right (register INTERVAL i)
 
   /* This must be the rightmost or last interval and cannot
      be merged right.  The caller should have known.  */
-  abort ();
+  emacs_abort ();
 }
 
 /* Merge interval I with its lexicographic predecessor. The resulting
@@ -1524,7 +1524,7 @@ merge_interval_left (register INTERVAL i)
 
   /* This must be the leftmost or first interval and cannot
      be merged left.  The caller should have known.  */
-  abort ();
+  emacs_abort ();
 }
 
 /* Create a copy of SOURCE but with the default value of UP.  */
@@ -2170,7 +2170,7 @@ get_property_and_range (ptrdiff_t pos, Lisp_Object prop, Lisp_Object *val,
   else if (STRINGP (object))
     i = find_interval (string_intervals (object), pos);
   else
-    abort ();
+    emacs_abort ();
 
   if (!i || (i->position + LENGTH (i) <= pos))
     return 0;
@@ -2209,7 +2209,7 @@ get_local_map (register ptrdiff_t position, register struct buffer *buffer,
 
   /* Perhaps we should just change `position' to the limit.  */
   if (position > BUF_ZV (buffer) || position < BUF_BEGV (buffer))
-    abort ();
+    emacs_abort ();
 
   /* Ignore narrowing, so that a local map continues to be valid even if
      the visible region contains no characters and hence no properties.  */