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: Tue, 03 Jan 2023 16:51:06 +0000 Message-ID: References: <87o7ri74qv.fsf@localhost> <9bc9c69ac20a37ded741@heytings.org> <9bc9c69ac282c0148962@heytings.org> <87h6x9mgdv.fsf@localhost> <838rij23by.fsf@gnu.org> <83zgazznau.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="ui8dU5CNie" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4836"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60467@debbugs.gnu.org, Alan Mackenzie , Eli Zaretskii , yantar92@posteo.net To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Jan 03 17:52:21 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 1pCkWR-0000we-UL for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 03 Jan 2023 17:52:20 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pCkWC-0006HW-VS; Tue, 03 Jan 2023 11:52:05 -0500 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 1pCkWB-0006HO-7d for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 11:52:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pCkWA-0007cG-Fg for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 11:52:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pCkW9-0002tW-T8 for bug-gnu-emacs@gnu.org; Tue, 03 Jan 2023 11:52:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Gregory Heytings Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 03 Jan 2023 16:52: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.167276467211064 (code B ref 60467); Tue, 03 Jan 2023 16:52:01 +0000 Original-Received: (at 60467) by debbugs.gnu.org; 3 Jan 2023 16:51:12 +0000 Original-Received: from localhost ([127.0.0.1]:46570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkVM-0002sN-2Z for submit@debbugs.gnu.org; Tue, 03 Jan 2023 11:51:12 -0500 Original-Received: from heytings.org ([95.142.160.155]:57378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pCkVI-0002sC-EJ for 60467@debbugs.gnu.org; Tue, 03 Jan 2023 11:51:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1672764667; bh=i5KX5xpF+nhYWc6XfI+jeBY4fOYcqxd5Y6meLTaYmy8=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=Ybp6i03QyXAGz9a/kdfZFtNYbr6N0wtmk3mTyMQTYUgc6Tc70CaBYZSDBKg/fiBX4 4SdIthyq5DFi0tX4QAlkBLb2Az2AW40hso4ZI+6kYL8P3W6G25EytaJjq/ZNiWBR85 OA850QO4tNtCoDBvKtyKgjR61ZIVOzb5I5PfCxNEin/o9rHjU3P1EhpMA73d1v9/T/ a6HYCT0p9dAF72VWwfME/C5ehtGOVGvvfoYyAECHtoXUa+FE/1HMWfx60f2Abgq3r0 FFNyjLitJoSeGDrn4o8I7qVmk/pztELYILl05wabYqRACI+VV+5SFcnb/CTZCuCD7g N3nhSJ2BVoetg== In-Reply-To: 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:252422 Archived-At: --ui8dU5CNie Content-Type: text/plain; charset=us-ascii; format=flowed Updated patch attached, incorporating your comments. --ui8dU5CNie Content-Type: text/x-diff; name=Fix-combine-change-call.patch Content-Transfer-Encoding: base64 Content-ID: Content-Disposition: attachment; filename=Fix-combine-change-call.patch RnJvbSAxNDIyZDhlYzMxMDBmNDlkNjlmZWZlYTQ4OGNjZGE3ODJmOTgzZWVj IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBUdWUsIDMgSmFu IDIwMjMgMTY6NDg6NTggKzAwMDANClN1YmplY3Q6IFtQQVRDSF0gRml4IGNv bWJpbmUtY2hhbmdlLWNhbGwNCg0KKiBsaXNwL3N1YnIuZWwgKGNvbWJpbmUt Y2hhbmdlLWNhbGxzLTEpOiBSZXdyaXRlIHRoZSBwYXJ0IHdoaWNoDQpjcmVh dGVzIHRoZSB1bmRvLWxpc3QgZWxlbWVudC4gIEZpeGVzIGJ1ZyM2MDQ2Ny4N Ci0tLQ0KIGxpc3Avc3Vici5lbCB8IDY0ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAxIGZpbGUgY2hh bmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pDQoNCmRp ZmYgLS1naXQgYS9saXNwL3N1YnIuZWwgYi9saXNwL3N1YnIuZWwNCmluZGV4 IDkwODdmOWE0MDQuLjNjMDI2OGE0OWQgMTAwNjQ0DQotLS0gYS9saXNwL3N1 YnIuZWwNCisrKyBiL2xpc3Avc3Vici5lbA0KQEAgLTQ5MzQsMzEgKzQ5MzQs NDUgQEAgY29tYmluZS1jaGFuZ2UtY2FsbHMtMQ0KIAkgICAgICAoa2lsbC1s b2NhbC12YXJpYWJsZSAnYmVmb3JlLWNoYW5nZS1mdW5jdGlvbnMpKQ0KIAkg ICAgKGlmIGxvY2FsLWFjZiAoc2V0cSBhZnRlci1jaGFuZ2UtZnVuY3Rpb25z IGFjZikNCiAJICAgICAgKGtpbGwtbG9jYWwtdmFyaWFibGUgJ2FmdGVyLWNo YW5nZS1mdW5jdGlvbnMpKSkpDQotICAgICAgICAod2hlbiAobm90IChlcSBi dWZmZXItdW5kby1saXN0IHQpKQ0KLSAgICAgICAgICAobGV0ICgoYXAtZWx0 DQotCQkgKGxpc3QgJ2FwcGx5DQotCQkgICAgICAgKC0gZW5kIGVuZC1tYXJr ZXIpDQotCQkgICAgICAgYmVnDQotCQkgICAgICAgKG1hcmtlci1wb3NpdGlv biBlbmQtbWFya2VyKQ0KLQkJICAgICAgICMndW5kby0td3JhcC1hbmQtcnVu LXByaW1pdGl2ZS11bmRvDQotCQkgICAgICAgYmVnIChtYXJrZXItcG9zaXRp b24gZW5kLW1hcmtlcikgYnVmZmVyLXVuZG8tbGlzdCkpDQotCQkocHRyIGJ1 ZmZlci11bmRvLWxpc3QpKQ0KLQkgICAgKGlmIChub3QgKGVxIGJ1ZmZlci11 bmRvLWxpc3Qgb2xkLWJ1bCkpDQotCQkocHJvZ24NCi0JCSAgKHdoaWxlIChh bmQgKG5vdCAoZXEgKGNkciBwdHIpIG9sZC1idWwpKQ0KLQkJCSAgICAgIDs7 IEluIGNhc2UgZ2FyYmFnZSBjb2xsZWN0aW9uIGhhcyByZW1vdmVkIE9MRC1C VUwuDQotCQkJICAgICAgKGNkciBwdHIpDQotCQkJICAgICAgOzsgRG9uJ3Qg aW5jbHVkZSBhIHRpbWVzdGFtcCBlbnRyeS4NCi0JCQkgICAgICAobm90IChh bmQgKGNvbnNwIChjZHIgcHRyKSkNCi0JCQkJCShjb25zcCAoY2FkciBwdHIp KQ0KLQkJCQkJKGVxIChjYWFkciBwdHIpIHQpDQotCQkJCQkoc2V0cSBvbGQt YnVsIChjZHIgcHRyKSkpKSkNCi0JCSAgICAoc2V0cSBwdHIgKGNkciBwdHIp KSkNCi0JCSAgKHVubGVzcyAoY2RyIHB0cikNCi0JCSAgICAobWVzc2FnZSAi Y29tYmluZS1jaGFuZ2UtY2FsbHM6IGJ1ZmZlci11bmRvLWxpc3QgYnJva2Vu IikpDQotCQkgIChzZXRjZHIgcHRyIG5pbCkNCi0JCSAgKHB1c2ggYXAtZWx0 IGJ1ZmZlci11bmRvLWxpc3QpDQotCQkgIChzZXRjZHIgYnVmZmVyLXVuZG8t bGlzdCBvbGQtYnVsKSkpKSkNCisJOzsgSWYgYnVmZmVyLXVuZG8tbGlzdCBp cyBuZWl0aGVyIHQgKGluIHdoaWNoIGNhc2UgdW5kbw0KKwk7OyBpbmZvcm1h dGlvbiBpcyBub3QgcmVjb3JkZWQpIG5vciBlcXVhbCB0byBidWZmZXItdW5k by1saXN0DQorCTs7IGJlZm9yZSBib2R5IHdhcyBldmFsdWF0ZWQgKGluIHdo aWNoIGNhc2UgKGZ1bmNhbGwgYm9keSkgZGlkDQorCTs7IG5vdCBhZGQgaXRl bXMgdG8gYnVmZmVyLXVuZG8tbGlzdCkgLi4uDQorCSh1bmxlc3MgKG9yIChl cSBidWZmZXItdW5kby1saXN0IHQpDQorCQkgICAgKGVxIGJ1ZmZlci11bmRv LWxpc3Qgb2xkLWJ1bCkpDQorCSAgKGxldCAoKHB0ciBidWZmZXItdW5kby1s aXN0KSBib2R5LXVuZG8tbGlzdCkNCisJICAgIDs7IC4uLiB0aGVuIGxvb3Ag b3ZlciBidWZmZXItdW5kby1saXN0LCB1bnRpbCB0aGUgaGVhZCBvZg0KKwkg ICAgOzsgYnVmZmVyLXVuZG8tbGlzdCBiZWZvcmUgYm9keSB3YXMgZXZhbHVh dGVkIGlzIGZvdW5kLCBvcg0KKwkgICAgOzsgcHRyIGlzIG5pbCAod2hpY2gg bWF5IGhhcHBlbiBpZiBnYXJiYWdlLWNvbGxlY3QgaGFzDQorCSAgICA7OyBi ZWVuIGNhbGxlZCBhZnRlciAoZnVuY2FsbCBib2R5KSBhbmQgaGFzIHRydW5j YXRlZA0KKwkgICAgOzsgYnVmZmVyLXVuZG8tbGlzdCkgLi4uDQorCSAgICAo d2hpbGUgKGFuZCAobm90IChlcSBwdHIgb2xkLWJ1bCkpDQorCQkJcHRyKQ0K KwkgICAgICA7OyAuLi4gYW5kIGFkZCB0aGUgZW50cmllcyB0byBib2R5LXVu ZG8tbGlzdCwgdW5sZXNzDQorCSAgICAgIDs7IHRoZXkgYXJlIG9mIHRoZSBm b3JtICh0IC4gPHNvbWV0aGluZz4pLCB3aGljaCBhcmUNCisJICAgICAgOzsg ZW50cmllcyB0aGF0IHJlY29yZCBidWZmZXIgbW9kaWZpY2F0aW9uIHRpbWVz dGFtcHMuDQorCSAgICAgICh1bmxlc3MgKGFuZCAoY29uc3AgKGNhciBwdHIp KQ0KKwkJCSAgIChlcSAoY2FhciBwdHIpIHQpKQ0KKwkJKHB1c2ggKGNhciBw dHIpIGJvZHktdW5kby1saXN0KSkNCisJICAgICAgKHNldHEgcHRyIChjZHIg cHRyKSkpDQorCSAgICA7OyBXYXJuIGlmIGdhcmJhZ2UtY29sbGVjdCBoYXMg dHJ1bmNhdGVkIGJ1ZmZlci11bmRvLWxpc3QNCisJICAgIDs7IGJlaGluZCBv dXIgYmFjay4NCisJICAgICh3aGVuIChhbmQgb2xkLWJ1bCAobm90IHB0cikp DQorCSAgICAgIChtZXNzYWdlICJjb21iaW5lLWNoYW5nZS1jYWxsczogYnVm ZmVyLXVuZG8tbGlzdCBicm9rZW4iKSkNCisJICAgIChzZXRxIGJvZHktdW5k by1saXN0IChucmV2ZXJzZSBib2R5LXVuZG8tbGlzdCkpDQorCSAgICA7OyBB ZGQgYW4gKGFwcGx5IC4uLikgZW50cnkgdG8gYnVmZmVyLXVuZG8tbGlzdCwg dXNpbmcNCisJICAgIDs7IGJvZHktdW5kby1saXN0IC4uLg0KKwkgICAgKHB1 c2ggKGxpc3QgJ2FwcGx5DQorCQkJKC0gZW5kIGVuZC1tYXJrZXIpDQorCQkJ YmVnDQorCQkJKG1hcmtlci1wb3NpdGlvbiBlbmQtbWFya2VyKQ0KKwkJCSMn dW5kby0td3JhcC1hbmQtcnVuLXByaW1pdGl2ZS11bmRvDQorCQkJYmVnICht YXJrZXItcG9zaXRpb24gZW5kLW1hcmtlcikNCisJCQlib2R5LXVuZG8tbGlz dCkNCisJCSAgYnVmZmVyLXVuZG8tbGlzdCkNCisJICAgIDs7IC4uLiBhbmQg c2V0IHRoZSBjZHIgb2YgYnVmZmVyLXVuZG8tbGlzdCB0bw0KKwkgICAgOzsg YnVmZmVyLXVuZG8tbGlzdCBiZWZvcmUgYm9keSB3YXMgZXZhbHVhdGVkLg0K KwkgICAgKHNldGNkciBidWZmZXItdW5kby1saXN0IG9sZC1idWwpKSkNCiAJ KGlmIChub3QgaW5oaWJpdC1tb2RpZmljYXRpb24taG9va3MpDQogCSAgICAo cnVuLWhvb2std2l0aC1hcmdzICdhZnRlci1jaGFuZ2UtZnVuY3Rpb25zDQog CQkJCWJlZyAobWFya2VyLXBvc2l0aW9uIGVuZC1tYXJrZXIpDQotLSANCjIu MzkuMA0KDQo= --ui8dU5CNie--