From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: master a6a5d6a: Move 'revert-buffer' global binding to 'C-x g g' Date: Thu, 11 Mar 2021 10:19:34 -0600 Message-ID: References: <20210207123046.20692.80429@vcs0.savannah.gnu.org> <20210207123048.3D5A8211A5@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000003dbe2205bd4526be" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13357"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Lars Ingebrigtsen , emacs-devel@gnu.org, Sean Whitton To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Mar 11 17:33:08 2021 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 1lKOFI-0003O1-A9 for ged-emacs-devel@m.gmane-mx.org; Thu, 11 Mar 2021 17:33:08 +0100 Original-Received: from localhost ([::1]:38244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKOFH-0001xM-B4 for ged-emacs-devel@m.gmane-mx.org; Thu, 11 Mar 2021 11:33:07 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKO2G-00076j-BB for emacs-devel@gnu.org; Thu, 11 Mar 2021 11:19:40 -0500 Original-Received: from mail-pl1-f176.google.com ([209.85.214.176]:35118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKO2D-0003JO-Op for emacs-devel@gnu.org; Thu, 11 Mar 2021 11:19:39 -0500 Original-Received: by mail-pl1-f176.google.com with SMTP id d23so7226125plq.2 for ; Thu, 11 Mar 2021 08:19:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=q1Mtd0Sacb7szSPleLkrMJosjRifvdf6lkWwJImQtVg=; b=PfDsHiDiuJ4k3gTO1Wp1DmeO23mT69TGE8rAYAW9so+zWV6BapWfJH7RRZfL9wniM6 +zOIycC4ru58AqO9bfeU/orfbrpJ++OiBdwGWo3YiwwlGHqTOpjT+oOSEEBZJgS8+Uy4 Zu3xjgna2uuvXqtWtbWvo7gSwiTkylmBmnAA95i6k6QNAPFStO3HAoXhdjo9Xc7opKSp iPb20VUrGdcDJqi0ITrvQBqPaiHqoU20kJPehZmtR7NL93pB8GNZIIgjp1GrR9JHK6G9 N7Ow0EBsxEMnQzc+NvOCUe7lSqvhoDpPNqACh+bMoAONazmOfGJysV6Kn+R7hRrj9hnP qdTw== X-Gm-Message-State: AOAM531QesNagJpVBMKrp0XohUjGdSgh5vLrp0Ybyj28ewzSDd1JnlzB Qg7mp1I/9mimBHtMYgn9JYmyVat7xEPIJqxi8dS6UHoYCdE= X-Google-Smtp-Source: ABdhPJy/zsP5D/5D4oCI2BTmdDy/EtffgYDd80hsS6qMeeHxgvDCxCZH8M6JaxiBiR1hgaMjM3dVYmyO9LbEUyRe640= X-Received: by 2002:a17:90a:bd09:: with SMTP id y9mr9542120pjr.179.1615479575485; Thu, 11 Mar 2021 08:19:35 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 11 Mar 2021 10:19:34 -0600 In-Reply-To: Received-SPF: pass client-ip=209.85.214.176; envelope-from=stefankangas@gmail.com; helo=mail-pl1-f176.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, GAPPY_SUBJECT=0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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" Xref: news.gmane.io gmane.emacs.devel:266331 Archived-At: --0000000000003dbe2205bd4526be Content-Type: text/plain; charset="UTF-8" Stefan Kangas writes: > I don't know what notation to use here though. Maybe something like: > > \\[cmd] -> works as today > \\[=C-h] -> just adds the formatting to the exact string > \\[+cmd] -> adds both the key binding and its M-x form Introducing the \\[=C-h] substitution (patch 1) does seem to bring useful simplifications (patch 2). --0000000000003dbe2205bd4526be Content-Type: text/x-diff; charset="utf-8"; name="0001-Add-new-format-for-literal-keybindings-to-substitute.patch" Content-Disposition: attachment; filename="0001-Add-new-format-for-literal-keybindings-to-substitute.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: d4971bb3d4c620a3_0.1 RnJvbSBlNDI3NDcyZTZmNzkwMDc5OTZhZmQ0N2ZkODdkMWQ0MWJmMWRlYzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogVGh1LCAxMSBNYXIgMjAyMSAwNToyODo1OCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMS8yXSBB ZGQgbmV3IGZvcm1hdCBmb3IgbGl0ZXJhbCBrZXliaW5kaW5ncyB0bwogc3Vic3RpdHV0ZS1jb21t YW5kLWtleXMKCiogbGlzcC9oZWxwLmVsIChzdWJzdGl0dXRlLWNvbW1hbmQta2V5cyk6IEFkZCBu ZXcgZm9ybWF0IGZvcgpsaXRlcmFsIGtleWJpbmRpbmdzLgoqIHRlc3QvbGlzcC9oZWxwLXRlc3Rz LmVsCihoZWxwLXRlc3RzLXN1YnN0aXR1dGUtY29tbWFuZC1rZXlzL2xpdGVyYWwta2V5YmluZGlu Zyk6CihoZWxwLXRlc3RzLXN1YnN0aXR1dGUta2V5LWJpbmRpbmdzL2ZhY2UtaGVscC1rZXktYmlu ZGluZyk6IE5ldyB0ZXN0cy4KLS0tCiBsaXNwL2hlbHAuZWwgICAgICAgICAgICB8IDM0ICsrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIHRlc3QvbGlzcC9oZWxwLXRlc3RzLmVsIHwg MTQgKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9oZWxwLmVsIGIvbGlzcC9oZWxwLmVsCmlu ZGV4IDc5ZDgyOTZjZmUuLmQxYTgxN2E1OWQgMTAwNjQ0Ci0tLSBhL2xpc3AvaGVscC5lbAorKysg Yi9saXNwL2hlbHAuZWwKQEAgLTk4NCw2ICs5ODQsOSBAQCBzdWJzdGl0dXRlLWNvbW1hbmQta2V5 cwoga2V5c3Ryb2tlIHNlcXVlbmNlIHRoYXQgaW52b2tlcyBDT01NQU5ELCBvciBcIk0teCBDT01N QU5EXCIgaWYgQ09NTUFORAogaXMgbm90IG9uIGFueSBrZXlzLiAgS2V5YmluZGluZ3Mgd2lsbCB1 c2UgdGhlIGZhY2UgYGhlbHAta2V5LWJpbmRpbmcnLgogCitFYWNoIHN1YnN0cmluZyBvZiB0aGUg Zm9ybSBcXFxcPVs9S0VZQklORElOR10gd2lsbCBiZSByZXBsYWNlZCBieQorS0VZQklORElORyBh bmQgdXNlIHRoZSBgaGVscC1rZXktYmluZGluZycgZmFjZS4KKwogRWFjaCBzdWJzdHJpbmcgb2Yg dGhlIGZvcm0gXFxcXD17TUFQVkFSfSBpcyByZXBsYWNlZCBieSBhIHN1bW1hcnkgb2YKIHRoZSB2 YWx1ZSBvZiBNQVBWQVIgYXMgYSBrZXltYXAuICBUaGlzIHN1bW1hcnkgaXMgc2ltaWxhciB0byB0 aGUgb25lCiBwcm9kdWNlZCBieSDigJhkZXNjcmliZS1iaW5kaW5nc+KAmS4gIFRoZSBzdW1tYXJ5 IGVuZHMgaW4gdHdvIG5ld2xpbmVzCkBAIC0xMDU0LDE4ICsxMDU3LDI5IEBAIHN1YnN0aXR1dGUt Y29tbWFuZC1rZXlzCiAgICAgICAgICAgICAgICAgICAgIChzZXRxIGZ1biAoYXJlZiBrZXkgMSkp CiAgICAgICAgICAgICAgICAgICAgIChzZXRxIGtleSAod2l0aC1jdXJyZW50LWJ1ZmZlciBvcmln LWJ1ZgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAod2hlcmUtaXMtaW50ZXJuYWwg ZnVuIGtleW1hcCB0KSkpKQotICAgICAgICAgICAgICAgICAgKGlmIChub3Qga2V5KQotICAgICAg ICAgICAgICAgICAgICAgIDs7IEZ1bmN0aW9uIGlzIG5vdCBvbiBhbnkga2V5LgotICAgICAgICAg ICAgICAgICAgICAgIChsZXQgKChvcCAocG9pbnQpKSkKLSAgICAgICAgICAgICAgICAgICAgICAg IChpbnNlcnQgIk0teCAiKQotICAgICAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hhciAoKyBl bmQtcG9pbnQgMykpCi0gICAgICAgICAgICAgICAgICAgICAgICAoYWRkLXRleHQtcHJvcGVydGll cyBvcCAocG9pbnQpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnKCBmYWNlIGhlbHAta2V5LWJpbmRpbmcKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGZvbnQtbG9jay1mYWNlIGhlbHAta2V5LWJpbmRpbmcpKQotICAg ICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1jaGFyIDEpKQorICAgICAgICAgICAgICAgICAg KGNvbmQKKyAgICAgICAgICAgICAgICAgICAoKGxvb2tpbmctYXQgIj0iKQorICAgICAgICAgICAg ICAgICAgICA7OyBMaXRlcmFsIHJlcGxhY2VtZW50LgorICAgICAgICAgICAgICAgICAgICAobGV0 ICgob3AgKHBvaW50KSkpCisgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1jaGFyIDEpCisg ICAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hhciAoLSBlbmQtcG9pbnQgMikpCisgICAgICAg ICAgICAgICAgICAgICAgKGRlbGV0ZS1jaGFyIDEpCisgICAgICAgICAgICAgICAgICAgICAgKGFk ZC10ZXh0LXByb3BlcnRpZXMgb3AgKHBvaW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICcoIGZhY2UgaGVscC1rZXktYmluZGluZworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvbnQtbG9jay1mYWNlIGhlbHAta2V5LWJp bmRpbmcpKSkpCisgICAgICAgICAgICAgICAgICAgKChub3Qga2V5KQorICAgICAgICAgICAgICAg ICAgICA7OyBGdW5jdGlvbiBpcyBub3Qgb24gYW55IGtleS4KKyAgICAgICAgICAgICAgICAgICAg KGxldCAoKG9wIChwb2ludCkpKQorICAgICAgICAgICAgICAgICAgICAgIChpbnNlcnQgIk0teCAi KQorICAgICAgICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKCsgZW5kLXBvaW50IDMpKQorICAg ICAgICAgICAgICAgICAgICAgIChhZGQtdGV4dC1wcm9wZXJ0aWVzIG9wIChwb2ludCkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCBmYWNlIGhlbHAta2V5LWJp bmRpbmcKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmb250 LWxvY2stZmFjZSBoZWxwLWtleS1iaW5kaW5nKSkKKyAgICAgICAgICAgICAgICAgICAgICAoZGVs ZXRlLWNoYXIgMSkpKQorICAgICAgICAgICAgICAgICAgICh0CiAgICAgICAgICAgICAgICAgICAg IDs7IEZ1bmN0aW9uIGlzIG9uIGEga2V5LgogICAgICAgICAgICAgICAgICAgICAoZGVsZXRlLWNo YXIgKC0gZW5kLXBvaW50IChwb2ludCkpKQotICAgICAgICAgICAgICAgICAgICAoaW5zZXJ0ICho ZWxwLS1rZXktZGVzY3JpcHRpb24tZm9udGlmaWVkIGtleSkpKSkpCisgICAgICAgICAgICAgICAg ICAgIChpbnNlcnQgKGhlbHAtLWtleS1kZXNjcmlwdGlvbi1mb250aWZpZWQga2V5KSkpKSkpCiAg ICAgICAgICAgICAgICA7OyAxRC4gXHtmb299IGlzIHJlcGxhY2VkIHdpdGggYSBzdW1tYXJ5IG9m IHRoZSBrZXltYXAKICAgICAgICAgICAgICAgIDs7ICAgICAgICAgICAgKHN5bWJvbC12YWx1ZSBm b28pLgogICAgICAgICAgICAgICAgOzsgICAgIFw8Zm9vPiBqdXN0IHNldHMgdGhlIGtleW1hcCB1 c2VkIGZvciBcW2NtZF0uCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvaGVscC10ZXN0cy5lbCBiL3Rl c3QvbGlzcC9oZWxwLXRlc3RzLmVsCmluZGV4IGIyZmVjNWMxYmQuLjA5YWMwMWVlNjQgMTAwNjQ0 Ci0tLSBhL3Rlc3QvbGlzcC9oZWxwLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9oZWxwLXRlc3Rz LmVsCkBAIC04OCw2ICs4OCwyMCBAQCBoZWxwLXRlc3RzLXN1YnN0aXR1dGUtY29tbWFuZC1rZXlz L2NvbW1hbmRzCiAgICAodGVzdCAiXFxbZW1hY3MtdmVyc2lvbl1cXFtuZXh0LWxpbmVdIiAiTS14 IGVtYWNzLXZlcnNpb25DLW4iKQogICAgKHRlc3QtcmUgIlxcW2VtYWNzLXZlcnNpb25dYGZvbyci ICJNLXggZW1hY3MtdmVyc2lvbltgJ+KAmF1mb29bJ+KAmV0iKSkpCiAKKyhlcnQtZGVmdGVzdCBo ZWxwLXRlc3RzLXN1YnN0aXR1dGUtY29tbWFuZC1rZXlzL2xpdGVyYWwta2V5YmluZGluZyAoKQor ICAiTGl0ZXJhbCByZXBsYWNlbWVudC4iCisgICh3aXRoLXN1YnN0aXR1dGUtY29tbWFuZC1rZXlz LXRlc3QKKyAgICh0ZXN0ICJcXFs9Qy1tXSIgIkMtbSIpCisgICAodGVzdCAiXFxbPUMtbV1cXFs9 Qy1qXSIgIkMtbUMtaiIpCisgICAodGVzdCAiZm9vXFxbPUMtbV1iYXJcXFs9Qy1qXWJheiIgImZv b0MtbWJhckMtamJheiIpKSkKKworKGVydC1kZWZ0ZXN0IGhlbHAtdGVzdHMtc3Vic3RpdHV0ZS1r ZXktYmluZGluZ3MvZmFjZS1oZWxwLWtleS1iaW5kaW5nICgpCisgIChzaG91bGQgKGVxIChnZXQt dGV4dC1wcm9wZXJ0eSAwICdmYWNlIChzdWJzdGl0dXRlLWNvbW1hbmQta2V5cyAiXFxbbmV4dC1s aW5lXSIpKQorICAgICAgICAgICAgICAnaGVscC1rZXktYmluZGluZykpCisgIChzaG91bGQgKGVx IChnZXQtdGV4dC1wcm9wZXJ0eSAwICdmYWNlIChzdWJzdGl0dXRlLWNvbW1hbmQta2V5cyAiXFxb PWZdIikpCisgICAgICAgICAgICAgICdoZWxwLWtleS1iaW5kaW5nKSkpCisKKwogKGVydC1kZWZ0 ZXN0IGhlbHAtdGVzdHMtc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMva2V5bWFwcyAoKQogICAod2l0 aC1zdWJzdGl0dXRlLWNvbW1hbmQta2V5cy10ZXN0CiAgICAodGVzdCAiXFx7bWluaWJ1ZmZlci1s b2NhbC1tdXN0LW1hdGNoLW1hcH0iCi0tIAoyLjMwLjEKCg== --0000000000003dbe2205bd4526be Content-Type: text/x-diff; charset="US-ASCII"; name="0002-Use-substitute-command-keys-in-userlock.el.patch" Content-Disposition: attachment; filename="0002-Use-substitute-command-keys-in-userlock.el.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: d4971bb3d4c620a3_0.2 RnJvbSBmNWIzMmQ0NmNlOWIyOWQ2NWE4YmY1ZmVlNThlY2E1ZDY1ZWM0MzU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogVGh1LCAxMSBNYXIgMjAyMSAwNTozMjoyOSArMDEwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBV c2Ugc3Vic3RpdHV0ZS1jb21tYW5kLWtleXMgaW4gdXNlcmxvY2suZWwKCiogbGlzcC91c2VybG9j ay5lbCAodXNlcmxvY2stLWZvbnRpZnkta2V5KTogUmVtb3ZlIGZ1bmN0aW9uLgooYXNrLXVzZXIt YWJvdXQtbG9jaywgYXNrLXVzZXItYWJvdXQtbG9jay1oZWxwKQooYXNrLXVzZXItYWJvdXQtc3Vw ZXJzZXNzaW9uLXRocmVhdCkKKGFzay11c2VyLWFib3V0LXN1cGVyc2Vzc2lvbi1oZWxwKTogVXNl IHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzLgotLS0KIGxpc3AvdXNlcmxvY2suZWwgfCA2NSArKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAyMyBpbnNlcnRpb25zKCspLCA0MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNw L3VzZXJsb2NrLmVsIGIvbGlzcC91c2VybG9jay5lbAppbmRleCA1NzMxMWFjOTljLi5mMGRiYmU3 YjRjIDEwMDY0NAotLS0gYS9saXNwL3VzZXJsb2NrLmVsCisrKyBiL2xpc3AvdXNlcmxvY2suZWwK QEAgLTM5LDEwICszOSw2IEBACiAKIChkZWZpbmUtZXJyb3IgJ2ZpbGUtbG9ja2VkICJGaWxlIGlz IGxvY2tlZCIgJ2ZpbGUtZXJyb3IpCiAKLShkZWZ1biB1c2VybG9jay0tZm9udGlmeS1rZXkgKGtl eSkKLSAgIkFkZCB0aGUgYGhlbHAta2V5LWJpbmRpbmcnIGZhY2UgdG8gc3RyaW5nIEtFWS4iCi0g IChwcm9wZXJ0aXplIGtleSAnZmFjZSAnaGVscC1rZXktYmluZGluZykpCi0KIDs7OyMjI2F1dG9s b2FkCiAoZGVmdW4gYXNrLXVzZXItYWJvdXQtbG9jayAoZmlsZSBvcHBvbmVudCkKICAgIkFzayB1 c2VyIHdoYXQgdG8gZG8gd2hlbiBoZSB3YW50cyB0byBlZGl0IEZJTEUgYnV0IGl0IGlzIGxvY2tl ZCBieSBPUFBPTkVOVC4KQEAgLTY4LDEyICs2NCw5IEBAIGFzay11c2VyLWFib3V0LWxvY2sKIAkJ CSAgKG1hdGNoLXN0cmluZyAwIG9wcG9uZW50KSkpCiAJICAgICAgb3Bwb25lbnQpKQogICAgICAg KHdoaWxlIChudWxsIGFuc3dlcikKLSAgICAgICAgKG1lc3NhZ2UgIiVzIGxvY2tlZCBieSAlczog KCVzLCAlcywgJXMsICVzKT8gIgotICAgICAgICAgICAgICAgICBzaG9ydC1maWxlIHNob3J0LW9w cG9uZW50Ci0gICAgICAgICAgICAgICAgICh1c2VybG9jay0tZm9udGlmeS1rZXkgInMiKQotICAg ICAgICAgICAgICAgICAodXNlcmxvY2stLWZvbnRpZnkta2V5ICJxIikKLSAgICAgICAgICAgICAg ICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAicCIpCi0gICAgICAgICAgICAgICAgICh1c2VybG9j ay0tZm9udGlmeS1rZXkgIj8iKSkKKyAgICAgICAgKG1lc3NhZ2UgKHN1YnN0aXR1dGUtY29tbWFu ZC1rZXlzCisgICAgICAgICAgICAgICAgICAiJXMgbG9ja2VkIGJ5ICVzOiAoXFxbPXNdLCBcXFs9 cV0sIFxcWz1wXSwgXFxbPT9dKT8gIikKKyAgICAgICAgICAgICAgICAgc2hvcnQtZmlsZSBzaG9y dC1vcHBvbmVudCkKIAkoaWYgbm9uaW50ZXJhY3RpdmUgKGVycm9yICJDYW5ub3QgcmVzb2x2ZSBs b2NrIGNvbmZsaWN0IGluIGJhdGNoIG1vZGUiKSkKIAkobGV0ICgodGVtIChsZXQgKChpbmhpYml0 LXF1aXQgdCkKIAkJCSAoY3Vyc29yLWluLWVjaG8tYXJlYSB0KSkKQEAgLTg4LDEyICs4MSw5IEBA IGFzay11c2VyLWFib3V0LWxvY2sKIAkJCQkgICAgICAoPz8gLiBoZWxwKSkpKQogCSAgICAoY29u ZCAoKG51bGwgYW5zd2VyKQogCQkgICAoYmVlcCkKLSAgICAgICAgICAgICAgICAgICAobWVzc2Fn ZSAiUGxlYXNlIHR5cGUgJXMsICVzLCBvciAlczsgb3IgJXMgZm9yIGhlbHAiCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAicSIpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAicyIpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAicCIpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgOzsgRklYTUU6IFdoeSBkbyB3ZSB1c2UgIj8iIGhlcmUgYW5kICJD LWgiIGJlbG93PwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICh1c2VybG9jay0tZm9udGlm eS1rZXkgIj8iKSkKKyAgICAgICAgICAgICAgICAgICA7OyBGSVhNRTogV2h5IGRvIHdlIHVzZSAi PyIgaGVyZSBhbmQgIkMtaCIgYmVsb3c/CisgICAgICAgICAgICAgICAgICAgKG1lc3NhZ2UgKHN1 YnN0aXR1dGUtY29tbWFuZC1rZXlzCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJQbGVh c2UgdHlwZSBcXFs9cV0sIFxcWz1zXSwgb3IgXFxbPXBdOyBvciBcXFs9P10gZm9yIGhlbHAiKSkK IAkJICAgKHNpdC1mb3IgMykpCiAJCSAgKChlcSAoY2RyIGFuc3dlcikgJ2hlbHApCiAJCSAgIChh c2stdXNlci1hYm91dC1sb2NrLWhlbHApCkBAIC0xMDYsMTcgKzk2LDE0IEBAIGFzay11c2VyLWFi b3V0LWxvY2staGVscAogICAod2l0aC1vdXRwdXQtdG8tdGVtcC1idWZmZXIgIipIZWxwKiIKICAg ICAod2l0aC1jdXJyZW50LWJ1ZmZlciBzdGFuZGFyZC1vdXRwdXQKICAgICAgIChpbnNlcnQKLSAg ICAgICAoZm9ybWF0CisgICAgICAgKHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzCiAgICAgICAgICJJ dCBoYXMgYmVlbiBkZXRlY3RlZCB0aGF0IHlvdSB3YW50IHRvIG1vZGlmeSBhIGZpbGUgdGhhdCBz b21lb25lIGVsc2UgaGFzCiBhbHJlYWR5IHN0YXJ0ZWQgbW9kaWZ5aW5nIGluIEVtYWNzLgogCi1Z b3UgY2FuIDwlcz50ZWFsIHRoZSBmaWxlOyB0aGUgb3RoZXIgdXNlciBiZWNvbWVzIHRoZQorWW91 IGNhbiA8XFxbPXNdPnRlYWwgdGhlIGZpbGU7IHRoZSBvdGhlciB1c2VyIGJlY29tZXMgdGhlCiAg IGludHJ1ZGVyIGlmIChzKWhlIGV2ZXIgdW5tb2RpZmllcyB0aGUgZmlsZSBhbmQgdGhlbiBjaGFu Z2VzIGl0IGFnYWluLgotWW91IGNhbiA8JXM+cm9jZWVkOyB5b3UgZWRpdCBhdCB5b3VyIG93biAo YW5kIHRoZSBvdGhlciB1c2VyJ3MpIHJpc2suCi1Zb3UgY2FuIDwlcz51aXQ7IGRvbid0IG1vZGlm eSB0aGlzIGZpbGUuIgotICAgICAgICAodXNlcmxvY2stLWZvbnRpZnkta2V5ICJzIikKLSAgICAg ICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAicCIpCi0gICAgICAgICh1c2VybG9jay0tZm9udGlm eS1rZXkgInEiKSkpCitZb3UgY2FuIDxcXFs9cF0+cm9jZWVkOyB5b3UgZWRpdCBhdCB5b3VyIG93 biAoYW5kIHRoZSBvdGhlciB1c2VyJ3MpIHJpc2suCitZb3UgY2FuIDxcXFs9cV0+dWl0OyBkb24n dCBtb2RpZnkgdGhpcyBmaWxlLiIpKQogICAgICAgKGhlbHAtbW9kZSkpKSkKIAogKGRlZmluZS1l cnJvciAnZmlsZS1zdXBlcnNlc3Npb24gbmlsICdmaWxlLWVycm9yKQpAQCAtMTY4LDE0ICsxNTUs MTEgQEAgYXNrLXVzZXItYWJvdXQtc3VwZXJzZXNzaW9uLXRocmVhdAogICAoZGlzY2FyZC1pbnB1 dCkKICAgKHNhdmUtd2luZG93LWV4Y3Vyc2lvbgogICAgIChsZXQgKChwcm9tcHQKLQkgICAoZm9y bWF0ICIlcyBjaGFuZ2VkIG9uIGRpc2s7IFwKLXJlYWxseSBlZGl0IHRoZSBidWZmZXI/ICglcywg JXMsICVzIG9yICVzKSAiCi0gICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1ub25kaXJlY3Rv cnkgZmlsZW5hbWUpCi0gICAgICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAi eSIpCi0gICAgICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAibiIpCi0gICAg ICAgICAgICAgICAgICAgKHVzZXJsb2NrLS1mb250aWZ5LWtleSAiciIpCi0gICAgICAgICAgICAg ICAgICAgOzsgRklYTUU6IFdoeSBkbyB3ZSB1c2UgIkMtaCIgaGVyZSBhbmQgIj8iIGFib3ZlPwot ICAgICAgICAgICAgICAgICAgICh1c2VybG9jay0tZm9udGlmeS1rZXkgIkMtaCIpKSkKKyAgICAg ICAgICAgOzsgRklYTUU6IFdoeSBkbyB3ZSB1c2UgIkMtaCIgaGVyZSBhbmQgIj8iIGFib3ZlPwor ICAgICAgICAgICAoZm9ybWF0IChzdWJzdGl0dXRlLWNvbW1hbmQta2V5cworICAgICAgICAgICAg ICAgICAgICAiJXMgY2hhbmdlZCBvbiBkaXNrOyBcCityZWFsbHkgZWRpdCB0aGUgYnVmZmVyPyAo XFxbPXldLCBcXFs9bl0sIFxcWz1yXSBvciBcXFs9Qy1oXSkgIikKKyAgICAgICAgICAgICAgICAg ICAoZmlsZS1uYW1lLW5vbmRpcmVjdG9yeSBmaWxlbmFtZSkpKQogCSAgKGNob2ljZXMgJyg/eSA/ biA/ciA/PyA/XEMtaCkpCiAJICBhbnN3ZXIpCiAgICAgICAod2hlbiBub25pbnRlcmFjdGl2ZQpA QCAtMjA2LDIxICsxOTAsMTggQEAgYXNrLXVzZXItYWJvdXQtc3VwZXJzZXNzaW9uLWhlbHAKICAg ICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIHN0YW5kYXJkLW91dHB1dAogICAgICAgICAoaW5zZXJ0 CiAgICAgICAgICAoZm9ybWF0Ci0gICAgICAgICAgIllvdSB3YW50IHRvIG1vZGlmeSBhIGJ1ZmZl ciB3aG9zZSBkaXNrIGZpbGUgaGFzIGNoYW5nZWQKKyAgICAgICAgICAoc3Vic3RpdHV0ZS1jb21t YW5kLWtleXMKKyAgICAgICAgICAgIllvdSB3YW50IHRvIG1vZGlmeSBhIGJ1ZmZlciB3aG9zZSBk aXNrIGZpbGUgaGFzIGNoYW5nZWQKIHNpbmNlIHlvdSBsYXN0IHJlYWQgaXQgaW4gb3Igc2F2ZWQg aXQgd2l0aCB0aGlzIGJ1ZmZlci4KIAotSWYgeW91IHNheSAlcyB0byBnbyBhaGVhZCBhbmQgbW9k aWZ5IHRoaXMgYnVmZmVyLAorSWYgeW91IHNheSBcXFs9eV0gdG8gZ28gYWhlYWQgYW5kIG1vZGlm eSB0aGlzIGJ1ZmZlciwKIHlvdSByaXNrIHJ1aW5pbmcgdGhlIHdvcmsgb2Ygd2hvZXZlciByZXdy b3RlIHRoZSBmaWxlLgotSWYgeW91IHNheSAlcyB0byByZXZlcnQsIHRoZSBjb250ZW50cyBvZiB0 aGUgYnVmZmVyIGFyZSByZWZyZXNoZWQKK0lmIHlvdSBzYXkgXFxbPXJdIHRvIHJldmVydCwgdGhl IGNvbnRlbnRzIG9mIHRoZSBidWZmZXIgYXJlIHJlZnJlc2hlZAogZnJvbSB0aGUgZmlsZSBvbiBk aXNrLgotSWYgeW91IHNheSAlcywgdGhlIGNoYW5nZSB5b3Ugc3RhcnRlZCB0byBtYWtlIHdpbGwg YmUgYWJvcnRlZC4KLQotVXN1YWxseSwgeW91IHNob3VsZCB0eXBlICVzIGFuZCB0aGVuICVzLAot dG8gZ2V0IHRoZSBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgZmlsZSwgdGhlbiBtYWtlIHRoZSBjaGFu Z2UgYWdhaW4uIgotICAgICAgICAgICh1c2VybG9jay0tZm9udGlmeS1rZXkgInkiKQotICAgICAg ICAgICh1c2VybG9jay0tZm9udGlmeS1rZXkgInIiKQotICAgICAgICAgICh1c2VybG9jay0tZm9u dGlmeS1rZXkgIm4iKQotICAgICAgICAgICh1c2VybG9jay0tZm9udGlmeS1rZXkgIm4iKQorSWYg eW91IHNheSBcXFs9bl0sIHRoZSBjaGFuZ2UgeW91IHN0YXJ0ZWQgdG8gbWFrZSB3aWxsIGJlIGFi b3J0ZWQuCisKK1VzdWFsbHksIHlvdSBzaG91bGQgdHlwZSBcXFs9bl0gYW5kIHRoZW4gXFxbPU0t eCByZXZlcnQtYnVmZmVyXSAob3IgJXMpLAordG8gZ2V0IHRoZSBsYXRlc3QgdmVyc2lvbiBvZiB0 aGUgZmlsZSwgdGhlbiBtYWtlIHRoZSBjaGFuZ2UgYWdhaW4uIikKICAgICAgICAgICByZXZlcnQt YnVmZmVyLWJpbmRpbmcpKQogICAgICAgICAoaGVscC1tb2RlKSkpKSkKIAotLSAKMi4zMC4xCgo= --0000000000003dbe2205bd4526be--