From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#52293: 29.0.50; [PATCH] Prevent further cases of duplicated separators in context menus Date: Sat, 4 Dec 2021 21:58:24 -0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E952E559B6A2DBD64D31DDF8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3141"; mail-complaints-to="usenet@ciao.gmane.io" To: 52293@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 05 06:59:26 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 1mtkYX-0000d5-Tb for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 05 Dec 2021 06:59:26 +0100 Original-Received: from localhost ([::1]:56082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtkYW-0006yw-Iw for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 05 Dec 2021 00:59:24 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:40988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtkYA-0006yh-HO for bug-gnu-emacs@gnu.org; Sun, 05 Dec 2021 00:59:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtkYA-0003PK-8h for bug-gnu-emacs@gnu.org; Sun, 05 Dec 2021 00:59:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtkY9-0005fJ-Ve for bug-gnu-emacs@gnu.org; Sun, 05 Dec 2021 00:59:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 05 Dec 2021 05:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52293 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.163868391021728 (code B ref -1); Sun, 05 Dec 2021 05:59:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Dec 2021 05:58:30 +0000 Original-Received: from localhost ([127.0.0.1]:56094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtkXd-0005eO-Pt for submit@debbugs.gnu.org; Sun, 05 Dec 2021 00:58:30 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:57738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtkXc-0005eH-Ot for submit@debbugs.gnu.org; Sun, 05 Dec 2021 00:58:29 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:40946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtkXc-0006xC-Fx for bug-gnu-emacs@gnu.org; Sun, 05 Dec 2021 00:58:28 -0500 Original-Received: from [2607:f8b0:4864:20::429] (port=45945 helo=mail-pf1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtkXa-0003Mk-G2 for bug-gnu-emacs@gnu.org; Sun, 05 Dec 2021 00:58:28 -0500 Original-Received: by mail-pf1-x429.google.com with SMTP id x131so7004065pfc.12 for ; Sat, 04 Dec 2021 21:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:mime-version:content-language; bh=89D135Jqda7/zweIz1wZZVIQU7o5RUzj9U57JCPzjr4=; b=mbeTdrPHAX/ReVUts1FkoRworZ/vqhYLvh3IMTeQcd+7mG/id5wKMTwEeNXmlvRJEa 69eLSrJQ6mgZbkuhZzF3Z6uCc3mohNQI04qjxaWD8xsDvml+FpVkWmLhDHjW+M/p1iFK i9fcEgWhr9ptTYl68sa4LYGap7gOaNICY8QBaEcwzfJ9ZaAueXGDinC2+e6M4gfzE96m 49QV+LhHLja4w/KkIAIcSvmE2EqRTZ49lIJNYZPnTuawypy3ASmNhzUsqMpcexkN1ff8 DPSooave7LiOZE1JAMRv8Yy9Z6YCc7LI32h09Ej+ALHaE2W/r0vSm1VvdrCsunV4+Jhz p7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:mime-version :content-language; bh=89D135Jqda7/zweIz1wZZVIQU7o5RUzj9U57JCPzjr4=; b=G56QT/3i5LD5wtXUPCCmuf59u1jf94xtxo7saCzsbydIy2dUkQUN6vgcGIiaz5r8kk 4fpRb/W01SnFqybm58NPEyjtLLCeo7338L/TfTeBu8oV+v/Fow1YtIQPKJRIziokAs3G BioHyNRQ8msDg5XzOsJIgk+O38ZYwnaOl8hn14uTu3h+H48oQZLsZRwFXDnCCHtLVnen VzH6pxz4UrbEhrAGZa86b+AYK4gN6y03KvF0xSjjj3fv3EPwZR8T3KohJEcP1zj9sBVz +Q9hoSixZSEAnbyPzZkDwRPCwMmJfEl4iQ/97kw6WkvPqJ013/LB84y7kTb9eCyPOGzv vBFw== X-Gm-Message-State: AOAM531vPYjWYwikAHV97z1W0XE3XnRPxR4rQUqOuhOtSPl++8mx8prL omQ6wGiLZDTDG/KrNea4WrVnSdOkDL0= X-Google-Smtp-Source: ABdhPJwcYRoMSLKqmyKTPG2qqE00QX4kmy6MJHwV9xPEqqEnF2WEYF52ebwUKgnFExIbt6z0ipa1yg== X-Received: by 2002:a05:6a00:cc4:b0:4a0:e97:fe97 with SMTP id b4-20020a056a000cc400b004a00e97fe97mr29568410pfv.74.1638683905085; Sat, 04 Dec 2021 21:58:25 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id h20sm982597pgh.13.2021.12.04.21.58.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Dec 2021 21:58:24 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.org:119 Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::429 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x429.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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:221579 Archived-At: This is a multi-part message in MIME format. --------------E952E559B6A2DBD64D31DDF8 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit This is a followup to bug#52237. I'll just quote my message describing the issue from there[1]: > I found another odd case, but I'm not 100% sure the best way to fix it: > > emacs -Q --eval '(context-menu-mode)' > C-h o identity RET > ;; Right-click somewhere in the Help buffer > > There's a doubled separator after "Next Topic". Looking at the code, this is because `help-mode-context-menu' inserts new items using `define-key', which has the effect of putting the new items *before* the (hidden) menu title. The resulting keymap ends up looking like this: > > (keymap > (Previous\ Topic ...) > (Next\ Topic ...) > (help-mode-separator "--") > #("Context Menu" 0 12 (hide t)) > (separator-undo "--") > ...) > > Since there's a hidden item (the keymap title) between the `help-mode-separator' and `separator-undo'[1], the de-duplication doesn't handle that. Attached is a patch to fix this based on the discussion in bug#52237. One slightly odd thing is that for context menu functions that put their items at the top, they place their separator *below* the items. Other functions place the separator *above* the items. It might be too late to fix this though, given that Emacs 28 is only open for fixing regressions, and changing it in 29 would be a (small) compatibility break. However, I can update the patch to put the separators in these functions at the top if people think that's best. [1] https://lists.gnu.org/archive/html/bug-gnu-emacs/2021-12/msg00143.html --------------E952E559B6A2DBD64D31DDF8 Content-Type: text/plain; charset=UTF-8; name="0001-Add-a-top-separator-to-the-context-menu.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Add-a-top-separator-to-the-context-menu.patch" RnJvbSAyYjM5NWEyY2IxZWZjYTg1Y2RjYTk5MjgwNGI2MTRjZGYyNjQxNDEzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgNCBEZWMgMjAyMSAyMTo0Mjo1NyAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEFkZCBhICd0b3Atc2VwYXJhdG9yJyB0byB0aGUgY29udGV4dCBtZW51CgpUaGlzIHBy b3ZpZGVzIGFuIGFuY2hvciBmb3IgY29udGV4dCBtZW51IGZ1bmN0aW9ucyB0byB1c2UgdG8g aW5zZXJ0CnRoZWlyIG1lbnUgaXRlbXMgYWZ0ZXIgaXQuIFVzaW5nICdkZWZpbmUta2V5JyBk b2Vzbid0IHdvcmsgcHJvcGVybHkgaW4KdGhpcyBjYXNlLCBzaW5jZSBpdCBpbnNlcnRzIHRo ZSBpdGVtcyBiZWZvcmUgdGhlIG1lbnUgdGl0bGUsIGNvbmZ1c2luZwp0aGUgc2VwYXJhdG9y IGRlLWR1cGxpY2F0aW9uIGluICdjb250ZXh0LW1lbnUtbWFwJy4KCiogbGlzcC9tb3VzZS5l bCAoY29udGV4dC1tZW51LXRvcC1zZXBhcmF0b3IpOiBOZXcgZnVuY3Rpb24uCihjb250ZXh0 LW1lbnUtZnVuY3Rpb25zKTogVXNlIGl0LgoqIGxpc3AvZGlyZWQuZWwgKGRpcmVkLWNvbnRl eHQtbWVudSk6CiogbGlzcC9oZWxwLW1vZGUuZWwgKGhlbHAtbW9kZS1jb250ZXh0LW1lbnUp OgoqIGxpc3AvaW5mby5lbCAoSW5mby1jb250ZXh0LW1lbnUpOgoqIGxpc3AvbmV0L2V3dy5l bCAoZXd3LWNvbnRleHQtbWVudSk6CiogbGlzcC9uZXQvZ290by1hZGRyLmVsIChnb3RvLWFk ZHJlc3MtY29udGV4dC1tZW51KToKVXNlICd0b3Atc2VwYXJhdG9yJy4KLS0tCiBsaXNwL2Rp cmVkLmVsICAgICAgICAgfCAgNSArKystLQogbGlzcC9oZWxwLW1vZGUuZWwgICAgIHwgMTAg KysrKysrLS0tLQogbGlzcC9pbmZvLmVsICAgICAgICAgIHwgIDkgKysrKystLS0tCiBsaXNw L21vdXNlLmVsICAgICAgICAgfCAxMiArKysrKysrKysrLS0KIGxpc3AvbmV0L2V3dy5lbCAg ICAgICB8IDE0ICsrKysrKysrLS0tLS0tCiBsaXNwL25ldC9nb3RvLWFkZHIuZWwgfCAgOCAr KysrKy0tLQogNiBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2RpcmVkLmVsIGIvbGlzcC9kaXJlZC5lbAppbmRl eCBkMGU1NDdiYTBiLi5iMDA0ZDgxNDk1IDEwMDY0NAotLS0gYS9saXNwL2RpcmVkLmVsCisr KyBiL2xpc3AvZGlyZWQuZWwKQEAgLTIyODIsNyArMjI4Miw3IEBAIGRpcmVkLW1vZGUtb3Bl cmF0ZS1tZW51CiAoZGVmdW4gZGlyZWQtY29udGV4dC1tZW51IChtZW51IGNsaWNrKQogICAi UG9wdWxhdGUgTUVOVSB3aXRoIERpcmVkIG1vZGUgY29tbWFuZHMgYXQgQ0xJQ0suIgogICAo d2hlbiAobW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3RhcnQgY2xpY2spICdkaXJlZC1m aWxlbmFtZSkKLSAgICAoZGVmaW5lLWtleSBtZW51IFtkaXJlZC1zZXBhcmF0b3JdIG1lbnUt YmFyLXNlcGFyYXRvcikKKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtkaXJlZC1zZXBh cmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvciAndG9wLXNlcGFyYXRvcikKICAgICAobGV0ICgo ZWFzeS1tZW51IChtYWtlLXNwYXJzZS1rZXltYXAgIkltbWVkaWF0ZSIpKSkKICAgICAgIChl YXN5LW1lbnUtZGVmaW5lIG5pbCBlYXN5LW1lbnUgbmlsCiAgICAgICAgICcoIkltbWVkaWF0 ZSIKQEAgLTIyOTIsNyArMjI5Miw4IEBAIGRpcmVkLWNvbnRleHQtbWVudQogICAgICAgICAg ICA6aGVscCAiRWRpdCBmaWxlIGF0IG1vdXNlIGNsaWNrIGluIG90aGVyIHdpbmRvdyJdKSkK ICAgICAgIChkb2xpc3QgKGl0ZW0gKHJldmVyc2UgKGxvb2t1cC1rZXkgZWFzeS1tZW51IFtt ZW51LWJhciBpbW1lZGlhdGVdKSkpCiAgICAgICAgICh3aGVuIChjb25zcCBpdGVtKQotICAg ICAgICAgIChkZWZpbmUta2V5IG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0pKSAoY2RyIGl0ZW0p KSkpKSkKKyAgICAgICAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51ICh2ZWN0b3IgKGNhciBp dGVtKSkgKGNkciBpdGVtKQorICAgICAgICAgICAgJ3RvcC1zZXBhcmF0b3IpKSkpKQogICBt ZW51KQogCiAMCmRpZmYgLS1naXQgYS9saXNwL2hlbHAtbW9kZS5lbCBiL2xpc3AvaGVscC1t b2RlLmVsCmluZGV4IDc5MmYyZTVhZjMuLjJlZDIwNTc3ZjUgMTAwNjQ0Ci0tLSBhL2xpc3Av aGVscC1tb2RlLmVsCisrKyBiL2xpc3AvaGVscC1tb2RlLmVsCkBAIC03NCw3ICs3NCw4IEBA IGhlbHAtbW9kZS1tZW51CiAKIChkZWZ1biBoZWxwLW1vZGUtY29udGV4dC1tZW51IChtZW51 IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIEhlbHAgbW9kZSBjb21tYW5kcyBhdCBD TElDSy4iCi0gIChkZWZpbmUta2V5IG1lbnUgW2hlbHAtbW9kZS1zZXBhcmF0b3JdIG1lbnUt YmFyLXNlcGFyYXRvcikKKyAgKGRlZmluZS1rZXktYWZ0ZXIgbWVudSBbaGVscC1tb2RlLXNl cGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yCisgICAgJ3RvcC1zZXBhcmF0b3IpCiAgIChs ZXQgKChlYXN5LW1lbnUgKG1ha2Utc3BhcnNlLWtleW1hcCAiSGVscC1Nb2RlIikpKQogICAg IChlYXN5LW1lbnUtZGVmaW5lIG5pbCBlYXN5LW1lbnUgbmlsCiAgICAgICAnKCJIZWxwLU1v ZGUiCkBAIC04NiwxNCArODcsMTUgQEAgaGVscC1tb2RlLWNvbnRleHQtbWVudQogICAgICAg ICAgOmFjdGl2ZSBoZWxwLXhyZWYtZm9yd2FyZC1zdGFja10pKQogICAgIChkb2xpc3QgKGl0 ZW0gKHJldmVyc2UgKGxvb2t1cC1rZXkgZWFzeS1tZW51IFttZW51LWJhciBoZWxwLW1vZGVd KSkpCiAgICAgICAod2hlbiAoY29uc3AgaXRlbSkKLSAgICAgICAgKGRlZmluZS1rZXkgbWVu dSAodmVjdG9yIChjYXIgaXRlbSkpIChjZHIgaXRlbSkpKSkpCisgICAgICAgIChkZWZpbmUt a2V5LWFmdGVyIG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0pKSAoY2RyIGl0ZW0pICd0b3Atc2Vw YXJhdG9yKSkpKQogCiAgICh3aGVuIChtb3VzZS1wb3NuLXByb3BlcnR5IChldmVudC1zdGFy dCBjbGljaykgJ21vdXNlLWZhY2UpCi0gICAgKGRlZmluZS1rZXkgbWVudSBbaGVscC1tb2Rl LXB1c2gtYnV0dG9uXQorICAgIChkZWZpbmUta2V5LWFmdGVyIG1lbnUgW2hlbHAtbW9kZS1w dXNoLWJ1dHRvbl0KICAgICAgICcobWVudS1pdGVtICJGb2xsb3cgTGluayIgKGxhbWJkYSAo ZXZlbnQpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGludGVyYWN0aXZl ICJlIikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHVzaC1idXR0b24g ZXZlbnQpKQotICAgICAgICAgICAgICAgICAgOmhlbHAgIkZvbGxvdyB0aGUgbGluayBhdCBj bGljayIpKSkKKyAgICAgICAgICAgICAgICAgIDpoZWxwICJGb2xsb3cgdGhlIGxpbmsgYXQg Y2xpY2siKQorICAgICAgJ3RvcC1zZXBhcmF0b3IpKQogCiAgIG1lbnUpCiAKZGlmZiAtLWdp dCBhL2xpc3AvaW5mby5lbCBiL2xpc3AvaW5mby5lbAppbmRleCA5NDUzN2MyNDE3Li43Njk2 M2FmNDFjIDEwMDY0NAotLS0gYS9saXNwL2luZm8uZWwKKysrIGIvbGlzcC9pbmZvLmVsCkBA IC00MTkxLDcgKzQxOTEsNyBAQCBJbmZvLWNoZWNrLXBvaW50ZXIKIAogKGRlZnVuIEluZm8t Y29udGV4dC1tZW51IChtZW51IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIEluZm8g Y29tbWFuZHMgYXQgQ0xJQ0suIgotICAoZGVmaW5lLWtleSBtZW51IFtJbmZvLXNlcGFyYXRv cl0gbWVudS1iYXItc2VwYXJhdG9yKQorICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtJbmZv LXNlcGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yICd0b3Atc2VwYXJhdG9yKQogICAobGV0 ICgoZWFzeS1tZW51IChtYWtlLXNwYXJzZS1rZXltYXAgIkluZm8iKSkpCiAgICAgKGVhc3kt bWVudS1kZWZpbmUgbmlsIGVhc3ktbWVudSBuaWwKICAgICAgICcoIkluZm8iCkBAIC00MjAx LDEyICs0MjAxLDEzIEBAIEluZm8tY29udGV4dC1tZW51CiAgICAgICAgICA6aGVscCAiR28g Zm9yd2FyZCBpbiBoaXN0b3J5Il0pKQogICAgIChkb2xpc3QgKGl0ZW0gKHJldmVyc2UgKGxv b2t1cC1rZXkgZWFzeS1tZW51IFttZW51LWJhciBpbmZvXSkpKQogICAgICAgKHdoZW4gKGNv bnNwIGl0ZW0pCi0gICAgICAgIChkZWZpbmUta2V5IG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0p KSAoY2RyIGl0ZW0pKSkpKQorICAgICAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51ICh2ZWN0 b3IgKGNhciBpdGVtKSkgKGNkciBpdGVtKSAndG9wLXNlcGFyYXRvcikpKSkKIAogICAod2hl biAobW91c2UtcG9zbi1wcm9wZXJ0eSAoZXZlbnQtc3RhcnQgY2xpY2spICdtb3VzZS1mYWNl KQotICAgIChkZWZpbmUta2V5IG1lbnUgW0luZm8tbW91c2UtZm9sbG93LW5lYXJlc3Qtbm9k ZV0KKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtJbmZvLW1vdXNlLWZvbGxvdy1uZWFy ZXN0LW5vZGVdCiAgICAgICAnKG1lbnUtaXRlbSAiRm9sbG93IExpbmsiIEluZm8tbW91c2Ut Zm9sbG93LW5lYXJlc3Qtbm9kZQotICAgICAgICAgICAgICAgICAgOmhlbHAgIkZvbGxvdyBh IGxpbmsgd2hlcmUgeW91IGNsaWNrIikpKQorICAgICAgICAgICAgICAgICAgOmhlbHAgIkZv bGxvdyBhIGxpbmsgd2hlcmUgeW91IGNsaWNrIikKKyAgICAgICd0b3Atc2VwYXJhdG9yKSkK IAogICBtZW51KQogCmRpZmYgLS1naXQgYS9saXNwL21vdXNlLmVsIGIvbGlzcC9tb3VzZS5l bAppbmRleCBiNWNhODBhNDQ2Li5hN2E3YmI2ZWFlIDEwMDY0NAotLS0gYS9saXNwL21vdXNl LmVsCisrKyBiL2xpc3AvbW91c2UuZWwKQEAgLTI3OSw3ICsyNzksOCBAQCBtb3VzZS1tZW51 LWJhci1tYXAKIAwKIDs7IENvbnRleHQgbWVudXMuCiAKLShkZWZjdXN0b20gY29udGV4dC1t ZW51LWZ1bmN0aW9ucyAnKGNvbnRleHQtbWVudS11bmRvCisoZGVmY3VzdG9tIGNvbnRleHQt bWVudS1mdW5jdGlvbnMgJyhjb250ZXh0LW1lbnUtdG9wLXNlcGFyYXRvcgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29udGV4dC1tZW51LXVuZG8KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQtbWVudS1yZWdpb24KICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRleHQtbWVudS1taWRkbGUtc2Vw YXJhdG9yCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZXh0LW1l bnUtbG9jYWwKQEAgLTI4OCw3ICsyODksOCBAQCBjb250ZXh0LW1lbnUtZnVuY3Rpb25zCiBF YWNoIGZ1bmN0aW9uIHJlY2VpdmVzIHRoZSBtZW51IGFuZCB0aGUgbW91c2UgY2xpY2sgZXZl bnQgYXMgaXRzIGFyZ3VtZW50cwogYW5kIHNob3VsZCByZXR1cm4gdGhlIHNhbWUgbWVudSB3 aXRoIGNoYW5nZXMgc3VjaCBhcyBhZGRlZCBuZXcgbWVudSBpdGVtcy4iCiAgIDp0eXBlICco cmVwZWF0Ci0gICAgICAgICAgKGNob2ljZSAoZnVuY3Rpb24taXRlbSBjb250ZXh0LW1lbnUt dW5kbykKKyAgICAgICAgICAoY2hvaWNlIChmdW5jdGlvbi1pdGVtIGNvbnRleHQtbWVudS10 b3Atc2VwYXJhdG9yKQorICAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uLWl0ZW0gY29udGV4 dC1tZW51LXVuZG8pCiAgICAgICAgICAgICAgICAgICAoZnVuY3Rpb24taXRlbSBjb250ZXh0 LW1lbnUtcmVnaW9uKQogICAgICAgICAgICAgICAgICAgKGZ1bmN0aW9uLWl0ZW0gY29udGV4 dC1tZW51LW1pZGRsZS1zZXBhcmF0b3IpCiAgICAgICAgICAgICAgICAgICAoZnVuY3Rpb24t aXRlbSBjb250ZXh0LW1lbnUtdG9vbGJhcikKQEAgLTM0OCw2ICszNTAsMTIgQEAgY29udGV4 dC1tZW51LW1hcAogICAgICAgKHNldHEgbWVudSAoZnVuY2FsbCBjb250ZXh0LW1lbnUtZmls dGVyLWZ1bmN0aW9uIG1lbnUgY2xpY2spKSkKICAgICBtZW51KSkKIAorKGRlZnVuIGNvbnRl eHQtbWVudS10b3Atc2VwYXJhdG9yIChtZW51IF9jbGljaykKKyAgIkFkZCBzZXBhcmF0b3Ig dG8gdGhlIHRvcCBvZiB0aGUgY29udGV4dCBtZW51LgorU29tZSBjb250ZXh0IGZ1bmN0aW9u cyBhZGQgbWVudSBpdGVtcyBiZWxvdyB0aGUgc2VwYXJhdG9yLiIKKyAgKGRlZmluZS1rZXkt YWZ0ZXIgbWVudSBbdG9wLXNlcGFyYXRvcl0gbWVudS1iYXItc2VwYXJhdG9yKQorICBtZW51 KQorCiAoZGVmdW4gY29udGV4dC1tZW51LW1pZGRsZS1zZXBhcmF0b3IgKG1lbnUgX2NsaWNr KQogICAiQWRkIHNlcGFyYXRvciB0byB0aGUgbWlkZGxlIG9mIHRoZSBjb250ZXh0IG1lbnUu CiBTb21lIGNvbnRleHQgZnVuY3Rpb25zIGFkZCBtZW51IGl0ZW1zIGJlbG93IHRoZSBzZXBh cmF0b3IuIgpkaWZmIC0tZ2l0IGEvbGlzcC9uZXQvZXd3LmVsIGIvbGlzcC9uZXQvZXd3LmVs CmluZGV4IGU4NmQyMWY4ODkuLjczMDNlMDFhMzcgMTAwNjQ0Ci0tLSBhL2xpc3AvbmV0L2V3 dy5lbAorKysgYi9saXNwL25ldC9ld3cuZWwKQEAgLTExMDYsNyArMTEwNiw3IEBAIGV3dy1t b2RlLW1hcAogCiAoZGVmdW4gZXd3LWNvbnRleHQtbWVudSAobWVudSBjbGljaykKICAgIlBv cHVsYXRlIE1FTlUgd2l0aCBld3cgY29tbWFuZHMgYXQgQ0xJQ0suIgotICAoZGVmaW5lLWtl eSBtZW51IFtld3ctc2VwYXJhdG9yXSBtZW51LWJhci1zZXBhcmF0b3IpCisgIChkZWZpbmUt a2V5LWFmdGVyIG1lbnUgW2V3dy1zZXBhcmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvciAndG9w LXNlcGFyYXRvcikKICAgKGxldCAoKGVhc3ktbWVudSAobWFrZS1zcGFyc2Uta2V5bWFwICJF d3ciKSkpCiAgICAgKGVhc3ktbWVudS1kZWZpbmUgbmlsIGVhc3ktbWVudSBuaWwKICAgICAg ICcoIkV3dyIKQEAgLTExMTcsMjAgKzExMTcsMjIgQEAgZXd3LWNvbnRleHQtbWVudQogCVsi UmVsb2FkIiBld3ctcmVsb2FkIHRdKSkKICAgICAoZG9saXN0IChpdGVtIChyZXZlcnNlIChs b29rdXAta2V5IGVhc3ktbWVudSBbbWVudS1iYXIgZXd3XSkpKQogICAgICAgKHdoZW4gKGNv bnNwIGl0ZW0pCi0gICAgICAgIChkZWZpbmUta2V5IG1lbnUgKHZlY3RvciAoY2FyIGl0ZW0p KSAoY2RyIGl0ZW0pKSkpKQorICAgICAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51ICh2ZWN0 b3IgKGNhciBpdGVtKSkgKGNkciBpdGVtKSAndG9wLXNlcGFyYXRvcikpKSkKIAogICAod2hl biAob3IgKG1vdXNlLXBvc24tcHJvcGVydHkgKGV2ZW50LXN0YXJ0IGNsaWNrKSAnc2hyLXVy bCkKICAgICAgICAgICAgIChtb3VzZS1wb3NuLXByb3BlcnR5IChldmVudC1zdGFydCBjbGlj aykgJ2ltYWdlLXVybCkpCi0gICAgKGRlZmluZS1rZXkgbWVudSBbc2hyLW1vdXNlLWJyb3dz ZS11cmwtbmV3LXdpbmRvd10KKyAgICAoZGVmaW5lLWtleS1hZnRlciBtZW51IFtzaHItbW91 c2UtYnJvd3NlLXVybC1uZXctd2luZG93XQogICAgICAgYChtZW51LWl0ZW0gIkZvbGxvdyBV UkwgaW4gbmV3IHdpbmRvdyIgLChpZiBicm93c2UtdXJsLW5ldy13aW5kb3ctZmxhZwogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnc2hyLW1v dXNlLWJyb3dzZS11cmwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdzaHItbW91c2UtYnJvd3NlLXVybC1uZXctd2luZG93KQotICAgICAgICAg ICAgICAgICAgOmhlbHAgIkJyb3dzZSB0aGUgVVJMIHVuZGVyIHRoZSBtb3VzZSBjdXJzb3Ig aW4gYSBuZXcgd2luZG93IikpCi0gICAgKGRlZmluZS1rZXkgbWVudSBbc2hyLW1vdXNlLWJy b3dzZS11cmxdCisgICAgICAgICAgICAgICAgICA6aGVscCAiQnJvd3NlIHRoZSBVUkwgdW5k ZXIgdGhlIG1vdXNlIGN1cnNvciBpbiBhIG5ldyB3aW5kb3ciKQorICAgICAgJ3RvcC1zZXBh cmF0b3IpCisgICAgKGRlZmluZS1rZXktYWZ0ZXIgbWVudSBbc2hyLW1vdXNlLWJyb3dzZS11 cmxdCiAgICAgICBgKG1lbnUtaXRlbSAiRm9sbG93IFVSTCIgLChpZiBicm93c2UtdXJsLW5l dy13aW5kb3ctZmxhZwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3No ci1tb3VzZS1icm93c2UtdXJsLW5ldy13aW5kb3cKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAnc2hyLW1vdXNlLWJyb3dzZS11cmwpCi0gICAgICAgICAgICAgICAgICA6 aGVscCAiQnJvd3NlIHRoZSBVUkwgdW5kZXIgdGhlIG1vdXNlIGN1cnNvciIpKSkKKyAgICAg ICAgICAgICAgICAgIDpoZWxwICJCcm93c2UgdGhlIFVSTCB1bmRlciB0aGUgbW91c2UgY3Vy c29yIikKKyAgICAgICd0b3Atc2VwYXJhdG9yKSkKIAogICBtZW51KQogCmRpZmYgLS1naXQg YS9saXNwL25ldC9nb3RvLWFkZHIuZWwgYi9saXNwL25ldC9nb3RvLWFkZHIuZWwKaW5kZXgg ODQ4YmFkM2IwZC4uYmIwZjBiMDBlZSAxMDA2NDQKLS0tIGEvbGlzcC9uZXQvZ290by1hZGRy LmVsCisrKyBiL2xpc3AvbmV0L2dvdG8tYWRkci5lbApAQCAtMTI3LDEwICsxMjcsMTIgQEAg Z290by1hZGRyZXNzLWhpZ2hsaWdodC1rZXltYXAKIChkZWZ1biBnb3RvLWFkZHJlc3MtY29u dGV4dC1tZW51IChtZW51IGNsaWNrKQogICAiUG9wdWxhdGUgTUVOVSB3aXRoIGBnb3RvLWFk ZHJlc3MnIGNvbW1hbmRzIGF0IENMSUNLLiIKICAgKHdoZW4gKG1vdXNlLXBvc24tcHJvcGVy dHkgKGV2ZW50LXN0YXJ0IGNsaWNrKSAnZ290by1hZGRyZXNzKQotICAgIChkZWZpbmUta2V5 IG1lbnUgW2dvdG8tYWRkcmVzcy1zZXBhcmF0b3JdIG1lbnUtYmFyLXNlcGFyYXRvcikKLSAg ICAoZGVmaW5lLWtleSBtZW51IFtnb3RvLWFkZHJlc3MtYXQtbW91c2VdCisgICAgKGRlZmlu ZS1rZXktYWZ0ZXIgbWVudSBbZ290by1hZGRyZXNzLXNlcGFyYXRvcl0gbWVudS1iYXItc2Vw YXJhdG9yCisgICAgICAndG9wLXNlcGFyYXRvcikKKyAgICAoZGVmaW5lLWtleS1hZnRlciBt ZW51IFtnb3RvLWFkZHJlc3MtYXQtbW91c2VdCiAgICAgICAnKG1lbnUtaXRlbSAiRm9sbG93 IExpbmsiIGdvdG8tYWRkcmVzcy1hdC1tb3VzZQotICAgICAgICAgICAgICAgICAgOmhlbHAg IkZvbGxvdyBhIGxpbmsgd2hlcmUgeW91IGNsaWNrIikpKQorICAgICAgICAgICAgICAgICAg OmhlbHAgIkZvbGxvdyBhIGxpbmsgd2hlcmUgeW91IGNsaWNrIikKKyAgICAgICd0b3Atc2Vw YXJhdG9yKSkKICAgbWVudSkKIAogKGRlZmN1c3RvbSBnb3RvLWFkZHJlc3MtdXJsLWZhY2Ug J2xpbmsKLS0gCjIuMjUuMQoK --------------E952E559B6A2DBD64D31DDF8--