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.bugs Subject: bug#46627: [PATCH] Add new help command 'describe-command' Date: Sat, 20 Feb 2021 11:10:28 -0600 Message-ID: References: <835z2o4fes.fsf@gnu.org> <83pn0v257d.fsf@gnu.org> <83eehb17ag.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="00000000000043c57305bbc7a51d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22533"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 46627@debbugs.gnu.org To: Eli Zaretskii , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Feb 20 18:11:16 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 1lDVmm-0005kK-3A for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 20 Feb 2021 18:11:16 +0100 Original-Received: from localhost ([::1]:35494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDVmk-0000Xh-Ej for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 20 Feb 2021 12:11:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDVmY-0000XH-C7 for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2021 12:11:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDVmY-000210-3c for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2021 12:11:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDVmX-0006oT-Ug for bug-gnu-emacs@gnu.org; Sat, 20 Feb 2021 12:11:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 20 Feb 2021 17:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46627 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 46627-submit@debbugs.gnu.org id=B46627.161384103926155 (code B ref 46627); Sat, 20 Feb 2021 17:11:01 +0000 Original-Received: (at 46627) by debbugs.gnu.org; 20 Feb 2021 17:10:39 +0000 Original-Received: from localhost ([127.0.0.1]:52734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDVmA-0006nm-PX for submit@debbugs.gnu.org; Sat, 20 Feb 2021 12:10:39 -0500 Original-Received: from mail-pg1-f176.google.com ([209.85.215.176]:40161) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDVm6-0006nT-Qg for 46627@debbugs.gnu.org; Sat, 20 Feb 2021 12:10:38 -0500 Original-Received: by mail-pg1-f176.google.com with SMTP id b21so7396055pgk.7 for <46627@debbugs.gnu.org>; Sat, 20 Feb 2021 09:10:34 -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=GCdkgfJHVmkbxqWuKptDS90K/3rmfj1sQYKfIMknFmM=; b=TwuackxsseJTVYHW4GHapoBdLyQPqiUYt+p73gTpxPehrOeU/QsXzHtbVjxWTzst8R e9TaNG0b/uezKTnqidfFb3uQVU7E5u0Tnm8Qr5rbkwmIgjvd3bZcCa2Gq/5eN6Vk8G4u kS4DH0m8pO5HcIVMP5b2qsd+6f6TTqsSaMvZYylLAdgEwUYBVc3D4HaNsYVPkhwlJE6S rcDPaP7J6Sak5fUEg5J7IO8JD1iORiC95xKOrUu9Iy/ThdZfMLiq5bqKBj7LKCkB1xNp XmqLlOyISioYuT77O9R2Jhk4nkN+NiJqFby/ZYVjD7POq4JbzP/eOijrF2QEuIvb77zO 9chw== X-Gm-Message-State: AOAM5322VdUyrp6JIqJ8GLefUHJeZfm1u/dqzh4sHsJFrEk4UHncmR4d ulHic0Bj4Zn5P/T7SzyDS0yoWQ2oyOfka1ez1x8= X-Google-Smtp-Source: ABdhPJxg7tsy32Cdib/28n6qOdiapDPWiCqnN9eaHO4e6mNiIqEtZUpsEFdKWE5ESQjxpMN+s9BVBjVjBSqiufCNJAA= X-Received: by 2002:a63:ed02:: with SMTP id d2mr13523029pgi.67.1613841029112; Sat, 20 Feb 2021 09:10:29 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 20 Feb 2021 11:10:28 -0600 In-Reply-To: <83eehb17ag.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" Xref: news.gmane.io gmane.emacs.bugs:200448 Archived-At: --00000000000043c57305bbc7a51d Content-Type: text/plain; charset="UTF-8" Eli Zaretskii writes: > The way to wrap it is like this: > > @w{@kbd{C-h f make-vector @key{RET}}} > > Is this what you tried? If so, how did it not work? Sorry, I misunderstood. OK, so I've added that, and it works. I also fixed an incorrect line break in another place by adding @w{..}. > I'd prefer: > > 1. You didn't specify a command's symbol > 2. Symbol is not a command: %s Changed in the attached. >> Should the more technical explanations therefore stay? > > If it's 110% impossible to trigger those messages, they can go, of > course. The question is: can some completion trickery cause > completing-read return with a value that is either not a symbol or a > symbol whose function definition is void? I'm also worried about third-party code calling in. Perhaps we should better leave it, as it can't hurt. >> ->> Try typing C-h f previous-line . >> +>> Try typing C-h x previous-line . >> This displays all the information Emacs has about the >> function which implements the C-p command. > > Perhaps the text here should be amended not to mention "function". Hmm. OTOH, it is kind of nice to read that explanation as the first thing you'll see is something like: (next-line &optional ARG TRY-VSCROLL) So the user will worry less if she has first seen that explanation, maybe? I've attached an updated patch. --00000000000043c57305bbc7a51d Content-Type: text/x-diff; charset="US-ASCII"; name="0001-Add-new-help-command-describe-command.patch" Content-Disposition: attachment; filename="0001-Add-new-help-command-describe-command.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 79eba227b7f9225a_0.1 RnJvbSAwNTQ2NjZmMWIzZThlNmFhODc0YzViZjFiZGQyMWE3MGIzM2JhNTkwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogRnJpLCAxOSBGZWIgMjAyMSAxODoyMToyMyArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBu ZXcgaGVscCBjb21tYW5kICdkZXNjcmliZS1jb21tYW5kJwoKKiBsaXNwL2hlbHAtZm5zLmVsIChk ZXNjcmliZS1jb21tYW5kKTogTmV3IGNvbW1hbmQuCihoZWxwLWZucy0tZGVzY3JpYmUtZnVuY3Rp b24tb3ItY29tbWFuZC1wcm9tcHQpOiBOZXcgaGVscGVyCmZ1bmN0aW9uIHRvIHByb21wdCBmb3Ig YSBmdW5jdGlvbiBvciBmdW5jdGlvbi4gIChCdWcjNDY2MjcpCihkZXNjcmliZS1mdW5jdGlvbik6 IFVzZSBhYm92ZSBuZXcgaGVscGVyIGZ1bmN0aW9uLgoKKiBsaXNwL2hlbHAuZWwgKGhlbHAtbWFw KTogQmluZCBhYm92ZSBuZXcgY29tbWFuZCB0byBgQy1oIHgnLgooaGVscC1mb3ItaGVscC1pbnRl cm5hbCk6IEFkZCB0aGlzIG5ldyBiaW5kaW5nIHRvIHRoZSBoZWxwIHN1bW1hcnkuCiogbGlzcC9t ZW51LWJhci5lbCAobWVudS1iYXItZGVzY3JpYmUtbWVudSk6IEFkZCB0aGUgbmV3IGNvbW1hbmQg dG8KdGhlIGhlbHAgbWVudS4KCiogZG9jL2VtYWNzL2hlbHAudGV4aSAoSGVscCBTdW1tYXJ5LCBO YW1lIEhlbHApOiBEb2N1bWVudAonZGVzY3JpYmUtZnVuY3Rpb24nLCBhbmQgdXBkYXRlIGRvY3Vt ZW50YXRpb24gb24gJ2Rlc2NyaWJlLWNvbW1hbmQnLgoqIGV0Yy90dXRvcmlhbHMvVFVUT1JJQUw6 IENoYW5nZSByZWZlcmVuY2UgZnJvbSAnZGVzY3JpYmUtZnVuY3Rpb24nIHRvCidkZXNjcmliZS1j b21tYW5kJy4KLS0tCiBkb2MvZW1hY3MvaGVscC50ZXhpICAgIHwgNDMgKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgfCAgNCArKysKIGV0Yy90dXRv cmlhbHMvVFVUT1JJQUwgfCAgNiArKy0tCiBsaXNwL2hlbHAtZm5zLmVsICAgICAgIHwgNjIgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBsaXNwL2hlbHAuZWwgICAg ICAgICAgIHwgIDQgKystCiBsaXNwL21lbnUtYmFyLmVsICAgICAgIHwgIDMgKysKIDYgZmlsZXMg Y2hhbmdlZCwgODAgaW5zZXJ0aW9ucygrKSwgNDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZG9jL2VtYWNzL2hlbHAudGV4aSBiL2RvYy9lbWFjcy9oZWxwLnRleGkKaW5kZXggODFjZGViNGJl NS4uOTBhMmRkYzgwOSAxMDA2NDQKLS0tIGEvZG9jL2VtYWNzL2hlbHAudGV4aQorKysgYi9kb2Mv ZW1hY3MvaGVscC50ZXhpCkBAIC0xMDcsOCArMTA3LDggQEAgSGVscCBTdW1tYXJ5CiAoQGNvZGV7 dmlldy1lY2hvLWFyZWEtbWVzc2FnZXN9KS4gIEB4cmVme01pc2MgSGVscH0uCiBAaXRlbSBDLWgg ZiBAdmFye2Z1bmN0aW9ufSBAa2V5e1JFVH0KIERpc3BsYXkgZG9jdW1lbnRhdGlvbiBvbiB0aGUg TGlzcCBmdW5jdGlvbiBuYW1lZCBAdmFye2Z1bmN0aW9ufQotKEBjb2Rle2Rlc2NyaWJlLWZ1bmN0 aW9ufSkuICBTaW5jZSBjb21tYW5kcyBhcmUgTGlzcCBmdW5jdGlvbnMsCi10aGlzIHdvcmtzIGZv ciBjb21tYW5kcyB0b28uICBAeHJlZntOYW1lIEhlbHB9LgorKEBjb2Rle2Rlc2NyaWJlLWZ1bmN0 aW9ufSkuICBTaW5jZSBjb21tYW5kcyBhcmUgTGlzcCBmdW5jdGlvbnMsIHRoaXMKK3dvcmtzIGZv ciBjb21tYW5kcyB0b28sIGJ1dCB5b3UgY2FuIGFsc28gdXNlIEBjb2Rle0MtaCB4fS4gIEB4cmVm e05hbWUgSGVscH0uCiBAaXRlbSBDLWggaAogRGlzcGxheSB0aGUgQGZpbGV7SEVMTE99IGZpbGUs IHdoaWNoIHNob3dzIGV4YW1wbGVzIG9mIHZhcmlvdXMgY2hhcmFjdGVyCiBzZXRzLgpAQCAtMTU0 LDYgKzE1NCw5IEBAIEhlbHAgU3VtbWFyeQogQGl0ZW0gQy1oIHcgQHZhcntjb21tYW5kfSBAa2V5 e1JFVH0KIFNob3cgd2hpY2gga2V5cyBydW4gdGhlIGNvbW1hbmQgbmFtZWQgQHZhcntjb21tYW5k fSAoQGNvZGV7d2hlcmUtaXN9KS4KIEB4cmVme0tleSBIZWxwfS4KK0BpdGVtIEMtaCB4IEB2YXJ7 Y29tbWFuZH0gQGtleXtSRVR9CitEaXNwbGF5IGRvY3VtZW50YXRpb24gb24gdGhlIG5hbWVkIEB2 YXJ7Y29tbWFuZH0KKyhAY29kZXtkZXNjcmliZS1jb21tYW5kfSkuICBAeHJlZntOYW1lIEhlbHB9 LgogQGl0ZW0gQy1oIEMgQHZhcntjb2Rpbmd9IEBrZXl7UkVUfQogRGVzY3JpYmUgdGhlIGNvZGlu ZyBzeXN0ZW0gQHZhcntjb2Rpbmd9CiAoQGNvZGV7ZGVzY3JpYmUtY29kaW5nLXN5c3RlbX0pLiAg QHhyZWZ7Q29kaW5nIFN5c3RlbXN9LgpAQCAtMjMzLDMxICsyMzYsMzEgQEAgS2V5IEhlbHAKIEBu b2RlIE5hbWUgSGVscAogQHNlY3Rpb24gSGVscCBieSBDb21tYW5kIG9yIFZhcmlhYmxlIE5hbWUK IAotQGtpbmRleCBDLWggZgotQGZpbmRleCBkZXNjcmliZS1mdW5jdGlvbgotICBAa2Jke0MtaCBm IEB2YXJ7ZnVuY3Rpb259IEBrZXl7UkVUfX0gKEBjb2Rle2Rlc2NyaWJlLWZ1bmN0aW9ufSkKLWRp c3BsYXlzIHRoZSBkb2N1bWVudGF0aW9uIG9mIExpc3AgZnVuY3Rpb24gQHZhcntmdW5jdGlvbn0s IGluIGEKLXdpbmRvdy4gIFNpbmNlIGNvbW1hbmRzIGFyZSBMaXNwIGZ1bmN0aW9ucywgeW91IGNh biB1c2UgdGhpcyBtZXRob2QgdG8KLXZpZXcgdGhlIGRvY3VtZW50YXRpb24gb2YgYW55IGNvbW1h bmQgd2hvc2UgbmFtZSB5b3Uga25vdy4gIEZvcgotZXhhbXBsZSwKK0BraW5kZXggQy1oIHgKK0Bm aW5kZXggZGVzY3JpYmUtY29tbWFuZAorICBAa2Jke0MtaCB4IEB2YXJ7Y29tbWFuZH0gQGtleXtS RVR9fSAoQGNvZGV7ZGVzY3JpYmUtY29tbWFuZH0pCitkaXNwbGF5cyB0aGUgZG9jdW1lbnRhdGlv biBvZiB0aGUgbmFtZWQgQHZhcntjb21tYW5kfSwgaW4gYQord2luZG93LiAgRm9yIGV4YW1wbGUs CiAKIEBleGFtcGxlCi1DLWggZiBhdXRvLWZpbGwtbW9kZSBAa2V5e1JFVH0KK0MtaCB4IGF1dG8t ZmlsbC1tb2RlIEBrZXl7UkVUfQogQGVuZCBleGFtcGxlCiAKIEBub2luZGVudAotZGlzcGxheXMg dGhlIGRvY3VtZW50YXRpb24gb2YgQGNvZGV7YXV0by1maWxsLW1vZGV9LiAgVGhpcyBpcyB0aGUg b25seQotd2F5IHRvIGdldCB0aGUgZG9jdW1lbnRhdGlvbiBvZiBhIGNvbW1hbmQgdGhhdCBpcyBu b3QgYm91bmQgdG8gYW55IGtleQorZGlzcGxheXMgdGhlIGRvY3VtZW50YXRpb24gb2YgQGNvZGV7 YXV0by1maWxsLW1vZGV9LiAgVGhpcyBpcyBob3cgeW91Cit3b3VsZCBnZXQgdGhlIGRvY3VtZW50 YXRpb24gb2YgYSBjb21tYW5kIHRoYXQgaXMgbm90IGJvdW5kIHRvIGFueSBrZXkKIChvbmUgd2hp Y2ggeW91IHdvdWxkIG5vcm1hbGx5IHJ1biB1c2luZyBAa2Jke00teH0pLgogCi0gIEBrYmR7Qy1o IGZ9IGlzIGFsc28gdXNlZnVsIGZvciBMaXNwIGZ1bmN0aW9ucyB0aGF0IHlvdSB1c2UgaW4gYSBM aXNwCi1wcm9ncmFtLiAgRm9yIGV4YW1wbGUsIGlmIHlvdSBoYXZlIGp1c3Qgd3JpdHRlbiB0aGUg ZXhwcmVzc2lvbgorQGtpbmRleCBDLWggZgorQGZpbmRleCBkZXNjcmliZS1mdW5jdGlvbgorICBA a2Jke0MtaCBmIEB2YXJ7ZnVuY3Rpb259IEBrZXl7UkVUfX0gKEBjb2Rle2Rlc2NyaWJlLWZ1bmN0 aW9ufSkKK2Rpc3BsYXlzIHRoZSBkb2N1bWVudGF0aW9uIG9mIExpc3AgQHZhcntmdW5jdGlvbn0u ICBUaGlzIGNvbW1hbmQgaXMKK2ludGVuZGVkIGZvciBMaXNwIGZ1bmN0aW9ucyB0aGF0IHlvdSB1 c2UgaW4gYSBMaXNwIHByb2dyYW0uICBGb3IKK2V4YW1wbGUsIGlmIHlvdSBoYXZlIGp1c3Qgd3Jp dHRlbiB0aGUgZXhwcmVzc2lvbgogQGNvZGV7KG1ha2UtdmVjdG9yIGxlbil9IGFuZCB3YW50IHRv IGNoZWNrIHRoYXQgeW91IGFyZSB1c2luZwotQGNvZGV7bWFrZS12ZWN0b3J9IHByb3Blcmx5LCB0 eXBlIEBrYmR7Qy1oIGYgbWFrZS12ZWN0b3IgQGtleXtSRVR9fS4KLUJlY2F1c2UgQGtiZHtDLWgg Zn0gYWxsb3dzIGFsbCBmdW5jdGlvbiBuYW1lcywgbm90IGp1c3QgY29tbWFuZCBuYW1lcywKLXlv dSBtYXkgZmluZCB0aGF0IHNvbWUgb2YgeW91ciBmYXZvcml0ZSBjb21wbGV0aW9uIGFiYnJldmlh dGlvbnMgdGhhdAotd29yayBpbiBAa2Jke00teH0gZG9uJ3Qgd29yayBpbiBAa2Jke0MtaCBmfS4g IEFuIGFiYnJldmlhdGlvbiB0aGF0IGlzCi11bmlxdWUgYW1vbmcgY29tbWFuZCBuYW1lcyBtYXkg bm90IGJlIHVuaXF1ZSBhbW9uZyBhbGwgZnVuY3Rpb24gbmFtZXMuCitAY29kZXttYWtlLXZlY3Rv cn0gcHJvcGVybHksIHR5cGUgQHd7QGtiZHtDLWggZiBtYWtlLXZlY3RvciBAa2V5e1JFVH19fS4K K0FkZGl0aW9uYWxseSwgc2luY2UgYWxsIGNvbW1hbmRzIGFyZSBMaXNwIGZ1bmN0aW9ucywgeW91 IGNhbiBhbHNvIHVzZQordGhpcyBjb21tYW5kIHRvIHZpZXcgdGhlIGRvY3VtZW50YXRpb24gb2Yg YW55IGNvbW1hbmQuCiAKICAgSWYgeW91IHR5cGUgQGtiZHtDLWggZiBAa2V5e1JFVH19LCBpdCBk ZXNjcmliZXMgdGhlIGZ1bmN0aW9uIGNhbGxlZAogYnkgdGhlIGlubmVybW9zdCBMaXNwIGV4cHJl c3Npb24gaW4gdGhlIGJ1ZmZlciBhcm91bmQgcG9pbnQsCkBAIC0yNjUsNyArMjY4LDcgQEAgTmFt ZSBIZWxwCiAoVGhhdCBuYW1lIGFwcGVhcnMgYXMgdGhlIGRlZmF1bHQgd2hpbGUgeW91IGVudGVy IHRoZSBhcmd1bWVudC4pICBGb3IKIGV4YW1wbGUsIGlmIHBvaW50IGlzIGxvY2F0ZWQgZm9sbG93 aW5nIHRoZSB0ZXh0IEBzYW1weyhtYWtlLXZlY3RvcgogKGNhciB4KX0sIHRoZSBpbm5lcm1vc3Qg bGlzdCBjb250YWluaW5nIHBvaW50IGlzIHRoZSBvbmUgdGhhdCBzdGFydHMKLXdpdGggQHNhbXB7 KG1ha2UtdmVjdG9yfSwgc28gQGtiZHtDLWggZiBAa2V5e1JFVH19IGRlc2NyaWJlcyB0aGUKK3dp dGggQHNhbXB7KG1ha2UtdmVjdG9yfSwgc28gQHd7QGtiZHtDLWggZiBAa2V5e1JFVH19fSBkZXNj cmliZXMgdGhlCiBmdW5jdGlvbiBAY29kZXttYWtlLXZlY3Rvcn0uCiAKICAgQGtiZHtDLWggZn0g aXMgYWxzbyB1c2VmdWwganVzdCB0byB2ZXJpZnkgdGhhdCB5b3Ugc3BlbGxlZCBhCmRpZmYgLS1n aXQgYS9ldGMvTkVXUyBiL2V0Yy9ORVdTCmluZGV4IGM0ZjRjMWQ5ZDguLmZiNzAyZTY4NjIgMTAw NjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC04NjQsNiArODY0LDEwIEBAIHNr aXBwZWQuCiAtLS0KICoqKiAnZycgKCdyZXZlcnQtYnVmZmVyJykgaW4gJ2hlbHAtbW9kZScgbm8g bG9uZ2VyIHJlcXVpcmVzIGNvbmZpcm1hdGlvbi4KIAorKioqIE5ldyBjb21tYW5kICdkZXNjcmli ZS1jb21tYW5kJyBzaG93cyBoZWxwIGZvciBhIGNvbW1hbmQuCitUaGlzIGNhbiBiZSB1c2VkIGlu c3RlYWQgb2YgJ2Rlc2NyaWJlLWZ1bmN0aW9uJyB0aGF0IGRlc2NyaWJlcyBhbnkKK2Z1bmN0aW9u LiAgSXQgaXMgZ2xvYmFsbHkgYm91bmQgdG8gYEMtaCB4Jy4KKwogKysrCiAqKiogTmV3IGNvbW1h bmQgJ2Rlc2NyaWJlLWtleW1hcCcgZGVzY3JpYmVzIGtleWJpbmRpbmdzIGluIGEga2V5bWFwLgog CmRpZmYgLS1naXQgYS9ldGMvdHV0b3JpYWxzL1RVVE9SSUFMIGIvZXRjL3R1dG9yaWFscy9UVVRP UklBTAppbmRleCA2MTk0ZTU1ZWEzLi5kY2RiNjFmMjNlIDEwMDY0NAotLS0gYS9ldGMvdHV0b3Jp YWxzL1RVVE9SSUFMCisrKyBiL2V0Yy90dXRvcmlhbHMvVFVUT1JJQUwKQEAgLTEwMzgsMTAgKzEw MzgsMTAgQEAgdGhlbiB0eXBlIEMteCAxLgogCiBIZXJlIGFyZSBzb21lIG90aGVyIHVzZWZ1bCBD LWggb3B0aW9uczoKIAotICAgQy1oIGYJRGVzY3JpYmUgYSBmdW5jdGlvbi4gIFlvdSB0eXBlIGlu IHRoZSBuYW1lIG9mIHRoZQotCQlmdW5jdGlvbi4KKyAgIEMtaCB4CURlc2NyaWJlIGEgY29tbWFu ZC4gIFlvdSB0eXBlIGluIHRoZSBuYW1lIG9mIHRoZQorCQljb21tYW5kLgogCi0+PiBUcnkgdHlw aW5nIEMtaCBmIHByZXZpb3VzLWxpbmUgPFJldHVybj4uCis+PiBUcnkgdHlwaW5nIEMtaCB4IHBy ZXZpb3VzLWxpbmUgPFJldHVybj4uCiAgICBUaGlzIGRpc3BsYXlzIGFsbCB0aGUgaW5mb3JtYXRp b24gRW1hY3MgaGFzIGFib3V0IHRoZQogICAgZnVuY3Rpb24gd2hpY2ggaW1wbGVtZW50cyB0aGUg Qy1wIGNvbW1hbmQuCiAKZGlmZiAtLWdpdCBhL2xpc3AvaGVscC1mbnMuZWwgYi9saXNwL2hlbHAt Zm5zLmVsCmluZGV4IGNlYjZiYzA5MDEuLmExNGRmOTAxM2EgMTAwNjQ0Ci0tLSBhL2xpc3AvaGVs cC1mbnMuZWwKKysrIGIvbGlzcC9oZWxwLWZucy5lbApAQCAtMTc0LDI2ICsxNzQsNDcgQEAgZGVz Y3JpYmUtZnVuY3Rpb24tb3JpZy1idWZmZXIKIEZ1bmN0aW9ucyBvbiBgaGVscC1mbnMtZGVzY3Jp YmUtZnVuY3Rpb24tZnVuY3Rpb25zJyBjYW4gdXNlIHRoaXMKIHRvIGdldCBidWZmZXItbG9jYWwg dmFsdWVzLiIpCiAKKyhkZWZ1biBoZWxwLWZucy0tZGVzY3JpYmUtZnVuY3Rpb24tb3ItY29tbWFu ZC1wcm9tcHQgKCZvcHRpb25hbCB3YW50LWNvbW1hbmQpCisgICJQcm9tcHQgZm9yIGEgZnVuY3Rp b24gZnJvbSBgZGVzY3JpYmUtZnVuY3Rpb24nIG9yIGBkZXNjcmliZS1jb21tYW5kJy4KK0lmIG9w dGlvbmFsIGFyZ3VtZW50IFdBTlQtQ09NTUFORCBpcyBub24tbmlsLCBwcm9tcHQgZm9yIGFuCitp bnRlcmFjdGl2ZSBjb21tYW5kLiIKKyAgKGxldCogKChmbiAoaWYgd2FudC1jb21tYW5kCisgICAg ICAgICAgICAgICAgIChjYWFyIGNvbW1hbmQtaGlzdG9yeSkKKyAgICAgICAgICAgICAgIChmdW5j dGlvbi1jYWxsZWQtYXQtcG9pbnQpKSkKKyAgICAgICAgIChwcm9tcHQgKGZvcm1hdC1wcm9tcHQg KGlmIHdhbnQtY29tbWFuZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkRl c2NyaWJlIGNvbW1hbmQiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkRlc2Ny aWJlIGZ1bmN0aW9uIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZm4pKQorICAg ICAgICAgKGVuYWJsZS1yZWN1cnNpdmUtbWluaWJ1ZmZlcnMgdCkKKyAgICAgICAgICh2YWwgKGNv bXBsZXRpbmctcmVhZAorICAgICAgICAgICAgICAgcHJvbXB0CisgICAgICAgICAgICAgICAjJ2hl bHAtLXN5bWJvbC1jb21wbGV0aW9uLXRhYmxlCisgICAgICAgICAgICAgICAobGFtYmRhIChmKSAo aWYgd2FudC1jb21tYW5kCisgICAgICAgICAgICAgICAgICAgICAgICAgIChjb21tYW5kcCBmKQor ICAgICAgICAgICAgICAgICAgICAgICAgKG9yIChmYm91bmRwIGYpIChnZXQgZiAnZnVuY3Rpb24t ZG9jdW1lbnRhdGlvbikpKSkKKyAgICAgICAgICAgICAgIHQgbmlsIG5pbAorICAgICAgICAgICAg ICAgKGFuZCBmbiAoc3ltYm9sLW5hbWUgZm4pKSkpKQorICAgICh1bmxlc3MgKGVxdWFsIHZhbCAi IikKKyAgICAgIChzZXRxIGZuIChpbnRlcm4gdmFsKSkpCisgICAgOzsgVGhlc2UgZXJyb3IgbWVz c2FnZXMgYXJlIGludGVuZGVkIHRvIGJlIGxlc3MgdGVjaG5pY2FsIGZvciB0aGUKKyAgICA7OyBg ZGVzY3JpYmUtY29tbWFuZCcgY2FzZSwgYXMgdGhleSBhcmUgZGlyZWN0ZWQgYXQgdXNlcnMgdGhh dCBhcmUKKyAgICA7OyBub3QgbmVjZXNzYXJpbHkgRUxpc3AgcHJvZ3JhbW1lcnMuCisgICAgKHVu bGVzcyAoYW5kIGZuIChzeW1ib2xwIGZuKSkKKyAgICAgICh1c2VyLWVycm9yIChpZiB3YW50LWNv bW1hbmQKKyAgICAgICAgICAgICAgICAgICAgICAiWW91IGRpZG4ndCBzcGVjaWZ5IGEgY29tbWFu ZCdzIHN5bWJvbCIKKyAgICAgICAgICAgICAgICAgICAgIllvdSBkaWRuJ3Qgc3BlY2lmeSBhIGZ1 bmN0aW9uIHN5bWJvbCIpKSkKKyAgICAodW5sZXNzIChvciAoZmJvdW5kcCBmbikgKGdldCBmbiAn ZnVuY3Rpb24tZG9jdW1lbnRhdGlvbikpCisgICAgICAodXNlci1lcnJvciAoaWYgd2FudC1jb21t YW5kCisgICAgICAgICAgICAgICAgICAgICAgIlN5bWJvbCBpcyBub3QgYSBjb21tYW5kOiAlcyIK KyAgICAgICAgICAgICAgICAgICAgIlN5bWJvbCdzIGZ1bmN0aW9uIGRlZmluaXRpb24gaXMgdm9p ZDogJXMiKQorICAgICAgICAgICAgICAgICAgZm4pKQorICAgIChsaXN0IGZuKSkpCisKIDs7OyMj I2F1dG9sb2FkCiAoZGVmdW4gZGVzY3JpYmUtZnVuY3Rpb24gKGZ1bmN0aW9uKQogICAiRGlzcGxh eSB0aGUgZnVsbCBkb2N1bWVudGF0aW9uIG9mIEZVTkNUSU9OIChhIHN5bWJvbCkuCiBXaGVuIGNh bGxlZCBmcm9tIGxpc3AsIEZVTkNUSU9OIG1heSBhbHNvIGJlIGEgZnVuY3Rpb24gb2JqZWN0LiIK LSAgKGludGVyYWN0aXZlCi0gICAobGV0KiAoKGZuIChmdW5jdGlvbi1jYWxsZWQtYXQtcG9pbnQp KQotICAgICAgICAgIChlbmFibGUtcmVjdXJzaXZlLW1pbmlidWZmZXJzIHQpCi0gICAgICAgICAg KHZhbCAoY29tcGxldGluZy1yZWFkCi0gICAgICAgICAgICAgICAgKGZvcm1hdC1wcm9tcHQgIkRl c2NyaWJlIGZ1bmN0aW9uIiBmbikKLSAgICAgICAgICAgICAgICAjJ2hlbHAtLXN5bWJvbC1jb21w bGV0aW9uLXRhYmxlCi0gICAgICAgICAgICAgICAgKGxhbWJkYSAoZikgKG9yIChmYm91bmRwIGYp IChnZXQgZiAnZnVuY3Rpb24tZG9jdW1lbnRhdGlvbikpKQotICAgICAgICAgICAgICAgIHQgbmls IG5pbAotICAgICAgICAgICAgICAgIChhbmQgZm4gKHN5bWJvbC1uYW1lIGZuKSkpKSkKLSAgICAg KHVubGVzcyAoZXF1YWwgdmFsICIiKQotICAgICAgIChzZXRxIGZuIChpbnRlcm4gdmFsKSkpCi0g ICAgICh1bmxlc3MgKGFuZCBmbiAoc3ltYm9scCBmbikpCi0gICAgICAgKHVzZXItZXJyb3IgIllv dSBkaWRuJ3Qgc3BlY2lmeSBhIGZ1bmN0aW9uIHN5bWJvbCIpKQotICAgICAodW5sZXNzIChvciAo ZmJvdW5kcCBmbikgKGdldCBmbiAnZnVuY3Rpb24tZG9jdW1lbnRhdGlvbikpCi0gICAgICAgKHVz ZXItZXJyb3IgIlN5bWJvbCdzIGZ1bmN0aW9uIGRlZmluaXRpb24gaXMgdm9pZDogJXMiIGZuKSkK LSAgICAgKGxpc3QgZm4pKSkKKyAgKGludGVyYWN0aXZlIChoZWxwLWZucy0tZGVzY3JpYmUtZnVu Y3Rpb24tb3ItY29tbWFuZC1wcm9tcHQpKQogCiAgIDs7IFdlIHNhdmUgZGVzY3JpYmUtZnVuY3Rp b24tb3JpZy1idWZmZXIgb24gdGhlIGhlbHAgeHJlZiBzdGFjaywgc28KICAgOzsgaXQgaXMgcmVz dG9yZWQgYnkgdGhlIGJhY2svZm9yd2FyZCBidXR0b25zLiAgJ2hlbHAtYnVmZmVyJwpAQCAtMjIz LDkgKzI0NCwxNCBAQCBkZXNjcmliZS1mdW5jdGlvbgogICAgICAgICAoZGVzY3JpYmUtZnVuY3Rp b24tMSBmdW5jdGlvbikKICAgICAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgc3RhbmRhcmQtb3V0 cHV0CiAgICAgICAgICAgOzsgUmV0dXJuIHRoZSB0ZXh0IHdlIGRpc3BsYXllZC4KLSAgICAgICAg ICAoYnVmZmVyLXN0cmluZykpKSkKLSAgICApKQorICAgICAgICAgIChidWZmZXItc3RyaW5nKSkp KSkpCiAKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gZGVzY3JpYmUtY29tbWFuZCAoY29tbWFuZCkK KyAgIkRpc3BsYXkgdGhlIGZ1bGwgZG9jdW1lbnRhdGlvbiBvZiBDT01NQU5EIChhIHN5bWJvbCku CitXaGVuIGNhbGxlZCBmcm9tIGxpc3AsIENPTU1BTkQgbWF5IGFsc28gYmUgYSBmdW5jdGlvbiBv YmplY3QuIgorICAoaW50ZXJhY3RpdmUgKGhlbHAtZm5zLS1kZXNjcmliZS1mdW5jdGlvbi1vci1j b21tYW5kLXByb21wdCAnaXMtY29tbWFuZCkpCisgIChkZXNjcmliZS1mdW5jdGlvbiBjb21tYW5k KSkKIAogOzsgQ291bGQgYmUgdGhpcywgaWYgd2UgbWFrZSBzeW1ib2wtZmlsZSBkbyB0aGUgd29y ayBiZWxvdy4KIDs7IChkZWZ1biBoZWxwLUMtZmlsZS1uYW1lIChzdWJyLW9yLXZhciBraW5kKQpk aWZmIC0tZ2l0IGEvbGlzcC9oZWxwLmVsIGIvbGlzcC9oZWxwLmVsCmluZGV4IDA4NGU5NDE1NDku LmRhZWNhMmI0MDYgMTAwNjQ0Ci0tLSBhL2xpc3AvaGVscC5lbAorKysgYi9saXNwL2hlbHAuZWwK QEAgLTEwNiw2ICsxMDYsNyBAQCBoZWxwLW1hcAogICAgIChkZWZpbmUta2V5IG1hcCAidCIgJ2hl bHAtd2l0aC10dXRvcmlhbCkKICAgICAoZGVmaW5lLWtleSBtYXAgInciICd3aGVyZS1pcykKICAg ICAoZGVmaW5lLWtleSBtYXAgInYiICdkZXNjcmliZS12YXJpYWJsZSkKKyAgICAoZGVmaW5lLWtl eSBtYXAgIngiICdkZXNjcmliZS1jb21tYW5kKQogICAgIChkZWZpbmUta2V5IG1hcCAicSIgJ2hl bHAtcXVpdCkKICAgICBtYXApCiAgICJLZXltYXAgZm9yIGNoYXJhY3RlcnMgZm9sbG93aW5nIHRo ZSBIZWxwIGtleS4iKQpAQCAtMTkyLDcgKzE5Myw3IEBAICdoZWxwCiAoZGVmYWxpYXMgJ2hlbHAt Zm9yLWhlbHAgJ2hlbHAtZm9yLWhlbHAtaW50ZXJuYWwpCiA7OyBJdCBjYW4ndCBmaW5kIHRoaXMs IGJ1dCBub2JvZHkgd2lsbCBsb29rLgogKG1ha2UtaGVscC1zY3JlZW4gaGVscC1mb3ItaGVscC1p bnRlcm5hbAotICAocHVyZWNvcHkgIlR5cGUgYSBoZWxwIG9wdGlvbjogW2FiY0NkZWZGZ2lJa0ts TG1ucHJzdHZ3Ll0gQy1bY2RlZm1ub3B0d10gb3IgPyIpCisgIChwdXJlY29weSAiVHlwZSBhIGhl bHAgb3B0aW9uOiBbYWJjQ2RlZkZnaUlrS2xMbW5wcnN0dnd4Ll0gQy1bY2RlZm1ub3B0d10gb3Ig PyIpCiAgIDs7IERvbid0IHB1cmVjb3B5IHRoaXMgb25lLCBiZWNhdXNlIGl0J3Mgbm90IGV2YWx1 YXRlZCAoaXQncwogICA7OyBkaXJlY3RseSB1c2VkIGFzIGEgZG9jc3RyaW5nIGluIGEgZnVuY3Rp b24gZGVmaW5pdGlvbiwgc28gaXQnbGwKICAgOzsgYmUgbW92ZWQgdG8gdGhlIERPQyBmaWxlIGFu eXdheTogbm8gbmVlZCBmb3IgcHVyZWNvcHlpbmcgaXQpLgpAQCAtMjMxLDYgKzIzMiw3IEBAICdo ZWxwLWZvci1oZWxwCiB0ICAgICAgICAgICBTdGFydCB0aGUgRW1hY3MgbGVhcm4tYnktZG9pbmcg dHV0b3JpYWwuCiB2IFZBUklBQkxFICBEaXNwbGF5IHRoZSBnaXZlbiB2YXJpYWJsZSdzIGRvY3Vt ZW50YXRpb24gYW5kIHZhbHVlLgogdyBDT01NQU5EICAgRGlzcGxheSB3aGljaCBrZXlzdHJva2Vz IGludm9rZSB0aGUgZ2l2ZW4gY29tbWFuZCAod2hlcmUtaXMpLgoreCBDT01NQU5EICAgRGlzcGxh eSBkb2N1bWVudGF0aW9uIGZvciB0aGUgZ2l2ZW4gY29tbWFuZC4KIC4gICAgICAgICAgIERpc3Bs YXkgYW55IGF2YWlsYWJsZSBsb2NhbCBoZWxwIGF0IHBvaW50IGluIHRoZSBlY2hvIGFyZWEuCiAK IEMtYSAgICAgICAgIEluZm9ybWF0aW9uIGFib3V0IEVtYWNzLgpkaWZmIC0tZ2l0IGEvbGlzcC9t ZW51LWJhci5lbCBiL2xpc3AvbWVudS1iYXIuZWwKaW5kZXggMTMzZGY2NWNiYy4uMGU2MzRjYzRh MCAxMDA2NDQKLS0tIGEvbGlzcC9tZW51LWJhci5lbAorKysgYi9saXNwL21lbnUtYmFyLmVsCkBA IC0xODgyLDYgKzE4ODIsOSBAQCBtZW51LWJhci1kZXNjcmliZS1tZW51CiAgICAgKGJpbmRpbmdz LS1kZWZpbmUta2V5IG1lbnUgW2Rlc2NyaWJlLWZ1bmN0aW9uXQogICAgICAgJyhtZW51LWl0ZW0g IkRlc2NyaWJlIEZ1bmN0aW9uLi4uIiBkZXNjcmliZS1mdW5jdGlvbgogICAgICAgICAgICAgICAg ICAgOmhlbHAgIkRpc3BsYXkgZG9jdW1lbnRhdGlvbiBvZiBmdW5jdGlvbi9jb21tYW5kIikpCisg ICAgKGJpbmRpbmdzLS1kZWZpbmUta2V5IG1lbnUgW2Rlc2NyaWJlLWNvbW1hbmRdCisgICAgICAn KG1lbnUtaXRlbSAiRGVzY3JpYmUgQ29tbWFuZC4uLiIgZGVzY3JpYmUtY29tbWFuZAorICAgICAg ICAgICAgICAgICAgOmhlbHAgIkRpc3BsYXkgZG9jdW1lbnRhdGlvbiBvZiBjb21tYW5kIikpCiAg ICAgKGJpbmRpbmdzLS1kZWZpbmUta2V5IG1lbnUgW3Nob3J0ZG9jLWRpc3BsYXktZ3JvdXBdCiAg ICAgICAnKG1lbnUtaXRlbSAiRnVuY3Rpb24gR3JvdXAgT3ZlcnZpZXcuLi4iIHNob3J0ZG9jLWRp c3BsYXktZ3JvdXAKICAgICAgICAgICAgICAgICAgIDpoZWxwICJEaXNwbGF5IGEgZnVuY3Rpb24g b3ZlcnZpZXcgZm9yIGEgc3BlY2lmaWMgdG9waWMiKSkKLS0gCjIuMzAuMAoK --00000000000043c57305bbc7a51d--