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#45474: Icomplete exhibiting in recursive minibuffer when it =?UTF-8?Q?shouldn=E2=80=99t?= Date: Thu, 22 Apr 2021 15:18:49 +0000 Message-ID: References: <3ed97a9c53e0a5d4fef8@heytings.org> <87fszrz21d.fsf@mail.linkov.net> <3ed97a9c530093aca93d@heytings.org> <7dee3f4235d331cab291@heytings.org> <87r1jatd34.fsf@mail.linkov.net> <7dee3f423551aaf318cb@heytings.org> <87im4kzlfm.fsf@mail.linkov.net> <1869622e16546eafd9df@heytings.org> <871rb6np5j.fsf@mail.linkov.net> <87lf9cepqw.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Dv3wKgit5e" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6496"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Dario Gjorgjevski , 45474@debbugs.gnu.org, Juri Linkov To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Apr 22 17:19:22 2021 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 1lZb6v-0001Od-Dl for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 22 Apr 2021 17:19:21 +0200 Original-Received: from localhost ([::1]:56292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZb6t-0005d4-UX for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 22 Apr 2021 11:19:19 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZb6c-0005c6-V6 for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:19:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZb6c-0004aL-LP for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZb6c-0001fe-CK for bug-gnu-emacs@gnu.org; Thu, 22 Apr 2021 11:19: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, 22 Apr 2021 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45474 X-GNU-PR-Package: emacs Original-Received: via spool by 45474-submit@debbugs.gnu.org id=B45474.16191047356403 (code B ref 45474); Thu, 22 Apr 2021 15:19:02 +0000 Original-Received: (at 45474) by debbugs.gnu.org; 22 Apr 2021 15:18:55 +0000 Original-Received: from localhost ([127.0.0.1]:35306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZb6U-0001fC-Pk for submit@debbugs.gnu.org; Thu, 22 Apr 2021 11:18:55 -0400 Original-Received: from heytings.org ([95.142.160.155]:48978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZb6R-0001f1-Bw for 45474@debbugs.gnu.org; Thu, 22 Apr 2021 11:18:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20210101; t=1619104729; bh=xY/pK3G0S0WSKRWKc5SMIVilhYPxZrP78vJSJXg5Nao=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=AVVVUkiXCOBECN+21WwKk3GCiO36aAeAqnhZmUR0Bf+z02tL0qyRp9Z0gPY13MQQq JEJX9SdyN5rYKgFuYiHqbZaDU9nrWjwllzDjR3wA9GS4q/6oBfRRYPLuJEaZfL4PCu X98oLz1gg/NXmkpZC7/hxUIacInoWqpc63L94dnSShYZZ1zCRmDz7g68uL4ZqkjfG0 9cjUFilQYMmik6MMV0rFCuaQ0ho/SRTvejjN4BehcEusMhBbdQSQEnEA5n2gjn7rUc gYqkmQpyg44PwT2CAriYZd++O6upxwOf59Q3daghfXc15BClzjs1NAL1w9hx2EaU90 E1mXXAc8dA6Ag== 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" Xref: news.gmane.io gmane.emacs.bugs:204697 Archived-At: --Dv3wKgit5e Content-Type: text/plain; charset=us-ascii; format=flowed >> I'm more and more thinking that we should really bite the bullet and go >> for a "really buffer-local" setup, such as in the patch below. >> >> I'd be surprised if it doesn't introduce backward incompatibilities, >> but at least it's "The Right Thing" to do. > > Well, that's what my patch does, too, except that it delays the backward > incompatilibites during one Emacs major release... (I did not include > minibuffer-completion-predicate and minibuffer-completion-confirm > because they haven't been discussed yet, but they are easy to add.) > And (to show that they are indeed easy to add) here is the updated patch, which also takes care of minibuffer-completion-predicate and minibuffer-completion-confirm. --Dv3wKgit5e Content-Type: text/x-diff; name=Make-it-possible-to-disable-a-completion-backend-in-.patch Content-Transfer-Encoding: base64 Content-ID: Content-Description: Content-Disposition: attachment; filename=Make-it-possible-to-disable-a-completion-backend-in-.patch RnJvbSA1N2FjMGQ1YzA0MDhiYjgzNWViNzhmNzQ5N2E0MjVkODM5MGE3NDYw IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBUaHUsIDIyIEFw ciAyMDIxIDE1OjEyOjU2ICswMDAwDQpTdWJqZWN0OiBbUEFUQ0hdIE1ha2Ug aXQgcG9zc2libGUgdG8gZGlzYWJsZSBhIGNvbXBsZXRpb24gYmFja2VuZCBp biByZWN1cnNpdmUNCiBtaW5pYnVmZmVycw0KDQotLS0NCiBsaXNwL21pbmli dWZmZXIuZWwgfCAgMSArDQogbGlzcC9zdWJyLmVsICAgICAgIHwgMTcgKysr KysrKysrKysrKw0KIHNyYy9mbnMuYyAgICAgICAgICB8ICA2ICsrLS0tDQog c3JjL21pbmlidWYuYyAgICAgIHwgNTkgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKystLS0tLQ0KIDQgZmlsZXMgY2hhbmdlZCwg NzQgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdp dCBhL2xpc3AvbWluaWJ1ZmZlci5lbCBiL2xpc3AvbWluaWJ1ZmZlci5lbA0K aW5kZXggN2RhM2MzOWU2Yi4uMTc5NmI5Nzk5MCAxMDA2NDQNCi0tLSBhL2xp c3AvbWluaWJ1ZmZlci5lbA0KKysrIGIvbGlzcC9taW5pYnVmZmVyLmVsDQpA QCAtMzg4NSw2ICszODg1LDcgQEAgY29tcGxldGluZy1yZWFkLWRlZmF1bHQN CiAgICAgICAgICAgICAgICAgKDErIChjZHIgaW5pdGlhbC1pbnB1dCkpKSkp DQogDQogICAobGV0KiAoKG1pbmlidWZmZXItY29tcGxldGlvbi10YWJsZSBj b2xsZWN0aW9uKQ0KKyAgICAgICAgIChtaW5pYnVmZmVyLWxvY2FsLWNvbXBs ZXRpb24gdCkNCiAgICAgICAgICAobWluaWJ1ZmZlci1jb21wbGV0aW9uLXBy ZWRpY2F0ZSBwcmVkaWNhdGUpDQogICAgICAgICAgOzsgRklYTUU6IFJlbW92 ZS9yZW5hbWUgdGhpcyB2YXIsIHNlZSB0aGUgbmV4dCBvbmUuDQogICAgICAg ICAgKG1pbmlidWZmZXItY29tcGxldGlvbi1jb25maXJtICh1bmxlc3MgKGVx IHJlcXVpcmUtbWF0Y2ggdCkNCmRpZmYgLS1naXQgYS9saXNwL3N1YnIuZWwg Yi9saXNwL3N1YnIuZWwNCmluZGV4IGMyYmUyNmExNWYuLjI0MTRmNjA5NDAg MTAwNjQ0DQotLS0gYS9saXNwL3N1YnIuZWwNCisrKyBiL2xpc3Avc3Vici5l bA0KQEAgLTI3OTEsNiArMjc5MSwyMyBAQCByZWFkLXBhc3N3ZA0KICAgICAg ICAgICAgICAgOzsgQW5kIG9mIGNvdXJzZSwgZG9uJ3Qga2VlcCB0aGUgc2Vu c2l0aXZlIGRhdGEgYXJvdW5kLg0KICAgICAgICAgICAgICAgKGVyYXNlLWJ1 ZmZlcikpKSkpKSkpDQogDQorKGRlZm1hY3JvIHJlYWQtZnJvbS1taW5pYnVm ZmVyICgmcmVzdCBib2R5KQ0KKyAgIlJlYWQgYSBzdHJpbmcgZnJvbSB0aGUg bWluaWJ1ZmZlciB3aXRoIGBpbnRlcm5hbC1yZWFkLWZyb20tbWluaWJ1ZmZl cicuDQorU2VlIGBpbnRlcm5hbC1yZWFkLWZyb20tbWluaWJ1ZmZlcicgZm9y IGEgZGVzY3JpcHRpb24gb2YgdGhlIGFyZ3VtZW50cy4NCitUaGlzIG1hY3Jv IGV4aXN0cyBvbmx5IGluIEVtYWNzIDI4LCBmb3IgdGhlIHRyYW5zaXRpb24g cGVyaW9kIGR1cmluZyB3aGljaA0KK3RoZSBkZWZhdWx0IHZhbHVlIG9mIGBt aW5pYnVmZmVyLWxvY2FsLWNvbXBsZXRpb24nIGlzIG5pbCwgYW5kIHdpbGwg YmUNCityZW1vdmVkIGluIEVtYWNzIDI5LiAgTGlrZXdpc2UsIGBpbnRlcm5h bC1yZWFkLWZyb20tbWluaWJ1ZmZlcicgd2lsbCBiZQ0KK3JlbW92ZWQgaW4g RW1hY3MgMjksIHBsZWFzZSBkbyBub3QgdXNlIGl0IGRpcmVjdGx5LiINCisg IGAoaWYgbWluaWJ1ZmZlci1sb2NhbC1jb21wbGV0aW9uDQorICAgICAgIChs ZXQgKChtaW5pYnVmZmVyLWxvY2FsLWNvbXBsZXRpb24tdGFibGUgbWluaWJ1 ZmZlci1jb21wbGV0aW9uLXRhYmxlKQ0KKyAgICAgICAgICAgICAobWluaWJ1 ZmZlci1sb2NhbC1jb21wbGV0aW9uLXByZWRpY2F0ZSBtaW5pYnVmZmVyLWNv bXBsZXRpb24tcHJlZGljYXRlKQ0KKyAgICAgICAgICAgICAobWluaWJ1ZmZl ci1sb2NhbC1jb21wbGV0aW9uLWNvbmZpcm0gbWluaWJ1ZmZlci1jb21wbGV0 aW9uLWNvbmZpcm0pKQ0KKyAgICAgICAgIChsZXQgKChtaW5pYnVmZmVyLWNv bXBsZXRpb24tdGFibGUgbmlsKQ0KKyAgICAgICAgICAgICAgIChtaW5pYnVm ZmVyLWNvbXBsZXRpb24tcHJlZGljYXRlIG5pbCkNCisgICAgICAgICAgICAg ICAobWluaWJ1ZmZlci1jb21wbGV0aW9uLWNvbmZpcm0gbmlsKSkNCisgICAg ICAgICAgIChpbnRlcm5hbC1yZWFkLWZyb20tbWluaWJ1ZmZlciAsQGJvZHkp KSkNCisgICAgIChpbnRlcm5hbC1yZWFkLWZyb20tbWluaWJ1ZmZlciAsQGJv ZHkpKSkNCisNCiAoZGVmdmFyIHJlYWQtbnVtYmVyLWhpc3RvcnkgbmlsDQog ICAiVGhlIGRlZmF1bHQgaGlzdG9yeSBmb3IgdGhlIGByZWFkLW51bWJlcicg ZnVuY3Rpb24uIikNCiANCmRpZmYgLS1naXQgYS9zcmMvZm5zLmMgYi9zcmMv Zm5zLmMNCmluZGV4IDE3NTgxNDhmZjIuLmRiNjY3OWE4NDcgMTAwNjQ0DQot LS0gYS9zcmMvZm5zLmMNCisrKyBiL3NyYy9mbnMuYw0KQEAgLTI5ODUsOSAr Mjk4NSw5IEBAIERFRlVOICgieWVzLW9yLW5vLXAiLCBGeWVzX29yX25vX3As IFN5ZXNfb3Jfbm9fcCwgMSwgMSwgMCwNCiANCiAgIHdoaWxlICgxKQ0KICAg ICB7DQotICAgICAgYW5zID0gRmRvd25jYXNlIChGcmVhZF9mcm9tX21pbmli dWZmZXIgKHByb21wdCwgUW5pbCwgUW5pbCwgUW5pbCwNCi0JCQkJCSAgICAg IFF5ZXNfb3Jfbm9fcF9oaXN0b3J5LCBRbmlsLA0KLQkJCQkJICAgICAgUW5p bCkpOw0KKyAgICAgIGFucyA9IEZkb3duY2FzZSAoRmludGVybmFsX3JlYWRf ZnJvbV9taW5pYnVmZmVyIChwcm9tcHQsIFFuaWwsIFFuaWwsIFFuaWwsDQor CQkJCQkJICAgICAgIFF5ZXNfb3Jfbm9fcF9oaXN0b3J5LCBRbmlsLA0KKwkJ CQkJCSAgICAgICBRbmlsKSk7DQogICAgICAgaWYgKFNDSEFSUyAoYW5zKSA9 PSAzICYmICFzdHJjbXAgKFNTREFUQSAoYW5zKSwgInllcyIpKQ0KIAlyZXR1 cm4gdW5iaW5kX3RvIChjb3VudCwgUXQpOw0KICAgICAgIGlmIChTQ0hBUlMg KGFucykgPT0gMiAmJiAhc3RyY21wIChTU0RBVEEgKGFucyksICJubyIpKQ0K ZGlmZiAtLWdpdCBhL3NyYy9taW5pYnVmLmMgYi9zcmMvbWluaWJ1Zi5jDQpp bmRleCAxYTYzN2M4NmFkLi5mZDc4MGJkNWMxIDEwMDY0NA0KLS0tIGEvc3Jj L21pbmlidWYuYw0KKysrIGIvc3JjL21pbmlidWYuYw0KQEAgLTg2NSw2ICs4 NjUsMTYgQEAgcmVhZF9taW5pYnVmIChMaXNwX09iamVjdCBtYXAsIExpc3Bf T2JqZWN0IGluaXRpYWwsIExpc3BfT2JqZWN0IHByb21wdCwNCiAgIGlmIChT VFJJTkdQIChpbnB1dF9tZXRob2QpICYmICFOSUxQIChGZmJvdW5kcCAoUWFj dGl2YXRlX2lucHV0X21ldGhvZCkpKQ0KICAgICBjYWxsMSAoUWFjdGl2YXRl X2lucHV0X21ldGhvZCwgaW5wdXRfbWV0aG9kKTsNCiANCisgIGlmICghIEVR IChWbWluaWJ1ZmZlcl9sb2NhbF9jb21wbGV0aW9uLCBRbmlsKSkgew0KKyAg ICBGbWFrZV9sb2NhbF92YXJpYWJsZSAoUW1pbmlidWZmZXJfY29tcGxldGlv bl90YWJsZSk7DQorICAgIEZzZXQgKFFtaW5pYnVmZmVyX2NvbXBsZXRpb25f dGFibGUsIFZtaW5pYnVmZmVyX2xvY2FsX2NvbXBsZXRpb25fdGFibGUpOw0K KyAgICBGbWFrZV9sb2NhbF92YXJpYWJsZSAoUW1pbmlidWZmZXJfY29tcGxl dGlvbl9wcmVkaWNhdGUpOw0KKyAgICBGc2V0IChRbWluaWJ1ZmZlcl9jb21w bGV0aW9uX3ByZWRpY2F0ZSwgVm1pbmlidWZmZXJfbG9jYWxfY29tcGxldGlv bl9wcmVkaWNhdGUpOw0KKyAgICBGbWFrZV9sb2NhbF92YXJpYWJsZSAoUW1p bmlidWZmZXJfY29tcGxldGlvbl9jb25maXJtKTsNCisgICAgRnNldCAoUW1p bmlidWZmZXJfY29tcGxldGlvbl9jb25maXJtLCBWbWluaWJ1ZmZlcl9sb2Nh bF9jb21wbGV0aW9uX2NvbmZpcm0pOw0KKyAgICBzcGVjYmluZCAoUW1pbmli dWZmZXJfbG9jYWxfY29tcGxldGlvbiwgUW5pbCk7DQorICB9DQorDQogICBy dW5faG9vayAoUW1pbmlidWZmZXJfc2V0dXBfaG9vayk7DQogDQogICAvKiBE b24ndCBhbGxvdyB0aGUgdXNlciB0byB1bmRvIHBhc3QgdGhpcyBwb2ludC4g ICovDQpAQCAtMTIzMSw5ICsxMjQxLDE2IEBAIGJhcmZfaWZfaW50ZXJhY3Rp b25faW5oaWJpdGVkICh2b2lkKQ0KICAgICB4c2lnbmFsMCAoUWluaGliaXRl ZF9pbnRlcmFjdGlvbik7DQogfQ0KIA0KLURFRlVOICgicmVhZC1mcm9tLW1p bmlidWZmZXIiLCBGcmVhZF9mcm9tX21pbmlidWZmZXIsDQotICAgICAgIFNy ZWFkX2Zyb21fbWluaWJ1ZmZlciwgMSwgNywgMCwNCitERUZVTiAoImludGVy bmFsLXJlYWQtZnJvbS1taW5pYnVmZmVyIiwgRmludGVybmFsX3JlYWRfZnJv bV9taW5pYnVmZmVyLA0KKyAgICAgICBTaW50ZXJuYWxfcmVhZF9mcm9tX21p bmlidWZmZXIsIDEsIDcsIDAsDQogICAgICAgIGRvYzogLyogUmVhZCBhIHN0 cmluZyBmcm9tIHRoZSBtaW5pYnVmZmVyLCBwcm9tcHRpbmcgd2l0aCBzdHJp bmcgUFJPTVBULg0KKw0KK05vdGU6IERvIG5vdCB1c2UgdGhpcyBmdW5jdGlv biBkaXJlY3RseSwgdXNlIGByZWFkLWZyb20tbWluaWJ1ZmZlcicgaW5zdGVh ZCwNCit3aGl0aCB0aGUgYXJndW1lbnRzIGRlc2NyaWJlZCBiZWxvdy4gIFRo ZSBgcmVhZC1mcm9tLW1pbmlidWZmZXInIG1hY3JvIGV4aXN0cw0KK29ubHkg aW4gRW1hY3MgMjggZm9yIHRoZSB0cmFuc2l0aW9uIHBlcmlvZCBkdXJpbmcg d2hpY2ggdGhlIGRlZmF1bHQgdmFsdWUgb2YNCitgbWluaWJ1ZmZlci1sb2Nh bC1jb21wbGV0aW9uJyBpcyBuaWwsIGl0IHdpbGwgYmUgcmVtb3ZlZCBpbiBF bWFjcyAyOSwgYW5kDQorYGludGVybmFsLXJlYWQtZnJvbS1taW5pYnVmZmVy JyB3aWxsIGJlY29tZSBgcmVhZC1mcm9tLW1pbmlidWZmZXInIGFnYWluLg0K Kw0KIFRoZSBvcHRpb25hbCBzZWNvbmQgYXJnIElOSVRJQUwtQ09OVEVOVFMg aXMgYW4gb2Jzb2xldGUgYWx0ZXJuYXRpdmUgdG8NCiAgIERFRkFVTFQtVkFM VUUuICBJdCBub3JtYWxseSBzaG91bGQgYmUgbmlsIGluIG5ldyBjb2RlLCBl eGNlcHQgd2hlbg0KICAgSElTVCBpcyBhIGNvbnMuICBJdCBpcyBkaXNjdXNz ZWQgaW4gbW9yZSBkZXRhaWwgYmVsb3cuDQpAQCAtMTM1Miw5ICsxMzY5LDkg QEAgREVGVU4gKCJyZWFkLXN0cmluZyIsIEZyZWFkX3N0cmluZywgU3JlYWRf c3RyaW5nLCAxLCA1LCAwLA0KICAgICAgRklYTUU6IGBtaW5pYnVmZmVyLWNv bXBsZXRpb24tdGFibGUnIHNob3VsZCBiZSBidWZmZXItbG9jYWwgaW5zdGVh ZC4gICovDQogICBzcGVjYmluZCAoUW1pbmlidWZmZXJfY29tcGxldGlvbl90 YWJsZSwgUW5pbCk7DQogDQotICB2YWwgPSBGcmVhZF9mcm9tX21pbmlidWZm ZXIgKHByb21wdCwgaW5pdGlhbF9pbnB1dCwgUW5pbCwNCi0JCQkgICAgICAg UW5pbCwgaGlzdG9yeSwgZGVmYXVsdF92YWx1ZSwNCi0JCQkgICAgICAgaW5o ZXJpdF9pbnB1dF9tZXRob2QpOw0KKyAgdmFsID0gRmludGVybmFsX3JlYWRf ZnJvbV9taW5pYnVmZmVyIChwcm9tcHQsIGluaXRpYWxfaW5wdXQsIFFuaWws DQorCQkJCSAgICAgICAgUW5pbCwgaGlzdG9yeSwgZGVmYXVsdF92YWx1ZSwN CisJCQkJICAgICAgICBpbmhlcml0X2lucHV0X21ldGhvZCk7DQogICBpZiAo U1RSSU5HUCAodmFsKSAmJiBTQ0hBUlMgKHZhbCkgPT0gMCAmJiAhIE5JTFAg KGRlZmF1bHRfdmFsdWUpKQ0KICAgICB2YWwgPSBDT05TUCAoZGVmYXVsdF92 YWx1ZSkgPyBYQ0FSIChkZWZhdWx0X3ZhbHVlKSA6IGRlZmF1bHRfdmFsdWU7 DQogICByZXR1cm4gdW5iaW5kX3RvIChjb3VudCwgdmFsKTsNCkBAIC0yMjgy LDYgKzIyOTksOSBAQCBzeW1zX29mX21pbmlidWYgKHZvaWQpDQogICBGc2V0 IChRbWluaWJ1ZmZlcl9kZWZhdWx0LCBRbmlsKTsNCiANCiAgIERFRlNZTSAo UW1pbmlidWZmZXJfY29tcGxldGlvbl90YWJsZSwgIm1pbmlidWZmZXItY29t cGxldGlvbi10YWJsZSIpOw0KKyAgREVGU1lNIChRbWluaWJ1ZmZlcl9jb21w bGV0aW9uX3ByZWRpY2F0ZSwgIm1pbmlidWZmZXItY29tcGxldGlvbi1wcmVk aWNhdGUiKTsNCisgIERFRlNZTSAoUW1pbmlidWZmZXJfY29tcGxldGlvbl9j b25maXJtLCAibWluaWJ1ZmZlci1jb21wbGV0aW9uLWNvbmZpcm0iKTsNCisg IERFRlNZTSAoUW1pbmlidWZmZXJfbG9jYWxfY29tcGxldGlvbiwgIm1pbmli dWZmZXItbG9jYWwtY29tcGxldGlvbiIpOw0KIA0KICAgc3RhdGljcHJvICgm bGFzdF9taW5pYnVmX3N0cmluZyk7DQogDQpAQCAtMjQxNSw2ICsyNDM1LDMz IEBAIHN5bXNfb2ZfbWluaWJ1ZiAodm9pZCkNCiAgY29tcGxldGlvbiBjb21t YW5kcyBsaXN0ZWQgaW4gYG1pbmlidWZmZXItY29uZmlybS1leGl0LWNvbW1h bmRzJy4gICovKTsNCiAgIFZtaW5pYnVmZmVyX2NvbXBsZXRpb25fY29uZmly bSA9IFFuaWw7DQogDQorICBERUZWQVJfTElTUCAoIm1pbmlidWZmZXItbG9j YWwtY29tcGxldGlvbiIsIFZtaW5pYnVmZmVyX2xvY2FsX2NvbXBsZXRpb24s DQorCSAgICAgICBkb2M6IC8qIFdoZXRoZXIgbWluaWJ1ZmZlciBjb21wbGV0 aW9uIGVsZW1lbnRzIHNob3VsZCBiZWNvbWUgYnVmZmVyLWxvY2FsLg0KK1Ro ZSBkZWZhdWx0IGlzIG5pbCBmb3IgRW1hY3MgMjguICBTZXR0aW5nIHRoaXMg dmFyaWFibGUgaW4gRW1hY3MgMjkgd2lsbCBoYXZlIG5vIGVmZmVjdDsNCit0 aGUgdmFsdWUgdCB3aWxsIGJlIGFzc3VtZWQuDQorV2hlbiB0LCBgbWluaWJ1 ZmZlci1jb21wbGV0aW9uLXRhYmxlJywgYG1pbmlidWZmZXItY29tcGxldGlv bi1wcmVkaWNhdGUnIGFuZA0KK2BtaW5pYnVmZmVyLWNvbXBsZXRpb24tY29u ZmlybScgYmVjb21lIGJ1ZmZlci1sb2NhbCB1cG9uIGVudGVyaW5nIHRoZSBt aW5pYnVmZmVyLA0KK2FuZCBhcmUgbmlsIGluIHJlY3Vyc2l2ZSBpbnZvY2F0 aW9ucyBvZiB0aGUgbWluaWJ1ZmZlciwgdW5sZXNzIHRoZXkgaGF2ZSBiZWVu IGxldC1ib3VuZA0KK3RvIGEgdmFsdWUuDQorV2hlbiBuaWwsIHRoZWlyIHZh bHVlcyBpcyBzaGFyZWQgYmV0d2VlbiB0aGUgcmVjdXJzaXZlIGludm9jYXRp b25zIG9mIHRoZSBtaW5pYnVmZmVyLA0KK3VubGVzcyB0aGV5IGhhdmUgYmVl biBsZXQtYm91bmQgdG8gYW5vdGhlciB2YWx1ZS4gICovKTsNCisgIFZtaW5p YnVmZmVyX2xvY2FsX2NvbXBsZXRpb24gPSBRbmlsOw0KKw0KKyAgREVGVkFS X0xJU1AgKCJtaW5pYnVmZmVyLWxvY2FsLWNvbXBsZXRpb24tdGFibGUiLCBW bWluaWJ1ZmZlcl9sb2NhbF9jb21wbGV0aW9uX3RhYmxlLA0KKwkgICAgICAg ZG9jOiAvKiBUaGUgbG9jYWwgY29tcGxldGlvbiB0YWJsZSB1c2VkIGluIHRo ZSBtaW5pYnVmZmVyLg0KK1NlZSBgbWluaWJ1ZmZlci1sb2NhbC1jb21wbGV0 aW9uJy4gICovKTsNCisgIFZtaW5pYnVmZmVyX2xvY2FsX2NvbXBsZXRpb25f dGFibGUgPSBRbmlsOw0KKw0KKyAgREVGVkFSX0xJU1AgKCJtaW5pYnVmZmVy LWxvY2FsLWNvbXBsZXRpb24tcHJlZGljYXRlIiwgVm1pbmlidWZmZXJfbG9j YWxfY29tcGxldGlvbl9wcmVkaWNhdGUsDQorCSAgICAgICBkb2M6IC8qIFRo ZSBsb2NhbCBjb21wbGV0aW9uIHByZWRpY2F0ZSB1c2VkIGluIHRoZSBtaW5p YnVmZmVyLg0KK1NlZSBgbWluaWJ1ZmZlci1sb2NhbC1jb21wbGV0aW9uJy4g ICovKTsNCisgIFZtaW5pYnVmZmVyX2xvY2FsX2NvbXBsZXRpb25fcHJlZGlj YXRlID0gUW5pbDsNCisNCisgIERFRlZBUl9MSVNQICgibWluaWJ1ZmZlci1s b2NhbC1jb21wbGV0aW9uLWNvbmZpcm0iLCBWbWluaWJ1ZmZlcl9sb2NhbF9j b21wbGV0aW9uX2NvbmZpcm0sDQorCSAgICAgICBkb2M6IC8qIFRoZSBsb2Nh bCBjb21wbGV0aW9uIGNvbmZpcm0gdXNlZCBpbiB0aGUgbWluaWJ1ZmZlci4N CitTZWUgYG1pbmlidWZmZXItbG9jYWwtY29tcGxldGlvbicuICAqLyk7DQor ICBWbWluaWJ1ZmZlcl9sb2NhbF9jb21wbGV0aW9uX2NvbmZpcm0gPSBRbmls Ow0KKw0KICAgREVGVkFSX0xJU1AgKCJtaW5pYnVmZmVyLWNvbXBsZXRpbmct ZmlsZS1uYW1lIiwNCiAJICAgICAgIFZtaW5pYnVmZmVyX2NvbXBsZXRpbmdf ZmlsZV9uYW1lLA0KIAkgICAgICAgZG9jOiAvKiBOb24tbmlsIG1lYW5zIGNv bXBsZXRpbmcgZmlsZSBuYW1lcy4gICovKTsNCkBAIC0yNDg3LDcgKzI1MzQs NyBAQCBzeW1zX29mX21pbmlidWYgKHZvaWQpDQogDQogICBkZWZzdWJyICgm U2FjdGl2ZV9taW5pYnVmZmVyX3dpbmRvdyk7DQogICBkZWZzdWJyICgmU3Nl dF9taW5pYnVmZmVyX3dpbmRvdyk7DQotICBkZWZzdWJyICgmU3JlYWRfZnJv bV9taW5pYnVmZmVyKTsNCisgIGRlZnN1YnIgKCZTaW50ZXJuYWxfcmVhZF9m cm9tX21pbmlidWZmZXIpOw0KICAgZGVmc3ViciAoJlNyZWFkX3N0cmluZyk7 DQogICBkZWZzdWJyICgmU3JlYWRfY29tbWFuZCk7DQogICBkZWZzdWJyICgm U3JlYWRfdmFyaWFibGUpOw0KLS0gDQoyLjMwLjINCg0K --Dv3wKgit5e--