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: Wed, 04 Jan 2023 21:04:54 +0000 Message-ID: References: <87o7ri74qv.fsf@localhost> <9bc9c69ac20a37ded741@heytings.org> <9bc9c69ac282c0148962@heytings.org> <87h6x9mgdv.fsf@localhost> <838rij23by.fsf@gnu.org> <83zgazznau.fsf@gnu.org> <83mt6yz7se.fsf@gnu.org> <83r0waxht4.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="qTQ3tw3BW8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2347"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 60467@debbugs.gnu.org, acm@muc.de, yantar92@posteo.net, monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 04 22:06:06 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 1pDAxZ-0000Nf-2Y for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 04 Jan 2023 22:06:05 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDAwh-0006Z8-Bl; Wed, 04 Jan 2023 16:05:11 -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 1pDAwf-0006Yr-Oe for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 16:05:09 -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 1pDAwY-0006tI-2t for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 16:05:07 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pDAwX-0004Mv-UY for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 16:05: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: Wed, 04 Jan 2023 21:05: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.167286629916781 (code B ref 60467); Wed, 04 Jan 2023 21:05:01 +0000 Original-Received: (at 60467) by debbugs.gnu.org; 4 Jan 2023 21:04:59 +0000 Original-Received: from localhost ([127.0.0.1]:49755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDAwU-0004Mb-Ot for submit@debbugs.gnu.org; Wed, 04 Jan 2023 16:04:59 -0500 Original-Received: from heytings.org ([95.142.160.155]:59060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pDAwS-0004MR-6d for 60467@debbugs.gnu.org; Wed, 04 Jan 2023 16:04:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1672866295; bh=juq+QyMacgkA2v6Mr9P9XfbIyI0SeiMMnInLx1cQ+gU=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=Kh7k942Y/UwR5slXUhQQrL7GOAEIEYNdWSVc3WJGRuZTCzHx6rzRFOPJhUriV7vwx GWZxzl0zoehlnNohQ/x7O5TbhkarjEGzzFI0Krotzi4inRWV9YVd0QlrFBdaiyFnx0 VerbDAtDdH6kDLwWpubRkvIK74AVPGF0n28tpH0fcZzVJPRM940sscwbbXGqmqsPrR t44Y5NSaXkpUSjmS1xhtQj06AlFg4Sb4FkwgmljknHchJJpfqgBYNZUcmXwF8ie2Po ziBmMTX0gW11R686Sps40f+CB0FVBNzdYPOM+5Fve6CIIaqjQWvfJRhKnyNcrn0H+Q B55/287dy33Wg== In-Reply-To: <83r0waxht4.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:252540 Archived-At: --qTQ3tw3BW8 Content-Type: text/plain; format=flowed; charset=us-ascii >>> My hope is that we can just remove the timestamp special case, in >>> which case we can keep the current code mostly unchanged. >> >> Then our hopes are different. What's wrong exactly with replacing a >> piece of code that requires a long discussion with question marks >> everywhere to be understood by a piece of well-documented code that is >> much more readable and "evidently" does what it is supposed to do? > > The old code was working for quite a few years, so it isn't all wrong. > It has only a few callers. In fact, its only callers for a long time have been (1) comment-region-default and uncomment-region-default, which, by chance, do not insert timestamps between the undo elements, and (2) dired-readin in which (as I said upthread) this part of the function is simply not executed because buffer-undo-list is let-bound to t around body. In effect, the first caller that actually exercises its logic in full is Org. > > Why do you object so much to leaving the timestamps in the undo-list? > I do not object to leaving timestamps in the undo-list, I object to leaving the code in the state it is, because I think of the future person who will try to make sense of it in 2028. I'm equally fine with the two attached patches, one in which timestamps are kept an the other in which they aren't. And now I believe it's better if I bow out of this thread, and let you and Stefan decide what the best course of action is. --qTQ3tw3BW8 Content-Type: text/x-diff; name=Fix-combine-change-call-without-timestamps.patch Content-Transfer-Encoding: base64 Content-ID: Content-Disposition: attachment; filename=Fix-combine-change-call-without-timestamps.patch RnJvbSAxNTc5N2IyMWY2NjM0NjRiNTU5OTU2MGUyYzYyZGY1NWE4MWI3N2Nm IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBXZWQsIDQgSmFu IDIwMjMgMjA6NTA6NDkgKzAwMDANClN1YmplY3Q6IFtQQVRDSF0gRml4IGNv bWJpbmUtY2hhbmdlLWNhbGwNCg0KKiBsaXNwL3N1YnIuZWwgKGNvbWJpbmUt Y2hhbmdlLWNhbGxzLTEpOiBSZXdyaXRlIGFuZCBkb2N1bWVudA0KdGhlIHBh cnQgd2hpY2ggY3JlYXRlcyB0aGUgdW5kby1saXN0IGVsZW1lbnQuICBGaXhl cyBidWcjNjA0NjcuDQoqIHRlc3Qvc3JjL3VuZG8tdGVzdHMuZWwgKHVuZG8t dGVzdC1jb21iaW5lLWNoYW5nZS1jYWxscy0xKQ0KKHVuZG8tdGVzdC1jb21i aW5lLWNoYW5nZS1jYWxscy0yKQ0KKHVuZG8tdGVzdC1jb21iaW5lLWNoYW5n ZS1jYWxscy0zKTogQWRkIHRocmVlIHRlc3RzIGZvciAndW5kbycNCndpdGgg J2NvbWJpbmUtY2hhbmdlLWNhbGxzJy4NCi0tLQ0KIGxpc3Avc3Vici5lbCAg ICAgICAgICAgfCA2NSArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t LS0tLS0tLQ0KIHRlc3Qvc3JjL3VuZG8tdGVzdHMuZWwgfCA3MiArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysNCiAyIGZpbGVz IGNoYW5nZWQsIDExMiBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkN Cg0KZGlmZiAtLWdpdCBhL2xpc3Avc3Vici5lbCBiL2xpc3Avc3Vici5lbA0K aW5kZXggOTA4N2Y5YTQwNC4uN2UyMDFmNGJjOSAxMDA2NDQNCi0tLSBhL2xp c3Avc3Vici5lbA0KKysrIGIvbGlzcC9zdWJyLmVsDQpAQCAtNDkzNCwzMSAr NDkzNCw0NiBAQCBjb21iaW5lLWNoYW5nZS1jYWxscy0xDQogCSAgICAgIChr aWxsLWxvY2FsLXZhcmlhYmxlICdiZWZvcmUtY2hhbmdlLWZ1bmN0aW9ucykp DQogCSAgICAoaWYgbG9jYWwtYWNmIChzZXRxIGFmdGVyLWNoYW5nZS1mdW5j dGlvbnMgYWNmKQ0KIAkgICAgICAoa2lsbC1sb2NhbC12YXJpYWJsZSAnYWZ0 ZXItY2hhbmdlLWZ1bmN0aW9ucykpKSkNCi0gICAgICAgICh3aGVuIChub3Qg KGVxIGJ1ZmZlci11bmRvLWxpc3QgdCkpDQotICAgICAgICAgIChsZXQgKChh cC1lbHQNCi0JCSAobGlzdCAnYXBwbHkNCi0JCSAgICAgICAoLSBlbmQgZW5k LW1hcmtlcikNCi0JCSAgICAgICBiZWcNCi0JCSAgICAgICAobWFya2VyLXBv c2l0aW9uIGVuZC1tYXJrZXIpDQotCQkgICAgICAgIyd1bmRvLS13cmFwLWFu ZC1ydW4tcHJpbWl0aXZlLXVuZG8NCi0JCSAgICAgICBiZWcgKG1hcmtlci1w b3NpdGlvbiBlbmQtbWFya2VyKSBidWZmZXItdW5kby1saXN0KSkNCi0JCShw dHIgYnVmZmVyLXVuZG8tbGlzdCkpDQotCSAgICAoaWYgKG5vdCAoZXEgYnVm ZmVyLXVuZG8tbGlzdCBvbGQtYnVsKSkNCi0JCShwcm9nbg0KLQkJICAod2hp bGUgKGFuZCAobm90IChlcSAoY2RyIHB0cikgb2xkLWJ1bCkpDQotCQkJICAg ICAgOzsgSW4gY2FzZSBnYXJiYWdlIGNvbGxlY3Rpb24gaGFzIHJlbW92ZWQg T0xELUJVTC4NCi0JCQkgICAgICAoY2RyIHB0cikNCi0JCQkgICAgICA7OyBE b24ndCBpbmNsdWRlIGEgdGltZXN0YW1wIGVudHJ5Lg0KLQkJCSAgICAgIChu b3QgKGFuZCAoY29uc3AgKGNkciBwdHIpKQ0KLQkJCQkJKGNvbnNwIChjYWRy IHB0cikpDQotCQkJCQkoZXEgKGNhYWRyIHB0cikgdCkNCi0JCQkJCShzZXRx IG9sZC1idWwgKGNkciBwdHIpKSkpKQ0KLQkJICAgIChzZXRxIHB0ciAoY2Ry IHB0cikpKQ0KLQkJICAodW5sZXNzIChjZHIgcHRyKQ0KLQkJICAgIChtZXNz YWdlICJjb21iaW5lLWNoYW5nZS1jYWxsczogYnVmZmVyLXVuZG8tbGlzdCBi cm9rZW4iKSkNCi0JCSAgKHNldGNkciBwdHIgbmlsKQ0KLQkJICAocHVzaCBh cC1lbHQgYnVmZmVyLXVuZG8tbGlzdCkNCi0JCSAgKHNldGNkciBidWZmZXIt dW5kby1saXN0IG9sZC1idWwpKSkpKQ0KKwk7OyBJZiBidWZmZXItdW5kby1s aXN0IGlzIG5laXRoZXIgdCAoaW4gd2hpY2ggY2FzZSB1bmRvDQorCTs7IGlu Zm9ybWF0aW9uIGlzIG5vdCByZWNvcmRlZCkgbm9yIGVxdWFsIHRvIGJ1ZmZl ci11bmRvLWxpc3QNCisJOzsgYmVmb3JlIGJvZHkgd2FzIGZ1bmNhbGxlZCAo aW4gd2hpY2ggY2FzZSAoZnVuY2FsbCBib2R5KSBkaWQNCisJOzsgbm90IGFk ZCBpdGVtcyB0byBidWZmZXItdW5kby1saXN0KSAuLi4NCisJKHVubGVzcyAo b3IgKGVxIGJ1ZmZlci11bmRvLWxpc3QgdCkNCisJCSAgICAoZXEgYnVmZmVy LXVuZG8tbGlzdCBvbGQtYnVsKSkNCisJICAobGV0ICgocHRyIGJ1ZmZlci11 bmRvLWxpc3QpIGJvZHktdW5kby1saXN0KQ0KKwkgICAgOzsgLi4uIHRoZW4g bG9vcCBvdmVyIGJ1ZmZlci11bmRvLWxpc3QsIHVudGlsIHRoZSBoZWFkIG9m DQorCSAgICA7OyBidWZmZXItdW5kby1saXN0IGJlZm9yZSBib2R5IHdhcyBm dW5jYWxsZWQgaXMgZm91bmQsIG9yDQorCSAgICA7OyBwdHIgaXMgbmlsICh3 aGljaCBtYXkgaGFwcGVuIGlmIGdhcmJhZ2UtY29sbGVjdCBoYXMNCisJICAg IDs7IGJlZW4gY2FsbGVkIGFmdGVyIChmdW5jYWxsIGJvZHkpIGFuZCBoYXMg cmVtb3ZlZA0KKwkgICAgOzsgZW50cmllcyBvZiBidWZmZXItdW5kby1saXN0 IHRoYXQgd2VyZSBhZGRlZCBieSAoZnVuY2FsbA0KKwkgICAgOzsgYm9keSkp IC4uLg0KKwkgICAgKHdoaWxlIChhbmQgcHRyIChub3QgKGVxIHB0ciBvbGQt YnVsKSkpDQorCSAgICAgIDs7IC4uLiBhbmQgYWRkIHRoZSBlbnRyaWVzIHRv IGJvZHktdW5kby1saXN0LCB1bmxlc3MNCisJICAgICAgOzsgdGhleSBhcmUg b2YgdGhlIGZvcm0gKHQgLiA8c29tZXRoaW5nPiksIHdoaWNoIGFyZQ0KKwkg ICAgICA7OyBlbnRyaWVzIHRoYXQgcmVjb3JkIGJ1ZmZlciBtb2RpZmljYXRp b24gdGltZXN0YW1wcy4NCisJICAgICAgKHVubGVzcyAoYW5kIChjb25zcCAo Y2FyIHB0cikpDQorCQkJICAgKGVxIChjYWFyIHB0cikgdCkpDQorCQkocHVz aCAoY2FyIHB0cikgYm9keS11bmRvLWxpc3QpKQ0KKwkgICAgICAoc2V0cSBw dHIgKGNkciBwdHIpKSkNCisJICAgIChzZXRxIGJvZHktdW5kby1saXN0IChu cmV2ZXJzZSBib2R5LXVuZG8tbGlzdCkpDQorCSAgICA7OyBXYXJuIGlmIGdh cmJhZ2UtY29sbGVjdCBoYXMgdHJ1bmNhdGVkIGJ1ZmZlci11bmRvLWxpc3QN CisJICAgIDs7IGJlaGluZCBvdXIgYmFjay4NCisJICAgICh3aGVuIChhbmQg b2xkLWJ1bCAobm90IHB0cikpDQorCSAgICAgIChtZXNzYWdlDQorICAgICAg ICAgICAgICAgImNvbWJpbmUtY2hhbmdlLWNhbGxzOiBidWZmZXItdW5kby1s aXN0IGhhcyBiZWVuIHRydW5jYXRlZCIpKQ0KKwkgICAgOzsgQWRkIGFuIChh cHBseSAuLi4pIGVudHJ5IHRvIGJ1ZmZlci11bmRvLWxpc3QsIHVzaW5nDQor CSAgICA7OyBib2R5LXVuZG8tbGlzdCAuLi4NCisJICAgIChwdXNoIChsaXN0 ICdhcHBseQ0KKwkJCSgtIGVuZCBlbmQtbWFya2VyKQ0KKwkJCWJlZw0KKwkJ CShtYXJrZXItcG9zaXRpb24gZW5kLW1hcmtlcikNCisJCQkjJ3VuZG8tLXdy YXAtYW5kLXJ1bi1wcmltaXRpdmUtdW5kbw0KKwkJCWJlZyAobWFya2VyLXBv c2l0aW9uIGVuZC1tYXJrZXIpDQorCQkJYm9keS11bmRvLWxpc3QpDQorCQkg IGJ1ZmZlci11bmRvLWxpc3QpDQorCSAgICA7OyAuLi4gYW5kIHNldCB0aGUg Y2RyIG9mIGJ1ZmZlci11bmRvLWxpc3QgdG8NCisJICAgIDs7IGJ1ZmZlci11 bmRvLWxpc3QgYmVmb3JlIGJvZHkgd2FzIGZ1bmNhbGxlZC4NCisJICAgIChz ZXRjZHIgYnVmZmVyLXVuZG8tbGlzdCBvbGQtYnVsKSkpDQogCShpZiAobm90 IGluaGliaXQtbW9kaWZpY2F0aW9uLWhvb2tzKQ0KIAkgICAgKHJ1bi1ob29r LXdpdGgtYXJncyAnYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucw0KIAkJCQliZWcg KG1hcmtlci1wb3NpdGlvbiBlbmQtbWFya2VyKQ0KZGlmZiAtLWdpdCBhL3Rl c3Qvc3JjL3VuZG8tdGVzdHMuZWwgYi90ZXN0L3NyYy91bmRvLXRlc3RzLmVs DQppbmRleCA4NDE1MWQzYjVkLi5mZDQ1YTkxMDFmIDEwMDY0NA0KLS0tIGEv dGVzdC9zcmMvdW5kby10ZXN0cy5lbA0KKysrIGIvdGVzdC9zcmMvdW5kby10 ZXN0cy5lbA0KQEAgLTQzOSw2ICs0MzksNzggQEAgdW5kby10ZXN0LXJlZ2lv bi1tYXJrLWFkanVzdG1lbnQNCiANCiAgICAgKHNob3VsZCAoc3RyaW5nPSAo YnVmZmVyLXN0cmluZykgImFhYUZpcnN0IGxpbmVcblNlY29uZCBsaW5lXG5i YmIiKSkpKQ0KIA0KKyhlcnQtZGVmdGVzdCB1bmRvLXRlc3QtY29tYmluZS1j aGFuZ2UtY2FsbHMtMSAoKQ0KKyAgIlRlc3QgaG93IGBjb21iaW5lLWNoYW5n ZS1jYWxscycgdXBkYXRlcyBgYnVmZmVyLXVuZG8tbGlzdCcuDQorQ2FzZSAx OiBhIGZpbGUtdmlzaXRpbmcgYnVmZmVyIHdpdGggYGJ1ZmZlci11bmRvLWxp c3QnIG5vbi1uaWwNCithbmQgYGJ1ZmZlci1tb2RpZmllZC1wJyBub24tbmls IHdoZW4gYGNvbWJpbmUtY2hhbmdlLWNhbGxzJyBpcw0KK2NhbGxlZC4iDQor ICAoZXJ0LXdpdGgtdGVtcC1maWxlIHRlbXBmaWxlDQorICAgICh3aXRoLWN1 cnJlbnQtYnVmZmVyIChmaW5kLWZpbGUgdGVtcGZpbGUpDQorICAgICAgKGlu c2VydCAiQSIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiQiIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiQyIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiICIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiRCIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiRSIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQorICAgICAgKGlu c2VydCAiRiIpDQorICAgICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1ZmZlci11 bmRvLWxpc3QpIDE0KSkNCisgICAgICAoZ290by1jaGFyIChwb2ludC1taW4p KQ0KKyAgICAgIChjb21iaW5lLWNoYW5nZS1jYWxscyAocG9pbnQtbWluKSAo cG9pbnQtbWF4KQ0KKyAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJkICJBQkMg IikNCisgICAgICAgIChyZXBsYWNlLW1hdGNoICJaICIpKQ0KKyAgICAgIChz aG91bGQgKD0gKGxlbmd0aCBidWZmZXItdW5kby1saXN0KSAxNSkpKSkpDQor DQorKGVydC1kZWZ0ZXN0IHVuZG8tdGVzdC1jb21iaW5lLWNoYW5nZS1jYWxs cy0yICgpDQorICAiVGVzdCBob3cgYGNvbWJpbmUtY2hhbmdlLWNhbGxzJyB1 cGRhdGVzIGBidWZmZXItdW5kby1saXN0Jy4NCitDYXNlIDI6IGEgZmlsZS12 aXNpdGluZyBidWZmZXIgd2l0aCBgYnVmZmVyLXVuZG8tbGlzdCcgbm9uLW5p bA0KK2FuZCBgYnVmZmVyLW1vZGlmaWVkLXAnIG5pbCB3aGVuIGBjb21iaW5l LWNoYW5nZS1jYWxscycgaXMNCitjYWxsZWQuIg0KKyAgKGVydC13aXRoLXRl bXAtZmlsZSB0ZW1wZmlsZQ0KKyAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciAo ZmluZC1maWxlIHRlbXBmaWxlKQ0KKyAgICAgIChpbnNlcnQgIkEiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIkIiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIkMiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIiAiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIkQiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIkUiKQ0KKyAg ICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQgIkYiKQ0KKyAg ICAgIChzaG91bGQgKD0gKGxlbmd0aCBidWZmZXItdW5kby1saXN0KSAxNCkp DQorICAgICAgKHNhdmUtYnVmZmVyKQ0KKyAgICAgIChnb3RvLWNoYXIgKHBv aW50LW1pbikpDQorICAgICAgKGNvbWJpbmUtY2hhbmdlLWNhbGxzIChwb2lu dC1taW4pIChwb2ludC1tYXgpDQorICAgICAgICAocmUtc2VhcmNoLWZvcndh cmQgIkFCQyAiKQ0KKyAgICAgICAgKHJlcGxhY2UtbWF0Y2ggIlogIikpDQor ICAgICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1ZmZlci11bmRvLWxpc3QpIDE1 KSkpKSkNCisNCisoZXJ0LWRlZnRlc3QgdW5kby10ZXN0LWNvbWJpbmUtY2hh bmdlLWNhbGxzLTMgKCkNCisgICJUZXN0IGhvdyBgY29tYmluZS1jaGFuZ2Ut Y2FsbHMnIHVwZGF0ZXMgYGJ1ZmZlci11bmRvLWxpc3QnLg0KK0Nhc2UgMzog YSBmaWxlLXZpc2l0aW5nIGJ1ZmZlciB3aXRoIGBidWZmZXItdW5kby1saXN0 JyBuaWwgYW5kDQorYGJ1ZmZlci1tb2RpZmllZC1wJyBuaWwgd2hlbiBgY29t YmluZS1jaGFuZ2UtY2FsbHMnIGlzIGNhbGxlZC4iDQorICAoZXJ0LXdpdGgt dGVtcC1maWxlIHRlbXBmaWxlDQorICAgICh3aXRoLWN1cnJlbnQtYnVmZmVy IChmaW5kLWZpbGUgdGVtcGZpbGUpDQorICAgICAgKGluc2VydCAiQUJDIERF RiIpDQorICAgICAgKHNhdmUtYnVmZmVyKQ0KKyAgICAgIChraWxsLWJ1ZmZl cikpDQorICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIChmaW5kLWZpbGUgdGVt cGZpbGUpDQorICAgICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1ZmZlci11bmRv LWxpc3QpIDApKQ0KKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpDQor ICAgICAgKGNvbWJpbmUtY2hhbmdlLWNhbGxzIChwb2ludC1taW4pIChwb2lu dC1tYXgpDQorICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgIkFCQyAiKQ0K KyAgICAgICAgKHJlcGxhY2UtbWF0Y2ggIlogIikpDQorICAgICAgKHNob3Vs ZCAoPSAobGVuZ3RoIGJ1ZmZlci11bmRvLWxpc3QpIDEpKSkpKQ0KKw0KIChk ZWZ1biB1bmRvLXRlc3QtYWxsICgmb3B0aW9uYWwgaW50ZXJhY3RpdmUpDQog ICAiUnVuIGFsbCB0ZXN0cyBmb3IgXFxbdW5kb10uIg0KICAgKGludGVyYWN0 aXZlICJwIikNCi0tIA0KMi4zOS4wDQoNCg== --qTQ3tw3BW8 Content-Type: text/x-diff; name=Fix-combine-change-call-with-timestamps.patch Content-Transfer-Encoding: base64 Content-ID: Content-Disposition: attachment; filename=Fix-combine-change-call-with-timestamps.patch RnJvbSBhMWM0MzU3NDlmMWY0MzQ2Y2ZkMDdmZGI4OTNmNjcyMTIzM2ZlOWI3 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBXZWQsIDQgSmFu IDIwMjMgMjA6NDk6MjIgKzAwMDANClN1YmplY3Q6IFtQQVRDSF0gRml4IGNv bWJpbmUtY2hhbmdlLWNhbGwNCg0KKiBsaXNwL3N1YnIuZWwgKGNvbWJpbmUt Y2hhbmdlLWNhbGxzLTEpOiBSZXdyaXRlIGFuZCBkb2N1bWVudA0KdGhlIHBh cnQgd2hpY2ggY3JlYXRlcyB0aGUgdW5kby1saXN0IGVsZW1lbnQuICBGaXhl cyBidWcjNjA0NjcuDQoqIHRlc3Qvc3JjL3VuZG8tdGVzdHMuZWwgKHVuZG8t dGVzdC1jb21iaW5lLWNoYW5nZS1jYWxscy0xKQ0KKHVuZG8tdGVzdC1jb21i aW5lLWNoYW5nZS1jYWxscy0yKQ0KKHVuZG8tdGVzdC1jb21iaW5lLWNoYW5n ZS1jYWxscy0zKTogQWRkIHRocmVlIHRlc3RzIGZvciAndW5kbycNCndpdGgg J2NvbWJpbmUtY2hhbmdlLWNhbGxzJy4NCi0tLQ0KIGxpc3Avc3Vici5lbCAg ICAgICAgICAgfCA2MCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0t LS0tLQ0KIHRlc3Qvc3JjL3VuZG8tdGVzdHMuZWwgfCA3MiArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysNCiAyIGZpbGVzIGNo YW5nZWQsIDEwNyBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkNCg0K ZGlmZiAtLWdpdCBhL2xpc3Avc3Vici5lbCBiL2xpc3Avc3Vici5lbA0KaW5k ZXggOTA4N2Y5YTQwNC4uMTA2ZmE3MWIxMiAxMDA2NDQNCi0tLSBhL2xpc3Av c3Vici5lbA0KKysrIGIvbGlzcC9zdWJyLmVsDQpAQCAtNDkzNCwzMSArNDkz NCw0MSBAQCBjb21iaW5lLWNoYW5nZS1jYWxscy0xDQogCSAgICAgIChraWxs LWxvY2FsLXZhcmlhYmxlICdiZWZvcmUtY2hhbmdlLWZ1bmN0aW9ucykpDQog CSAgICAoaWYgbG9jYWwtYWNmIChzZXRxIGFmdGVyLWNoYW5nZS1mdW5jdGlv bnMgYWNmKQ0KIAkgICAgICAoa2lsbC1sb2NhbC12YXJpYWJsZSAnYWZ0ZXIt Y2hhbmdlLWZ1bmN0aW9ucykpKSkNCi0gICAgICAgICh3aGVuIChub3QgKGVx IGJ1ZmZlci11bmRvLWxpc3QgdCkpDQotICAgICAgICAgIChsZXQgKChhcC1l bHQNCi0JCSAobGlzdCAnYXBwbHkNCi0JCSAgICAgICAoLSBlbmQgZW5kLW1h cmtlcikNCi0JCSAgICAgICBiZWcNCi0JCSAgICAgICAobWFya2VyLXBvc2l0 aW9uIGVuZC1tYXJrZXIpDQotCQkgICAgICAgIyd1bmRvLS13cmFwLWFuZC1y dW4tcHJpbWl0aXZlLXVuZG8NCi0JCSAgICAgICBiZWcgKG1hcmtlci1wb3Np dGlvbiBlbmQtbWFya2VyKSBidWZmZXItdW5kby1saXN0KSkNCi0JCShwdHIg YnVmZmVyLXVuZG8tbGlzdCkpDQotCSAgICAoaWYgKG5vdCAoZXEgYnVmZmVy LXVuZG8tbGlzdCBvbGQtYnVsKSkNCi0JCShwcm9nbg0KLQkJICAod2hpbGUg KGFuZCAobm90IChlcSAoY2RyIHB0cikgb2xkLWJ1bCkpDQotCQkJICAgICAg OzsgSW4gY2FzZSBnYXJiYWdlIGNvbGxlY3Rpb24gaGFzIHJlbW92ZWQgT0xE LUJVTC4NCi0JCQkgICAgICAoY2RyIHB0cikNCi0JCQkgICAgICA7OyBEb24n dCBpbmNsdWRlIGEgdGltZXN0YW1wIGVudHJ5Lg0KLQkJCSAgICAgIChub3Qg KGFuZCAoY29uc3AgKGNkciBwdHIpKQ0KLQkJCQkJKGNvbnNwIChjYWRyIHB0 cikpDQotCQkJCQkoZXEgKGNhYWRyIHB0cikgdCkNCi0JCQkJCShzZXRxIG9s ZC1idWwgKGNkciBwdHIpKSkpKQ0KLQkJICAgIChzZXRxIHB0ciAoY2RyIHB0 cikpKQ0KLQkJICAodW5sZXNzIChjZHIgcHRyKQ0KLQkJICAgIChtZXNzYWdl ICJjb21iaW5lLWNoYW5nZS1jYWxsczogYnVmZmVyLXVuZG8tbGlzdCBicm9r ZW4iKSkNCi0JCSAgKHNldGNkciBwdHIgbmlsKQ0KLQkJICAocHVzaCBhcC1l bHQgYnVmZmVyLXVuZG8tbGlzdCkNCi0JCSAgKHNldGNkciBidWZmZXItdW5k by1saXN0IG9sZC1idWwpKSkpKQ0KKwk7OyBJZiBidWZmZXItdW5kby1saXN0 IGlzIG5laXRoZXIgdCAoaW4gd2hpY2ggY2FzZSB1bmRvDQorCTs7IGluZm9y bWF0aW9uIGlzIG5vdCByZWNvcmRlZCkgbm9yIGVxdWFsIHRvIGJ1ZmZlci11 bmRvLWxpc3QNCisJOzsgYmVmb3JlIGJvZHkgd2FzIGZ1bmNhbGxlZCAoaW4g d2hpY2ggY2FzZSAoZnVuY2FsbCBib2R5KSBkaWQNCisJOzsgbm90IGFkZCBp dGVtcyB0byBidWZmZXItdW5kby1saXN0KSAuLi4NCisJKHVubGVzcyAob3Ig KGVxIGJ1ZmZlci11bmRvLWxpc3QgdCkNCisJCSAgICAoZXEgYnVmZmVyLXVu ZG8tbGlzdCBvbGQtYnVsKSkNCisJICAobGV0ICgocHRyIGJ1ZmZlci11bmRv LWxpc3QpIGJvZHktdW5kby1saXN0KQ0KKwkgICAgOzsgLi4uIHRoZW4gbG9v cCBvdmVyIGJ1ZmZlci11bmRvLWxpc3QsIHVudGlsIHRoZSBoZWFkIG9mDQor CSAgICA7OyBidWZmZXItdW5kby1saXN0IGJlZm9yZSBib2R5IHdhcyBmdW5j YWxsZWQgaXMgZm91bmQsIG9yDQorCSAgICA7OyBwdHIgaXMgbmlsICh3aGlj aCBtYXkgaGFwcGVuIGlmIGdhcmJhZ2UtY29sbGVjdCBoYXMNCisJICAgIDs7 IGJlZW4gY2FsbGVkIGFmdGVyIChmdW5jYWxsIGJvZHkpIGFuZCBoYXMgcmVt b3ZlZA0KKwkgICAgOzsgZW50cmllcyBvZiBidWZmZXItdW5kby1saXN0IHRo YXQgd2VyZSBhZGRlZCBieSAoZnVuY2FsbA0KKwkgICAgOzsgYm9keSkpLCBh bmQgYWRkIHRoZXNlIGVudHJpZXMgdG8gYm9keS11bmRvLWxpc3QuDQorCSAg ICAod2hpbGUgKGFuZCBwdHIgKG5vdCAoZXEgcHRyIG9sZC1idWwpKSkNCisJ ICAgICAgKHB1c2ggKGNhciBwdHIpIGJvZHktdW5kby1saXN0KQ0KKwkgICAg ICAoc2V0cSBwdHIgKGNkciBwdHIpKSkNCisJICAgIChzZXRxIGJvZHktdW5k by1saXN0IChucmV2ZXJzZSBib2R5LXVuZG8tbGlzdCkpDQorCSAgICA7OyBX YXJuIGlmIGdhcmJhZ2UtY29sbGVjdCBoYXMgdHJ1bmNhdGVkIGJ1ZmZlci11 bmRvLWxpc3QNCisJICAgIDs7IGJlaGluZCBvdXIgYmFjay4NCisJICAgICh3 aGVuIChhbmQgb2xkLWJ1bCAobm90IHB0cikpDQorCSAgICAgIChtZXNzYWdl DQorICAgICAgICAgICAgICAgImNvbWJpbmUtY2hhbmdlLWNhbGxzOiBidWZm ZXItdW5kby1saXN0IGhhcyBiZWVuIHRydW5jYXRlZCIpKQ0KKwkgICAgOzsg QWRkIGFuIChhcHBseSAuLi4pIGVudHJ5IHRvIGJ1ZmZlci11bmRvLWxpc3Qs IHVzaW5nDQorCSAgICA7OyBib2R5LXVuZG8tbGlzdCAuLi4NCisJICAgIChw dXNoIChsaXN0ICdhcHBseQ0KKwkJCSgtIGVuZCBlbmQtbWFya2VyKQ0KKwkJ CWJlZw0KKwkJCShtYXJrZXItcG9zaXRpb24gZW5kLW1hcmtlcikNCisJCQkj J3VuZG8tLXdyYXAtYW5kLXJ1bi1wcmltaXRpdmUtdW5kbw0KKwkJCWJlZyAo bWFya2VyLXBvc2l0aW9uIGVuZC1tYXJrZXIpDQorCQkJYm9keS11bmRvLWxp c3QpDQorCQkgIGJ1ZmZlci11bmRvLWxpc3QpDQorCSAgICA7OyAuLi4gYW5k IHNldCB0aGUgY2RyIG9mIGJ1ZmZlci11bmRvLWxpc3QgdG8NCisJICAgIDs7 IGJ1ZmZlci11bmRvLWxpc3QgYmVmb3JlIGJvZHkgd2FzIGZ1bmNhbGxlZC4N CisJICAgIChzZXRjZHIgYnVmZmVyLXVuZG8tbGlzdCBvbGQtYnVsKSkpDQog CShpZiAobm90IGluaGliaXQtbW9kaWZpY2F0aW9uLWhvb2tzKQ0KIAkgICAg KHJ1bi1ob29rLXdpdGgtYXJncyAnYWZ0ZXItY2hhbmdlLWZ1bmN0aW9ucw0K IAkJCQliZWcgKG1hcmtlci1wb3NpdGlvbiBlbmQtbWFya2VyKQ0KZGlmZiAt LWdpdCBhL3Rlc3Qvc3JjL3VuZG8tdGVzdHMuZWwgYi90ZXN0L3NyYy91bmRv LXRlc3RzLmVsDQppbmRleCA4NDE1MWQzYjVkLi5mZDQ1YTkxMDFmIDEwMDY0 NA0KLS0tIGEvdGVzdC9zcmMvdW5kby10ZXN0cy5lbA0KKysrIGIvdGVzdC9z cmMvdW5kby10ZXN0cy5lbA0KQEAgLTQzOSw2ICs0MzksNzggQEAgdW5kby10 ZXN0LXJlZ2lvbi1tYXJrLWFkanVzdG1lbnQNCiANCiAgICAgKHNob3VsZCAo c3RyaW5nPSAoYnVmZmVyLXN0cmluZykgImFhYUZpcnN0IGxpbmVcblNlY29u ZCBsaW5lXG5iYmIiKSkpKQ0KIA0KKyhlcnQtZGVmdGVzdCB1bmRvLXRlc3Qt Y29tYmluZS1jaGFuZ2UtY2FsbHMtMSAoKQ0KKyAgIlRlc3QgaG93IGBjb21i aW5lLWNoYW5nZS1jYWxscycgdXBkYXRlcyBgYnVmZmVyLXVuZG8tbGlzdCcu DQorQ2FzZSAxOiBhIGZpbGUtdmlzaXRpbmcgYnVmZmVyIHdpdGggYGJ1ZmZl ci11bmRvLWxpc3QnIG5vbi1uaWwNCithbmQgYGJ1ZmZlci1tb2RpZmllZC1w JyBub24tbmlsIHdoZW4gYGNvbWJpbmUtY2hhbmdlLWNhbGxzJyBpcw0KK2Nh bGxlZC4iDQorICAoZXJ0LXdpdGgtdGVtcC1maWxlIHRlbXBmaWxlDQorICAg ICh3aXRoLWN1cnJlbnQtYnVmZmVyIChmaW5kLWZpbGUgdGVtcGZpbGUpDQor ICAgICAgKGluc2VydCAiQSIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiQiIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiQyIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiICIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiRCIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiRSIpDQorICAgICAgKHVuZG8tYm91bmRhcnkpDQor ICAgICAgKGluc2VydCAiRiIpDQorICAgICAgKHNob3VsZCAoPSAobGVuZ3Ro IGJ1ZmZlci11bmRvLWxpc3QpIDE0KSkNCisgICAgICAoZ290by1jaGFyIChw b2ludC1taW4pKQ0KKyAgICAgIChjb21iaW5lLWNoYW5nZS1jYWxscyAocG9p bnQtbWluKSAocG9pbnQtbWF4KQ0KKyAgICAgICAgKHJlLXNlYXJjaC1mb3J3 YXJkICJBQkMgIikNCisgICAgICAgIChyZXBsYWNlLW1hdGNoICJaICIpKQ0K KyAgICAgIChzaG91bGQgKD0gKGxlbmd0aCBidWZmZXItdW5kby1saXN0KSAx NSkpKSkpDQorDQorKGVydC1kZWZ0ZXN0IHVuZG8tdGVzdC1jb21iaW5lLWNo YW5nZS1jYWxscy0yICgpDQorICAiVGVzdCBob3cgYGNvbWJpbmUtY2hhbmdl LWNhbGxzJyB1cGRhdGVzIGBidWZmZXItdW5kby1saXN0Jy4NCitDYXNlIDI6 IGEgZmlsZS12aXNpdGluZyBidWZmZXIgd2l0aCBgYnVmZmVyLXVuZG8tbGlz dCcgbm9uLW5pbA0KK2FuZCBgYnVmZmVyLW1vZGlmaWVkLXAnIG5pbCB3aGVu IGBjb21iaW5lLWNoYW5nZS1jYWxscycgaXMNCitjYWxsZWQuIg0KKyAgKGVy dC13aXRoLXRlbXAtZmlsZSB0ZW1wZmlsZQ0KKyAgICAod2l0aC1jdXJyZW50 LWJ1ZmZlciAoZmluZC1maWxlIHRlbXBmaWxlKQ0KKyAgICAgIChpbnNlcnQg IkEiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IkIiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IkMiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IiAiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IkQiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IkUiKQ0KKyAgICAgICh1bmRvLWJvdW5kYXJ5KQ0KKyAgICAgIChpbnNlcnQg IkYiKQ0KKyAgICAgIChzaG91bGQgKD0gKGxlbmd0aCBidWZmZXItdW5kby1s aXN0KSAxNCkpDQorICAgICAgKHNhdmUtYnVmZmVyKQ0KKyAgICAgIChnb3Rv LWNoYXIgKHBvaW50LW1pbikpDQorICAgICAgKGNvbWJpbmUtY2hhbmdlLWNh bGxzIChwb2ludC1taW4pIChwb2ludC1tYXgpDQorICAgICAgICAocmUtc2Vh cmNoLWZvcndhcmQgIkFCQyAiKQ0KKyAgICAgICAgKHJlcGxhY2UtbWF0Y2gg IlogIikpDQorICAgICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1ZmZlci11bmRv LWxpc3QpIDE1KSkpKSkNCisNCisoZXJ0LWRlZnRlc3QgdW5kby10ZXN0LWNv bWJpbmUtY2hhbmdlLWNhbGxzLTMgKCkNCisgICJUZXN0IGhvdyBgY29tYmlu ZS1jaGFuZ2UtY2FsbHMnIHVwZGF0ZXMgYGJ1ZmZlci11bmRvLWxpc3QnLg0K K0Nhc2UgMzogYSBmaWxlLXZpc2l0aW5nIGJ1ZmZlciB3aXRoIGBidWZmZXIt dW5kby1saXN0JyBuaWwgYW5kDQorYGJ1ZmZlci1tb2RpZmllZC1wJyBuaWwg d2hlbiBgY29tYmluZS1jaGFuZ2UtY2FsbHMnIGlzIGNhbGxlZC4iDQorICAo ZXJ0LXdpdGgtdGVtcC1maWxlIHRlbXBmaWxlDQorICAgICh3aXRoLWN1cnJl bnQtYnVmZmVyIChmaW5kLWZpbGUgdGVtcGZpbGUpDQorICAgICAgKGluc2Vy dCAiQUJDIERFRiIpDQorICAgICAgKHNhdmUtYnVmZmVyKQ0KKyAgICAgIChr aWxsLWJ1ZmZlcikpDQorICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIChmaW5k LWZpbGUgdGVtcGZpbGUpDQorICAgICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1 ZmZlci11bmRvLWxpc3QpIDApKQ0KKyAgICAgIChnb3RvLWNoYXIgKHBvaW50 LW1pbikpDQorICAgICAgKGNvbWJpbmUtY2hhbmdlLWNhbGxzIChwb2ludC1t aW4pIChwb2ludC1tYXgpDQorICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQg IkFCQyAiKQ0KKyAgICAgICAgKHJlcGxhY2UtbWF0Y2ggIlogIikpDQorICAg ICAgKHNob3VsZCAoPSAobGVuZ3RoIGJ1ZmZlci11bmRvLWxpc3QpIDEpKSkp KQ0KKw0KIChkZWZ1biB1bmRvLXRlc3QtYWxsICgmb3B0aW9uYWwgaW50ZXJh Y3RpdmUpDQogICAiUnVuIGFsbCB0ZXN0cyBmb3IgXFxbdW5kb10uIg0KICAg KGludGVyYWN0aXZlICJwIikNCi0tIA0KMi4zOS4wDQoNCg== --qTQ3tw3BW8--