From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ihor Radchenko Newsgroups: gmane.emacs.devel Subject: Re: MPS: dangling markers Date: Sun, 30 Jun 2024 12:18:59 +0000 Message-ID: <87plryk4i4.fsf@localhost> References: <87v81u85hv.fsf@localhost> <87cyo180y2.fsf@localhost> <874j9d7zqe.fsf@localhost> <87sewvg6lw.fsf@localhost> <87h6dalvr4.fsf@localhost> <87cyny1xos.fsf@localhost> <87a5j21xb7.fsf@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31686"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Stefan Monnier , emacs-devel@gnu.org, Eli Zaretskii , eller.helmut@gmail.com To: Gerd =?utf-8?Q?M=C3=B6llmann?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Jun 30 14:18:05 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sNtVM-00080b-KW for ged-emacs-devel@m.gmane-mx.org; Sun, 30 Jun 2024 14:18:04 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNtVB-00062Z-Jl; Sun, 30 Jun 2024 08:17:54 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sNtUm-0005mP-Ps for emacs-devel@gnu.org; Sun, 30 Jun 2024 08:17:33 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sNtUk-0001Wf-QK for emacs-devel@gnu.org; Sun, 30 Jun 2024 08:17:28 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id EDF16240106 for ; Sun, 30 Jun 2024 14:17:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1719749844; bh=+k8SYq+KiDrmmTTPFu1eq4eNaWJAulJPJNa2XQ9hnLA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=dK3XmEd52l4E8wsFSWuE//8yg5Rwc4i+Ro0CTpI6fze7AXW7GAbufNCMu6um4pjwK 8RZ6qdM89lT7eownQW11kkGDxND5otrUH4ks2U1JrmqHQa7UoJiZdbMw7DIgt0RhCG Y/qXm+TSghixdXWrnfsTzTixD5WcSCJ0e6nrV41nf4GxAMCWEmJnV304bt8w+sPzpA J8Uhj0upUNIAompXKUlMEnthACg5VBVSr827EDls5buYgFYS2Iini2T1q7lPXOmGZf uwTMltVc1S7wAKz38pJmj9mn5UTV383ZEf/Fnjj4Xd2IiMyJXXQX5y713c9ma8yH/k 6Xrc3ubbheUDA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4WBp8K319gz9rxL; Sun, 30 Jun 2024 14:17:21 +0200 (CEST) In-Reply-To: Received-SPF: pass client-ip=185.67.36.66; envelope-from=yantar92@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:320957 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gerd M=C3=B6llmann 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. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-all-the-calls-to-build_marker-after-dc3e5cbe5b6.patch >From 972c6c6652b49302ae6ea2fc77c59d998b547fd3 Mon Sep 17 00:00:00 2001 Message-ID: <972c6c6652b49302ae6ea2fc77c59d998b547fd3.1719749890.git.yantar92@posteo.net> From: Ihor Radchenko 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 --=-=-= Content-Type: text/plain -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at --=-=-=--