Re: MPS: dangling markers

[Ihor Radchenko <yantar92@posteo.net>]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

Gerd Möllmann <gerd.moellmann@gmail.com> writes:

>> Fixing should be just a matter of passing that extra int argument in
>> really all places.
>
> I've reverted it, so it should work now.

Or you can use the attached patch on top of the original commit.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-all-the-calls-to-build_marker-after-dc3e5cbe5b6.patch --]
[-- Type: text/x-patch, Size: 2162 bytes --]

From 972c6c6652b49302ae6ea2fc77c59d998b547fd3 Mon Sep 17 00:00:00 2001
Message-ID: <972c6c6652b49302ae6ea2fc77c59d998b547fd3.1719749890.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Sun, 30 Jun 2024 14:17:50 +0200
Subject: [PATCH] Fix all the calls to `build_marker' after dc3e5cbe5b6

---
 src/textconv.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/textconv.c b/src/textconv.c
index 0e43bd9d458..a601dcd6729 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -478,7 +478,7 @@ record_buffer_change (ptrdiff_t beg, ptrdiff_t end,
 
   /* Make markers for both BEG and END.  */
   beg_marker = build_marker (current_buffer, beg,
-			     CHAR_TO_BYTE (beg));
+			     CHAR_TO_BYTE (beg), 22);
 
   /* If BEG and END are identical, make sure to keep the markers
      eq.  */
@@ -488,7 +488,7 @@ record_buffer_change (ptrdiff_t beg, ptrdiff_t end,
   else
     {
       end_marker = build_marker (current_buffer, end,
-				 CHAR_TO_BYTE (end));
+				 CHAR_TO_BYTE (end), 23);
 
       /* Otherwise, make sure the marker extends past inserted
 	 text.  */
@@ -868,9 +868,9 @@ really_set_composing_text (struct frame *f, ptrdiff_t position,
 
       /* Now set the markers which denote the composition region.  */
       f->conversion.compose_region_start
-	= build_marker (current_buffer, PT, PT_BYTE);
+	= build_marker (current_buffer, PT, PT_BYTE, 24);
       f->conversion.compose_region_end
-	= build_marker (current_buffer, PT, PT_BYTE);
+	= build_marker (current_buffer, PT, PT_BYTE, 24);
 
       Fset_marker_insertion_type (f->conversion.compose_region_end,
 				  Qt);
@@ -1165,8 +1165,8 @@ locate_and_save_position_in_field (struct frame *f, struct window *w,
     }
   else
     {
-      c1 = build_marker (current_buffer, beg, CHAR_TO_BYTE (beg));
-      c2 = build_marker (current_buffer, end, CHAR_TO_BYTE (end));
+      c1 = build_marker (current_buffer, beg, CHAR_TO_BYTE (beg), 25);
+      c2 = build_marker (current_buffer, end, CHAR_TO_BYTE (end), 25);
       Fset_marker_insertion_type (c2, Qt);
       f->conversion.field = Fcons (c1, Fcons (c2, window));
     }
-- 
2.45.2


[-- Attachment #3: Type: text/plain, Size: 225 bytes --]



-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>