From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.bugs Subject: bug#60467: 30.0.50; primitive-undo: Changes to be undone by function different from announced Date: Thu, 10 Aug 2023 13:55:56 +0000 Message-ID: <3283828c97405b694421@heytings.org> References: <87o7ri74qv.fsf@localhost> <7ccb0e8131f84ca2ea0f0c0aed11dc197b578a64.camel@laposte.net> <83o7l61lz6.fsf@gnu.org> <2aa76ba11fd0a77ba107@heytings.org> <30832e86470f7dc33387@heytings.org> <83r0pyw89y.fsf@gnu.org> <215b00d2590a10728db4@heytings.org> <83sfa7puzb.fsf@gnu.org> <83351pehwp.fsf@gnu.org> <833510zic5.fsf@gnu.org> <3283828c971107fba129@heytings.org> <83jzu3hv5d.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="WpSojQ5nM3" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10626"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60467@debbugs.gnu.org, frederic.giquel@laposte.net, yantar92@posteo.net, monnier@iro.umontreal.ca, acm@muc.de To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 10 15:57:15 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1qU6A7-0002YC-Ep for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 10 Aug 2023 15:57:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qU69w-0007kU-4Y; Thu, 10 Aug 2023 09:57:04 -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 1qU69u-0007k5-GP for bug-gnu-emacs@gnu.org; Thu, 10 Aug 2023 09:57:02 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qU69u-0000J2-7w for bug-gnu-emacs@gnu.org; Thu, 10 Aug 2023 09:57:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qU69u-0005UZ-23 for bug-gnu-emacs@gnu.org; Thu, 10 Aug 2023 09:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Gregory Heytings Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 10 Aug 2023 13:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60467 X-GNU-PR-Package: emacs Original-Received: via spool by 60467-submit@debbugs.gnu.org id=B60467.169167576421037 (code B ref 60467); Thu, 10 Aug 2023 13:57:01 +0000 Original-Received: (at 60467) by debbugs.gnu.org; 10 Aug 2023 13:56:04 +0000 Original-Received: from localhost ([127.0.0.1]:43752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU68x-0005TF-OD for submit@debbugs.gnu.org; Thu, 10 Aug 2023 09:56:04 -0400 Original-Received: from heytings.org ([95.142.160.155]:60870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qU68s-0005Ol-4j for 60467@debbugs.gnu.org; Thu, 10 Aug 2023 09:56:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1691675757; bh=BH7DsnVS2nTwuw6zQmhg3E6iQCmHrMji9Kgw7gPBnzE=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=EAPuEBttEAwWiUB3l62Ev8yqhkxhNaAZ1YPCXRlxDBzxQyRTpx0xn8XlYmVK/03Yw XPahdLqPjOGUbg8c7IkDO/ndgEuWD0gs2JXMB5NJShVWEdqKjQMyczofk6o8eM1nqu pjiiXOA8CJgqoy7lRoL+E6337RAsc2iRdwqW0TMqcYICm3ijx1s/EjMdv6SZ+KhXY5 LXRVUh7iQckm9cR4TwqCUZja2NGQRDHo5rjKvLEWr3Q8BDxhPALgfdFXfc9yvXvnp2 1ux+exKIT48fGIEHZFSSmG7hQ5JNKxhRHnZKSwmq6lePbo5HpWXph7x0bQOM2aLblR /lvtm+N5R2g/Q== In-Reply-To: <83jzu3hv5d.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:267136 Archived-At: --WpSojQ5nM3 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable >> It's not clear to me what you want: do you want to fix this issue on=20 >> the emacs-29 branch or on the master branch? > > I suggested to install your fix on master. > Okay, but see below. >> We now have two bug reports on this (the one by Fr=C3=A9d=C3=A9ric Gique= l in this=20 >> bug, and the one by Eason Huang in bug#64989). I just verified (again)= =20 >> that the Fix-combine-change-call-with-timestamps patch fixes these two= =20 >> recipes. > > If bug#64989 could be fixed by a simpler, safer change (which remains to= =20 > be seen), we might do that on emacs-29. If not, at least we will have=20 > this fixed in Emacs 30. > Bug#64989 is the same bug, only the recipe differs. And the change I=20 suggested six months ago is safe, it replaces an obscure and bugged piece= =20 of code with a refactored and clear piece of code. I attach it again=20 (that patch is for emacs-29, the one for master would be similar). If Stefan (or anyone else) fixes the bug in a safer way, that patch is not= =20 necessary. --WpSojQ5nM3 Content-Type: text/x-diff; name=Fix-combine-change-call.patch Content-Transfer-Encoding: base64 Content-ID: <3283828c9775c5136147@heytings.org> Content-Disposition: attachment; filename=Fix-combine-change-call.patch RnJvbSAxNjliMjA2NGE0YzUyMDBmYmZkZmQ3YzZmNDNjYjE4ZTRmODU0Yjky IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBUaHUsIDEwIEF1 ZyAyMDIzIDEzOjQ5OjE1ICswMDAwDQpTdWJqZWN0OiBbUEFUQ0hdIEZpeCBj b21iaW5lLWNoYW5nZS1jYWxsDQoNCiogbGlzcC9zdWJyLmVsIChjb21iaW5l LWNoYW5nZS1jYWxscy0xKTogUmV3cml0ZSBhbmQgZG9jdW1lbnQNCnRoZSBw YXJ0IHdoaWNoIGNyZWF0ZXMgdGhlIHVuZG8tbGlzdCBlbGVtZW50LiAgRml4 ZXMgYnVnIzYwNDY3DQphbmQgYnVnIzY0OTg5Lg0KLS0tDQogbGlzcC9zdWJy LmVsIHwgNjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRp b25zKCspLCAyNSBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2xpc3Av c3Vici5lbCBiL2xpc3Avc3Vici5lbA0KaW5kZXggODcyYzcwMWRiZTcuLmQw NzYwZTkyNDc0IDEwMDY0NA0KLS0tIGEvbGlzcC9zdWJyLmVsDQorKysgYi9s aXNwL3N1YnIuZWwNCkBAIC00OTc4LDMxICs0OTc4LDQxIEBAIGNvbWJpbmUt Y2hhbmdlLWNhbGxzLTENCiAJICAgICAgKGtpbGwtbG9jYWwtdmFyaWFibGUg J2JlZm9yZS1jaGFuZ2UtZnVuY3Rpb25zKSkNCiAJICAgIChpZiBsb2NhbC1h Y2YgKHNldHEgYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucyBhY2YpDQogCSAgICAg IChraWxsLWxvY2FsLXZhcmlhYmxlICdhZnRlci1jaGFuZ2UtZnVuY3Rpb25z KSkpKQ0KLSAgICAgICAgKHdoZW4gKG5vdCAoZXEgYnVmZmVyLXVuZG8tbGlz dCB0KSkNCi0gICAgICAgICAgKGxldCAoKGFwLWVsdA0KLQkJIChsaXN0ICdh cHBseQ0KLQkJICAgICAgICgtIGVuZCBlbmQtbWFya2VyKQ0KLQkJICAgICAg IGJlZw0KLQkJICAgICAgIChtYXJrZXItcG9zaXRpb24gZW5kLW1hcmtlcikN Ci0JCSAgICAgICAjJ3VuZG8tLXdyYXAtYW5kLXJ1bi1wcmltaXRpdmUtdW5k bw0KLQkJICAgICAgIGJlZyAobWFya2VyLXBvc2l0aW9uIGVuZC1tYXJrZXIp IGJ1ZmZlci11bmRvLWxpc3QpKQ0KLQkJKHB0ciBidWZmZXItdW5kby1saXN0 KSkNCi0JICAgIChpZiAobm90IChlcSBidWZmZXItdW5kby1saXN0IG9sZC1i dWwpKQ0KLQkJKHByb2duDQotCQkgICh3aGlsZSAoYW5kIChub3QgKGVxIChj ZHIgcHRyKSBvbGQtYnVsKSkNCi0JCQkgICAgICA7OyBJbiBjYXNlIGdhcmJh Z2UgY29sbGVjdGlvbiBoYXMgcmVtb3ZlZCBPTEQtQlVMLg0KLQkJCSAgICAg IChjZHIgcHRyKSkNCi0JCSAgICAoaWYgKGFuZCAoY29uc3AgKGNkciBwdHIp KQ0KLQkJCSAgICAgKGNvbnNwIChjYWRyIHB0cikpDQotCQkJICAgICAoZXEg KGNhYWRyIHB0cikgdCkpDQotCQkJOzsgRG9uJ3QgaW5jbHVkZSBhIHRpbWVz dGFtcCBlbnRyeS4NCi0JCQkoc2V0Y2RyIHB0ciAoY2RkciBwdHIpKQ0KLQkJ ICAgICAgKHNldHEgcHRyIChjZHIgcHRyKSkpKQ0KLQkJICAodW5sZXNzIChj ZHIgcHRyKQ0KLQkJICAgIChtZXNzYWdlICJjb21iaW5lLWNoYW5nZS1jYWxs czogYnVmZmVyLXVuZG8tbGlzdCBicm9rZW4iKSkNCi0JCSAgKHNldGNkciBw dHIgbmlsKQ0KLQkJICAocHVzaCBhcC1lbHQgYnVmZmVyLXVuZG8tbGlzdCkN Ci0JCSAgKHNldGNkciBidWZmZXItdW5kby1saXN0IG9sZC1idWwpKSkpKQ0K Kwk7OyBJZiBidWZmZXItdW5kby1saXN0IGlzIG5laXRoZXIgdCAoaW4gd2hp Y2ggY2FzZSB1bmRvDQorCTs7IGluZm9ybWF0aW9uIGlzIG5vdCByZWNvcmRl ZCkgbm9yIGVxdWFsIHRvIGJ1ZmZlci11bmRvLWxpc3QNCisJOzsgYmVmb3Jl IGJvZHkgd2FzIGZ1bmNhbGxlZCAoaW4gd2hpY2ggY2FzZSAoZnVuY2FsbCBi b2R5KSBkaWQNCisJOzsgbm90IGFkZCBpdGVtcyB0byBidWZmZXItdW5kby1s aXN0KSAuLi4NCisJKHVubGVzcyAob3IgKGVxIGJ1ZmZlci11bmRvLWxpc3Qg dCkNCisJCSAgICAoZXEgYnVmZmVyLXVuZG8tbGlzdCBvbGQtYnVsKSkNCisJ ICAobGV0ICgocHRyIGJ1ZmZlci11bmRvLWxpc3QpIGJvZHktdW5kby1saXN0 KQ0KKwkgICAgOzsgLi4uIHRoZW4gbG9vcCBvdmVyIGJ1ZmZlci11bmRvLWxp c3QsIHVudGlsIHRoZSBoZWFkIG9mDQorCSAgICA7OyBidWZmZXItdW5kby1s aXN0IGJlZm9yZSBib2R5IHdhcyBmdW5jYWxsZWQgaXMgZm91bmQsIG9yDQor CSAgICA7OyBwdHIgaXMgbmlsICh3aGljaCBtYXkgaGFwcGVuIGlmIGdhcmJh Z2UtY29sbGVjdCBoYXMNCisJICAgIDs7IGJlZW4gY2FsbGVkIGFmdGVyIChm dW5jYWxsIGJvZHkpIGFuZCBoYXMgcmVtb3ZlZA0KKwkgICAgOzsgZW50cmll cyBvZiBidWZmZXItdW5kby1saXN0IHRoYXQgd2VyZSBhZGRlZCBieSAoZnVu Y2FsbA0KKwkgICAgOzsgYm9keSkpLCBhbmQgYWRkIHRoZXNlIGVudHJpZXMg dG8gYm9keS11bmRvLWxpc3QuDQorCSAgICAod2hpbGUgKGFuZCBwdHIgKG5v dCAoZXEgcHRyIG9sZC1idWwpKSkNCisJICAgICAgKHB1c2ggKGNhciBwdHIp IGJvZHktdW5kby1saXN0KQ0KKwkgICAgICAoc2V0cSBwdHIgKGNkciBwdHIp KSkNCisJICAgIChzZXRxIGJvZHktdW5kby1saXN0IChucmV2ZXJzZSBib2R5 LXVuZG8tbGlzdCkpDQorCSAgICA7OyBXYXJuIGlmIGdhcmJhZ2UtY29sbGVj dCBoYXMgdHJ1bmNhdGVkIGJ1ZmZlci11bmRvLWxpc3QNCisJICAgIDs7IGJl aGluZCBvdXIgYmFjay4NCisJICAgICh3aGVuIChhbmQgb2xkLWJ1bCAobm90 IHB0cikpDQorCSAgICAgIChtZXNzYWdlDQorICAgICAgICAgICAgICAgImNv bWJpbmUtY2hhbmdlLWNhbGxzOiBidWZmZXItdW5kby1saXN0IGhhcyBiZWVu IHRydW5jYXRlZCIpKQ0KKwkgICAgOzsgQWRkIGFuIChhcHBseSAuLi4pIGVu dHJ5IHRvIGJ1ZmZlci11bmRvLWxpc3QsIHVzaW5nDQorCSAgICA7OyBib2R5 LXVuZG8tbGlzdCAuLi4NCisJICAgIChwdXNoIChsaXN0ICdhcHBseQ0KKwkJ CSgtIGVuZCBlbmQtbWFya2VyKQ0KKwkJCWJlZw0KKwkJCShtYXJrZXItcG9z aXRpb24gZW5kLW1hcmtlcikNCisJCQkjJ3VuZG8tLXdyYXAtYW5kLXJ1bi1w cmltaXRpdmUtdW5kbw0KKwkJCWJlZyAobWFya2VyLXBvc2l0aW9uIGVuZC1t YXJrZXIpDQorCQkJYm9keS11bmRvLWxpc3QpDQorCQkgIGJ1ZmZlci11bmRv LWxpc3QpDQorCSAgICA7OyAuLi4gYW5kIHNldCB0aGUgY2RyIG9mIGJ1ZmZl ci11bmRvLWxpc3QgdG8NCisJICAgIDs7IGJ1ZmZlci11bmRvLWxpc3QgYmVm b3JlIGJvZHkgd2FzIGZ1bmNhbGxlZC4NCisJICAgIChzZXRjZHIgYnVmZmVy LXVuZG8tbGlzdCBvbGQtYnVsKSkpDQogCShpZiAobm90IGluaGliaXQtbW9k aWZpY2F0aW9uLWhvb2tzKQ0KIAkgICAgKHJ1bi1ob29rLXdpdGgtYXJncyAn YWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucw0KIAkJCQliZWcgKG1hcmtlci1wb3Np dGlvbiBlbmQtbWFya2VyKQ0KLS0gDQoyLjM5LjINCg0K --WpSojQ5nM3--