aboutsummaryrefslogtreecommitdiffstats
path: root/src/marker.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/marker.c')
-rw-r--r--src/marker.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/marker.c b/src/marker.c
index 4ea06c7cd57..de3c19c3bcb 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -59,7 +59,7 @@ byte_char_debug_check (struct buffer *b, ptrdiff_t charpos, ptrdiff_t bytepos)
59 bytepos - BUF_BEG_BYTE (b)); 59 bytepos - BUF_BEG_BYTE (b));
60 60
61 if (charpos - 1 != nchars) 61 if (charpos - 1 != nchars)
62 abort (); 62 emacs_abort ();
63} 63}
64 64
65#else /* not MARKER_DEBUG */ 65#else /* not MARKER_DEBUG */
@@ -67,7 +67,7 @@ byte_char_debug_check (struct buffer *b, ptrdiff_t charpos, ptrdiff_t bytepos)
67#define byte_char_debug_check(b, charpos, bytepos) do { } while (0) 67#define byte_char_debug_check(b, charpos, bytepos) do { } while (0)
68 68
69#endif /* MARKER_DEBUG */ 69#endif /* MARKER_DEBUG */
70 70
71void 71void
72clear_charpos_cache (struct buffer *b) 72clear_charpos_cache (struct buffer *b)
73{ 73{
@@ -142,7 +142,7 @@ buf_charpos_to_bytepos (struct buffer *b, ptrdiff_t charpos)
142 ptrdiff_t best_below, best_below_byte; 142 ptrdiff_t best_below, best_below_byte;
143 143
144 if (charpos < BUF_BEG (b) || charpos > BUF_Z (b)) 144 if (charpos < BUF_BEG (b) || charpos > BUF_Z (b))
145 abort (); 145 emacs_abort ();
146 146
147 best_above = BUF_Z (b); 147 best_above = BUF_Z (b);
148 best_above_byte = BUF_Z_BYTE (b); 148 best_above_byte = BUF_Z_BYTE (b);
@@ -296,7 +296,7 @@ buf_bytepos_to_charpos (struct buffer *b, ptrdiff_t bytepos)
296 ptrdiff_t best_below, best_below_byte; 296 ptrdiff_t best_below, best_below_byte;
297 297
298 if (bytepos < BUF_BEG_BYTE (b) || bytepos > BUF_Z_BYTE (b)) 298 if (bytepos < BUF_BEG_BYTE (b) || bytepos > BUF_Z_BYTE (b))
299 abort (); 299 emacs_abort ();
300 300
301 best_above = BUF_Z (b); 301 best_above = BUF_Z (b);
302 best_above_byte = BUF_Z_BYTE (b); 302 best_above_byte = BUF_Z_BYTE (b);
@@ -506,7 +506,7 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position,
506 else 506 else
507 { 507 {
508 register ptrdiff_t charpos, bytepos; 508 register ptrdiff_t charpos, bytepos;
509 509
510 CHECK_NUMBER_COERCE_MARKER (position); 510 CHECK_NUMBER_COERCE_MARKER (position);
511 charpos = clip_to_bounds (restricted ? BUF_BEGV (b) : BUF_BEG (b), 511 charpos = clip_to_bounds (restricted ? BUF_BEGV (b) : BUF_BEG (b),
512 XINT (position), 512 XINT (position),
@@ -570,8 +570,8 @@ set_marker_restricted_both (Lisp_Object marker, Lisp_Object buffer,
570 570
571 if (b) 571 if (b)
572 { 572 {
573 attach_marker 573 attach_marker
574 (m, b, 574 (m, b,
575 clip_to_bounds (BUF_BEGV (b), charpos, BUF_ZV (b)), 575 clip_to_bounds (BUF_BEGV (b), charpos, BUF_ZV (b)),
576 clip_to_bounds (BUF_BEGV_BYTE (b), bytepos, BUF_ZV_BYTE (b))); 576 clip_to_bounds (BUF_BEGV_BYTE (b), bytepos, BUF_ZV_BYTE (b)));
577 } 577 }
@@ -605,12 +605,12 @@ unchain_marker (register struct Lisp_Marker *marker)
605 { 605 {
606 if (*prev == BUF_MARKERS (b)) 606 if (*prev == BUF_MARKERS (b))
607 { 607 {
608 /* Deleting first marker from the buffer's chain. Crash 608 /* Deleting first marker from the buffer's chain. Crash
609 if new first marker in chain does not say it belongs 609 if new first marker in chain does not say it belongs
610 to the same buffer, or at least that they have the same 610 to the same buffer, or at least that they have the same
611 base buffer. */ 611 base buffer. */
612 if (tail->next && b->text != tail->next->buffer->text) 612 if (tail->next && b->text != tail->next->buffer->text)
613 abort (); 613 emacs_abort ();
614 } 614 }
615 *prev = tail->next; 615 *prev = tail->next;
616 /* We have removed the marker from the chain; 616 /* We have removed the marker from the chain;