aboutsummaryrefslogtreecommitdiffstats
path: root/src/region-cache.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/region-cache.c')
-rw-r--r--src/region-cache.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/region-cache.c b/src/region-cache.c
index d2bba8c11b2..c3eb087aade 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -194,7 +194,7 @@ find_cache_boundary (struct region_cache *c, ptrdiff_t pos)
194 if (BOUNDARY_POS (c, low) > pos 194 if (BOUNDARY_POS (c, low) > pos
195 || (low + 1 < c->cache_len 195 || (low + 1 < c->cache_len
196 && BOUNDARY_POS (c, low + 1) <= pos)) 196 && BOUNDARY_POS (c, low + 1) <= pos))
197 abort (); 197 emacs_abort ();
198 198
199 return low; 199 return low;
200} 200}
@@ -217,12 +217,12 @@ move_cache_gap (struct region_cache *c, ptrdiff_t pos, ptrdiff_t min_size)
217 217
218 if (pos < 0 218 if (pos < 0
219 || pos > c->cache_len) 219 || pos > c->cache_len)
220 abort (); 220 emacs_abort ();
221 221
222 /* We mustn't ever try to put the gap before the dummy start 222 /* We mustn't ever try to put the gap before the dummy start
223 boundary. That must always be start-relative. */ 223 boundary. That must always be start-relative. */
224 if (pos == 0) 224 if (pos == 0)
225 abort (); 225 emacs_abort ();
226 226
227 /* Need we move the gap right? */ 227 /* Need we move the gap right? */
228 while (gap_start < pos) 228 while (gap_start < pos)
@@ -291,24 +291,24 @@ insert_cache_boundary (struct region_cache *c, ptrdiff_t i, ptrdiff_t pos,
291{ 291{
292 /* i must be a valid cache index. */ 292 /* i must be a valid cache index. */
293 if (i < 0 || i > c->cache_len) 293 if (i < 0 || i > c->cache_len)
294 abort (); 294 emacs_abort ();
295 295
296 /* We must never want to insert something before the dummy first 296 /* We must never want to insert something before the dummy first
297 boundary. */ 297 boundary. */
298 if (i == 0) 298 if (i == 0)
299 abort (); 299 emacs_abort ();
300 300
301 /* We must only be inserting things in order. */ 301 /* We must only be inserting things in order. */
302 if (! (BOUNDARY_POS (c, i - 1) < pos 302 if (! (BOUNDARY_POS (c, i - 1) < pos
303 && (i == c->cache_len 303 && (i == c->cache_len
304 || pos < BOUNDARY_POS (c, i)))) 304 || pos < BOUNDARY_POS (c, i))))
305 abort (); 305 emacs_abort ();
306 306
307 /* The value must be different from the ones around it. However, we 307 /* The value must be different from the ones around it. However, we
308 temporarily create boundaries that establish the same value as 308 temporarily create boundaries that establish the same value as
309 the subsequent boundary, so we're not going to flag that case. */ 309 the subsequent boundary, so we're not going to flag that case. */
310 if (BOUNDARY_VALUE (c, i - 1) == value) 310 if (BOUNDARY_VALUE (c, i - 1) == value)
311 abort (); 311 emacs_abort ();
312 312
313 move_cache_gap (c, i, 1); 313 move_cache_gap (c, i, 1);
314 314
@@ -331,16 +331,16 @@ delete_cache_boundaries (struct region_cache *c,
331 /* Gotta be in range. */ 331 /* Gotta be in range. */
332 if (start < 0 332 if (start < 0
333 || end > c->cache_len) 333 || end > c->cache_len)
334 abort (); 334 emacs_abort ();
335 335
336 /* Gotta be in order. */ 336 /* Gotta be in order. */
337 if (start > end) 337 if (start > end)
338 abort (); 338 emacs_abort ();
339 339
340 /* Can't delete the dummy entry. */ 340 /* Can't delete the dummy entry. */
341 if (start == 0 341 if (start == 0
342 && end >= 1) 342 && end >= 1)
343 abort (); 343 emacs_abort ();
344 344
345 /* Minimize gap motion. If we're deleting nothing, do nothing. */ 345 /* Minimize gap motion. If we're deleting nothing, do nothing. */
346 if (len == 0) 346 if (len == 0)
@@ -380,10 +380,10 @@ set_cache_region (struct region_cache *c,
380 ptrdiff_t start, ptrdiff_t end, int value) 380 ptrdiff_t start, ptrdiff_t end, int value)
381{ 381{
382 if (start > end) 382 if (start > end)
383 abort (); 383 emacs_abort ();
384 if (start < c->buffer_beg 384 if (start < c->buffer_beg
385 || end > c->buffer_end) 385 || end > c->buffer_end)
386 abort (); 386 emacs_abort ();
387 387
388 /* Eliminate this case; then we can assume that start and end-1 are 388 /* Eliminate this case; then we can assume that start and end-1 are
389 both the locations of real characters in the buffer. */ 389 both the locations of real characters in the buffer. */