DO_MARKERS -> Pip's FOR_EACH_MARKERscratch/text-index

* src/marker-vector.h (DO_MARKERS_OF_VECTOR, DO_MARKERS): Remove.
(build_for_each_marker_data, next_marker_entry):
(FOR_EACH_MARKER_OF_VECTOR, FOR_EACH_MARKER): New.

* .clang-format (IndentPPDirectives): Add new FOR_EACH_ macros.

* src/alloc.c (unchain_dead_markers):
* src/buffer.c (Fkill_buffer, Fbuffer_swap_text)
(Fset_buffer_multibyte):
* src/coding.c (decode_coding_object, encode_coding_object):
* src/editfns.c (transpose_markers):
* src/marker-vector.c (check_marker_vector, marker_vector_reset)
(marker_vector_adjust_for_insert)
(marker_vector_adjust_for_replace):
* src/undo.c (record_marker_adjustments): Use FOR_EACH_MARKER.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/coding.c b/src/coding.c
index f3dd2639e73..51c87fb3161 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8118,14 +8118,13 @@ decode_coding_object (struct coding_system *coding,
         move_gap_both (from, from_byte);
       if (BASE_EQ (src_object, dst_object))
         {
-          DO_MARKERS (current_buffer, tail)
+          FOR_EACH_MARKER (current_buffer, tail)
             {
               const ptrdiff_t charpos = marker_vector_charpos (tail);
               tail->need_adjustment
                 = charpos == (tail->insertion_type ? from : to);
               need_marker_adjustment |= tail->need_adjustment;
             }
-          END_DO_MARKERS;
           saved_pt = PT, saved_pt_byte = PT_BYTE;
           TEMP_SET_PT_BOTH (from, from_byte);
           current_buffer->text->inhibit_shrinking = true;
@@ -8250,7 +8249,7 @@ decode_coding_object (struct coding_system *coding,
 
       if (need_marker_adjustment)
         {
-          DO_MARKERS (current_buffer, tail)
+          FOR_EACH_MARKER (current_buffer, tail)
             {
               if (tail->need_adjustment)
                 {
@@ -8269,7 +8268,6 @@ decode_coding_object (struct coding_system *coding,
                     }
                 }
             }
-          END_DO_MARKERS;
         }
     }
 
@@ -8340,14 +8338,13 @@ encode_coding_object (struct coding_system *coding,
   if (BASE_EQ (src_object, dst_object) && BUFFERP (src_object))
     {
       same_buffer = true;
-      DO_MARKERS (XBUFFER (src_object), tail)
+      FOR_EACH_MARKER (XBUFFER (src_object), tail)
         {
           const ptrdiff_t charpos = marker_vector_charpos (tail);
           tail->need_adjustment
             = charpos == (tail->insertion_type ? from : to);
           need_marker_adjustment |= tail->need_adjustment;
         }
-      END_DO_MARKERS;
     }
 
   if (! NILP (CODING_ATTR_PRE_WRITE (attrs)))
@@ -8505,7 +8502,7 @@ encode_coding_object (struct coding_system *coding,
 
       if (need_marker_adjustment)
         {
-          DO_MARKERS (current_buffer, tail)
+          FOR_EACH_MARKER (current_buffer, tail)
             {
               if (tail->need_adjustment)
                 {
@@ -8524,7 +8521,6 @@ encode_coding_object (struct coding_system *coding,
                     }
                 }
             }
-          END_DO_MARKERS;
         }
     }