From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#20150: 24.4: bookmarks: return from editing annotations (FIX INCLUDED) Date: Thu, 4 Jul 2019 21:40:45 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000001cbf42058ce0287d" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="75010"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 20150@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 04 21:42:22 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hj7cb-000JPA-PN for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Jul 2019 21:42:22 +0200 Original-Received: from localhost ([::1]:48460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hj7ca-0003T7-RH for geb-bug-gnu-emacs@m.gmane.org; Thu, 04 Jul 2019 15:42:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:40294) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hj7cM-0003Sy-2X for bug-gnu-emacs@gnu.org; Thu, 04 Jul 2019 15:42:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hj7cJ-0003PL-Ap for bug-gnu-emacs@gnu.org; Thu, 04 Jul 2019 15:42:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hj7cI-0003P4-T2 for bug-gnu-emacs@gnu.org; Thu, 04 Jul 2019 15:42:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hj7cI-00057P-Nr for bug-gnu-emacs@gnu.org; Thu, 04 Jul 2019 15:42:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 04 Jul 2019 19:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20150 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 20150-submit@debbugs.gnu.org id=B20150.156226926619594 (code B ref 20150); Thu, 04 Jul 2019 19:42:02 +0000 Original-Received: (at 20150) by debbugs.gnu.org; 4 Jul 2019 19:41:06 +0000 Original-Received: from localhost ([127.0.0.1]:51948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj7bO-00055y-5O for submit@debbugs.gnu.org; Thu, 04 Jul 2019 15:41:06 -0400 Original-Received: from mail-wm1-f66.google.com ([209.85.128.66]:55256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hj7bL-00054v-8h for 20150@debbugs.gnu.org; Thu, 04 Jul 2019 15:41:04 -0400 Original-Received: by mail-wm1-f66.google.com with SMTP id p74so3666227wme.4 for <20150@debbugs.gnu.org>; Thu, 04 Jul 2019 12:41:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:cc; bh=ylC90EuMy4MvG5HPExKeCRUoNPAbgaUnEbfXCRGGAUE=; b=LK/DlYnvWNpbutd9OZLoGwsccm/dBZmtmETkZj2abcDODCav/UDairt6/o5Y2ul/US 6CcWAKrUr/YjdV4f38WzV5U03O2uvBFbvkn7kvzm+/Z3rOsyeBBDc2Fs+JeVKOBtBro1 oOE4nSAOmTVWcjEJvck49KFnOybFkmrzyqgB+7XWm0oh8VNNc7IrbOuM0wYlDQl5XmHM /457cb1PSU7Sa4B32N3q6qeChvUQEc1mGzKfbNDxvT5CX45GWeEV95+x4cR71dcWm7v/ IMI5uICq79Nd0gchuim2r8QBgasEdGihgMs58vWIOfkBkm2QjyyKu71UhGomK1lEXHCi 0OGg== X-Gm-Message-State: APjAAAV564Nurc2K7yYp4htfv1BQzFDDm9Oa3SQ8t0q4D+6nrIAkHSCk 4icNiHainmVM38Zp7Cl0H5mUbiUIMyqKz8dIuY4KPW4x X-Google-Smtp-Source: APXvYqzvRPh7h0gV8oEFR+vaVn7QJW+W87LCgLmzqsDNlBSnpY6JDmUFYMZ9TFo1EwTaXMRE9YFcsXEYJhRGHG5by9Y= X-Received: by 2002:a1c:7c08:: with SMTP id x8mr668067wmc.19.1562269257071; Thu, 04 Jul 2019 12:40:57 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:162078 Archived-At: --0000000000001cbf42058ce0287d Content-Type: text/plain; charset="UTF-8" Stefan Kangas writes: > I also ran into a suspected bug in with-current-buffer (Bug#36497). I > added a FIXME in one of the test cases so we can clean it up once > that's fixed. Turns out this was not a bug, but only my own confusion. Gmail had helpfully put the reply to the bug report in the spam folder, so I only realized *after* I sent this email that it had been replied to hours ago. I've attached an updated patch without this FIXME. Other than that, it's identical. Thanks, Stefan Kangas --0000000000001cbf42058ce0287d Content-Type: application/octet-stream; name="0001-Restore-focus-to-Bookmark-List-after-editing-annotat-5.patch" Content-Disposition: attachment; filename="0001-Restore-focus-to-Bookmark-List-after-editing-annotat-5.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jxp2r59x0 RnJvbSA0ZWEzYWRhY2E2ZGFiNGM2ODAzOTkyNDUzOTJhM2RiNGM5ZDg2NWZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBUdWUsIDIgSnVsIDIwMTkgMDM6MDY6MzcgKzAyMDAKU3ViamVjdDogW1BBVENIXSBS ZXN0b3JlIGZvY3VzIHRvIEJvb2ttYXJrIExpc3QgYWZ0ZXIgZWRpdGluZyBhbm5vdGF0aW9uCgpU aGVyZSBhcmUgdHdvIGVudHJ5IHBvaW50cyB0byBib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9k ZTogdGhlIGZpcnN0CndoZW4gd2UgYWRkIGEgYm9va21hcmsgYW5kIGJvb2ttYXJrLXVzZS1hbm5v dGF0aW9ucyBpcyBub24tbmlsOyB0aGUKc2Vjb25kIHdoZW4gYm9va21hcmstYm1lbnUtZWRpdC1h bm5vdGF0aW9uIGlzIHJ1biBmcm9tIHRoZSBib29rbWFyawpsaXN0LiAgV2hlbiBlZGl0aW5nIGlz IGNvbmNsdWRlZCwgaW4gdGhlIGZpcnN0IGNhc2UsIHdlIHNob3VsZCBqdXN0CnF1aXQgd2luZG93 LiAgSW4gdGhlIHNlY29uZCBjYXNlLCB3ZSBzaG91bGQgaW5zdGVhZCByZXR1cm4gdG8gdGhlCmJv b2ttYXJrIGxpc3QuCgoqIGxpc3AvYm9va21hcmsuZWwgKHRleHQtcHJvcGVydHktc2VhcmNoKTog UmVxdWlyZS4KKGJvb2ttYXJrLWFubm90YXRpb24tLW5hbWUpOiBSZW5hbWUgZnJvbSBib29rbWFy ay1hbm5vdGF0aW9uLW5hbWUsCm1ha2UgYnVmZmVyLWxvY2FsIGFuZCBpbXByb3ZlIGRvYyBzdHJp bmcuCihib29rbWFyay1hbm5vdGF0aW9uLW5hbWUpOiBNYXJrIGFzIG9ic29sZXRlIHZhcmlhYmxl IGFsaWFzIGZvcgpib29rbWFyay1hbm5vdGF0aW9uLS1uYW1lLgooYm9va21hcmstYW5ub3RhdGlv bi0tZnJvbS1ib29rbWFyay1saXN0KTogTmV3IGJ1ZmZlci1sb2NhbCB2YXJpYWJsZS4KKGJvb2tt YXJrLWVkaXQtYW5ub3RhdGlvbik6IFVzZSBhYm92ZSByZW5hbWVkIHZhcmlhYmxlLiAgTmV3IGFy Z3VtZW50CmZyb20tYm9va21hcmstbGlzdCBzZXRzIGJvb2ttYXJrLWFubm90YXRpb24tLWZyb20t Ym9va21hcmstbGlzdC4KKGJvb2ttYXJrLWJtZW51LWVkaXQtYW5ub3RhdGlvbik6IENhbGwgYm9v a21hcmstZWRpdC1hbm5vdGF0aW9uIHdpdGgKYXJndW1lbnQgZnJvbS1ib29rbWFyay1saXN0IHNl dCB0byB0LgooYm9va21hcmstc2VuZC1lZGl0ZWQtYW5ub3RhdGlvbik6IFdoZW4gZWRpdGluZyBv cmlnaW5hdGVkIGluIHRoZQpib29rbWFyayBsaXN0LCByZXN0b3JlIGZvY3VzIHRvIGJvb2ttYXJr IGxpc3QgYW5kIG1vdmUgcG9pbnQgYmFjayB0bwplZGl0ZWQgYm9va21hcmsuIChCdWcjMjAxNTAp CgooYm9va21hcmstZWRpdC1hbm5vdGF0aW9uLW1vZGUpOiBGaXggdHlwby4KKGJvb2ttYXJrLWJt ZW51LWJ1ZmZlcik6IE5ldyB2YXJpYWJsZS4KKGJvb2ttYXJrLWJtZW51LXN1cnJlcHRpdGlvdXNs eS1yZWJ1aWxkLWxpc3QpCihib29rbWFyay1ibWVudS1saXN0KTogVXNlIGl0LgoKKiB0ZXN0L2xp c3AvYm9va21hcmstdGVzdHMuZWwgKHdpdGgtYm9va21hcmstYm1lbnUtdGVzdCk6IE5ldyBtYWNy by4KKGJvb2ttYXJrLXRlc3RzLXNldC9ib29rbWFyay11c2UtYW5ub3RhdGlvbnMtdCkKKGJvb2tt YXJrLWJtZW51LWVkaXQtYW5ub3RhdGlvbi9zaG93LWFubm90YXRpb24pCihib29rbWFyay1ibWVu dS1zZW5kLWVkaXRlZC1hbm5vdGF0aW9uKQooYm9va21hcmstYm1lbnUtc2VuZC1lZGl0ZWQtYW5u b3RhdGlvbi9yZXN0b3JlLWZvY3VzKTogTmV3IHRlc3QgY2FzZXMuCi0tLQogbGlzcC9ib29rbWFy ay5lbCAgICAgICAgICAgIHwgNTMgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LQogdGVzdC9saXNwL2Jvb2ttYXJrLXRlc3RzLmVsIHwgNDkgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA4MiBpbnNlcnRpb25zKCspLCAyMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2Jvb2ttYXJrLmVsIGIvbGlzcC9ib29rbWFyay5l bAppbmRleCA5MmQwZGEzNTk0Li45MzUxYTkwMTJjIDEwMDY0NAotLS0gYS9saXNwL2Jvb2ttYXJr LmVsCisrKyBiL2xpc3AvYm9va21hcmsuZWwKQEAgLTMyLDYgKzMyLDcgQEAKIDs7OyBDb2RlOgog CiAocmVxdWlyZSAncHApCisocmVxdWlyZSAndGV4dC1wcm9wZXJ0eS1zZWFyY2gpCiAoZXZhbC13 aGVuLWNvbXBpbGUgKHJlcXVpcmUgJ2NsLWxpYikpCiAKIDs7OyBNaXNjIGNvbW1lbnRzOgpAQCAt MTIyLDYgKzEyMyw5IEBAIGJvb2ttYXJrLWF1dG9tYXRpY2FsbHktc2hvdy1hbm5vdGF0aW9ucwog ICAiTm9uLW5pbCBtZWFucyBzaG93IGFubm90YXRpb25zIHdoZW4ganVtcGluZyB0byBhIGJvb2tt YXJrLiIKICAgOnR5cGUgJ2Jvb2xlYW4pCiAKKyhkZWZjb25zdCBib29rbWFyay1ibWVudS1idWZm ZXIgIipCb29rbWFyayBMaXN0KiIKKyAgIk5hbWUgb2YgYnVmZmVyIHVzZWQgZm9yIEJvb2ttYXJr IExpc3QuIikKKwogKGRlZmN1c3RvbSBib29rbWFyay1ibWVudS11c2UtaGVhZGVyLWxpbmUgdAog ICAiTm9uLW5pbCBtZWFucyB0byB1c2UgYW4gaW1tb3ZhYmxlIGhlYWRlciBsaW5lLgogVGhpcyBp cyBhcyBvcHBvc2VkIHRvIGlubGluZSB0ZXh0IGF0IHRoZSB0b3Agb2YgdGhlIGJ1ZmZlci4iCkBA IC04ODEsMTMgKzg4NSwxNSBAQCBib29rbWFyay1raWxsLWxpbmUKICAgICAod2hlbiAoYW5kIG5l d2xpbmUtdG9vICg9IChmb2xsb3dpbmctY2hhcikgP1xuKSkKICAgICAgIChkZWxldGUtY2hhciAx KSkpKQogCisoZGVmaW5lLW9ic29sZXRlLXZhcmlhYmxlLWFsaWFzICdib29rbWFyay1hbm5vdGF0 aW9uLW5hbWUKKyAgJ2Jvb2ttYXJrLWFubm90YXRpb24tLW5hbWUgIjI3LjEiKQorKGRlZnZhciBi b29rbWFyay1hbm5vdGF0aW9uLS1uYW1lIG5pbAorICAiTmFtZSBvZiBib29rbWFyayB1bmRlciBl ZGl0IGluIGBib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9kZScuIikKKyhtYWtlLXZhcmlhYmxl LWJ1ZmZlci1sb2NhbCAnYm9va21hcmstYW5ub3RhdGlvbi0tbmFtZSkKIAotOzsgRGVmdmFycyB0 byBhdm9pZCBjb21waWxhdGlvbiB3YXJuaW5nczoKLShkZWZ2YXIgYm9va21hcmstYW5ub3RhdGlv bi1uYW1lIG5pbAotICAiVmFyaWFibGUgaG9sZGluZyB0aGUgbmFtZSBvZiB0aGUgYm9va21hcmsu Ci1UaGlzIGlzIHVzZWQgaW4gYGJvb2ttYXJrLWVkaXQtYW5ub3RhdGlvbicgdG8gcmVjb3JkIHRo ZSBib29rbWFyawotd2hvc2UgYW5ub3RhdGlvbiBpcyBiZWluZyBlZGl0ZWQuIikKLQorKGRlZnZh ciBib29rbWFyay1hbm5vdGF0aW9uLS1mcm9tLWJvb2ttYXJrLWxpc3QgbmlsCisgICJJZiBub24t bmlsLCByZXR1cm4gdG8gYm9va21hcmsgbGlzdCBmcm9tIGBib29rbWFyay1lZGl0LWFubm90YXRp b24tbW9kZScuIikKKyhtYWtlLXZhcmlhYmxlLWJ1ZmZlci1sb2NhbCAnYm9va21hcmstYW5ub3Rh dGlvbi0tZnJvbS1ib29rbWFyay1saXN0KQogCiAoZGVmdW4gYm9va21hcmstZGVmYXVsdC1hbm5v dGF0aW9uLXRleHQgKGJvb2ttYXJrLW5hbWUpCiAgICJSZXR1cm4gZGVmYXVsdCBhbm5vdGF0aW9u IHRleHQgZm9yIEJPT0tNQVJLLU5BTUUuCkBAIC05MjksNyArOTM1LDcgQEAgYm9va21hcmstaW5z ZXJ0LWFubm90YXRpb24KIChkZWZpbmUtZGVyaXZlZC1tb2RlIGJvb2ttYXJrLWVkaXQtYW5ub3Rh dGlvbi1tb2RlCiAgIHRleHQtbW9kZSAiRWRpdCBCb29rbWFyayBBbm5vdGF0aW9uIgogICAiTW9k ZSBmb3IgZWRpdGluZyB0aGUgYW5ub3RhdGlvbiBvZiBib29rbWFya3MuCi1XaGVuIHlvdSBoYXZl IGZpbmlzaGVkIGNvbXBvc2luZywgdHlwZSBcXFtib29rbWFyay1zZW5kLWFubm90YXRpb25dLgor V2hlbiB5b3UgaGF2ZSBmaW5pc2hlZCBjb21wb3NpbmcsIHR5cGUgXFxbYm9va21hcmstc2VuZC1l ZGl0ZWQtYW5ub3RhdGlvbl0uCiAKIFxce2Jvb2ttYXJrLWVkaXQtYW5ub3RhdGlvbi1tb2RlLW1h cH0iKQogCkBAIC05NDcsMjEgKzk1MywzMSBAQCBib29rbWFyay1zZW5kLWVkaXRlZC1hbm5vdGF0 aW9uCiAgICAgICAoZm9yd2FyZC1saW5lIDEpKSkKICAgOzsgVGFrZSBubyBjaGFuY2VzIHdpdGgg dGV4dCBwcm9wZXJ0aWVzLgogICAobGV0ICgoYW5ub3RhdGlvbiAoYnVmZmVyLXN1YnN0cmluZy1u by1wcm9wZXJ0aWVzIChwb2ludC1taW4pIChwb2ludC1tYXgpKSkKLQkoYm9va21hcmstbmFtZSBi b29rbWFyay1hbm5vdGF0aW9uLW5hbWUpKQorICAgICAgICAoYm9va21hcmstbmFtZSBib29rbWFy ay1hbm5vdGF0aW9uLS1uYW1lKQorICAgICAgICAoZnJvbS1ib29rbWFyay1saXN0IGJvb2ttYXJr LWFubm90YXRpb24tLWZyb20tYm9va21hcmstbGlzdCkKKyAgICAgICAgKG9sZC1idWZmZXIgKGN1 cnJlbnQtYnVmZmVyKSkpCiAgICAgKGJvb2ttYXJrLXNldC1hbm5vdGF0aW9uIGJvb2ttYXJrLW5h bWUgYW5ub3RhdGlvbikKICAgICAoc2V0cSBib29rbWFyay1hbGlzdC1tb2RpZmljYXRpb24tY291 bnQKICAgICAgICAgICAoMSsgYm9va21hcmstYWxpc3QtbW9kaWZpY2F0aW9uLWNvdW50KSkKLSAg ICAoYm9va21hcmstYm1lbnUtc3VycmVwdGl0aW91c2x5LXJlYnVpbGQtbGlzdCkpCi0gIChraWxs LWJ1ZmZlciAoY3VycmVudC1idWZmZXIpKSkKKyAgICAobWVzc2FnZSAiQW5ub3RhdGlvbiB1cGRh dGVkIGZvciBcIiVzXCIiIGJvb2ttYXJrLW5hbWUpCisgICAgKHF1aXQtd2luZG93KQorICAgIChi b29rbWFyay1ibWVudS1zdXJyZXB0aXRpb3VzbHktcmVidWlsZC1saXN0KQorICAgICh3aGVuIGZy b20tYm9va21hcmstbGlzdAorICAgICAgKHBvcC10by1idWZmZXIgKGdldC1idWZmZXIgYm9va21h cmstYm1lbnUtYnVmZmVyKSkKKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAo dGV4dC1wcm9wZXJ0eS1zZWFyY2gtZm9yd2FyZCAnYm9va21hcmstbmFtZS1wcm9wIGJvb2ttYXJr LW5hbWUpKQorICAgIChraWxsLWJ1ZmZlciBvbGQtYnVmZmVyKSkpCiAKIAotKGRlZnVuIGJvb2tt YXJrLWVkaXQtYW5ub3RhdGlvbiAoYm9va21hcmstbmFtZS1vci1yZWNvcmQpCi0gICJQb3AgdXAg YSBidWZmZXIgZm9yIGVkaXRpbmcgYm9va21hcmsgQk9PS01BUkstTkFNRS1PUi1SRUNPUkQncyBh bm5vdGF0aW9uLiIKKyhkZWZ1biBib29rbWFyay1lZGl0LWFubm90YXRpb24gKGJvb2ttYXJrLW5h bWUtb3ItcmVjb3JkICZvcHRpb25hbCBmcm9tLWJvb2ttYXJrLWxpc3QpCisgICJQb3AgdXAgYSBi dWZmZXIgZm9yIGVkaXRpbmcgYm9va21hcmsgQk9PS01BUkstTkFNRS1PUi1SRUNPUkQncyBhbm5v dGF0aW9uLgorSWYgb3B0aW9uYWwgYXJndW1lbnQgRlJPTS1CT09LTUFSSy1MSVNUIGlzIG5vbi1u aWwsIHJldHVybiB0byB0aGUKK2Jvb2ttYXJrIGxpc3Qgd2hlbiBlZGl0aW5nIGlzIGRvbmUuIgog ICAocG9wLXRvLWJ1ZmZlciAoZ2VuZXJhdGUtbmV3LWJ1ZmZlci1uYW1lICIqQm9va21hcmsgQW5u b3RhdGlvbiBDb21wb3NlKiIpKQogICAoYm9va21hcmstaW5zZXJ0LWFubm90YXRpb24gYm9va21h cmstbmFtZS1vci1yZWNvcmQpCiAgIChib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9kZSkKLSAg KHNldCAobWFrZS1sb2NhbC12YXJpYWJsZSAnYm9va21hcmstYW5ub3RhdGlvbi1uYW1lKQotICAg ICAgIGJvb2ttYXJrLW5hbWUtb3ItcmVjb3JkKSkKKyAgKHNldHEgYm9va21hcmstYW5ub3RhdGlv bi0tZnJvbS1ib29rbWFyay1saXN0IGZyb20tYm9va21hcmstbGlzdCkKKyAgKHNldHEgYm9va21h cmstYW5ub3RhdGlvbi0tbmFtZSBib29rbWFyay1uYW1lLW9yLXJlY29yZCkpCiAKIAogKGRlZnVu IGJvb2ttYXJrLWJ1ZmZlci1uYW1lICgpCkBAIC0xNTQ3LDEwICsxNTYzLDkgQEAgYm9va21hcmst bG9hZAogCShwcm9ncmVzcy1yZXBvcnRlci1kb25lIHJlcG9ydGVyKSkpKSkKIAogDAotOzs7IENv ZGUgc3VwcG9ydGluZyB0aGUgZGlyZWQtbGlrZSBib29rbWFyayBtZW51LgorOzs7IENvZGUgc3Vw cG9ydGluZyB0aGUgZGlyZWQtbGlrZSBib29rbWFyayBsaXN0LgogOzsgUHJlZml4IGlzICJib29r bWFyay1ibWVudSIgZm9yICJidWZmZXItbWVudSI6CiAKLQogKGRlZnZhciBib29rbWFyay1ibWVu dS1oaWRkZW4tYm9va21hcmtzICgpKQogCiAKQEAgLTE2MzQsNyArMTY0OSw3IEBAIGJvb2ttYXJr LWJtZW51LW1vZGUtbWFwCiAoZGVmdW4gYm9va21hcmstYm1lbnUtc3VycmVwdGl0aW91c2x5LXJl YnVpbGQtbGlzdCAoKQogICAiUmVidWlsZCB0aGUgQm9va21hcmsgTGlzdCBpZiBpdCBleGlzdHMu CiBEb24ndCBhZmZlY3QgdGhlIGJ1ZmZlciByaW5nIG9yZGVyLiIKLSAgKGlmIChnZXQtYnVmZmVy ICIqQm9va21hcmsgTGlzdCoiKQorICAoaWYgKGdldC1idWZmZXIgYm9va21hcmstYm1lbnUtYnVm ZmVyKQogICAgICAgKHNhdmUtZXhjdXJzaW9uCiAgICAgICAgIChzYXZlLXdpbmRvdy1leGN1cnNp b24KICAgICAgICAgICAoYm9va21hcmstYm1lbnUtbGlzdCkpKSkpCkBAIC0xNjQ4LDcgKzE2NjMs NyBAQCBib29rbWFyay1ibWVudS1saXN0CiBkZWxldGlvbiwgb3IgPiBpZiBpdCBpcyBmbGFnZ2Vk IGZvciBkaXNwbGF5aW5nLiIKICAgKGludGVyYWN0aXZlKQogICAoYm9va21hcmstbWF5YmUtbG9h ZC1kZWZhdWx0LWZpbGUpCi0gIChsZXQgKChidWYgKGdldC1idWZmZXItY3JlYXRlICIqQm9va21h cmsgTGlzdCoiKSkpCisgIChsZXQgKChidWYgKGdldC1idWZmZXItY3JlYXRlIGJvb2ttYXJrLWJt ZW51LWJ1ZmZlcikpKQogICAgIChpZiAoY2FsbGVkLWludGVyYWN0aXZlbHktcCAnaW50ZXJhY3Rp dmUpCiAgICAgICAgIChzd2l0Y2gtdG8tYnVmZmVyIGJ1ZikKICAgICAgIChzZXQtYnVmZmVyIGJ1 ZikpKQpAQCAtMjA1MSw3ICsyMDY2LDcgQEAgYm9va21hcmstYm1lbnUtZWRpdC1hbm5vdGF0aW9u CiAgICJFZGl0IHRoZSBhbm5vdGF0aW9uIGZvciB0aGUgY3VycmVudCBib29rbWFyayBpbiBhbm90 aGVyIHdpbmRvdy4iCiAgIChpbnRlcmFjdGl2ZSkKICAgKGxldCAoKGJvb2ttYXJrIChib29rbWFy ay1ibWVudS1ib29rbWFyaykpKQotICAgIChib29rbWFyay1lZGl0LWFubm90YXRpb24gYm9va21h cmspKSkKKyAgICAoYm9va21hcmstZWRpdC1hbm5vdGF0aW9uIGJvb2ttYXJrIHQpKSkKIAogCiAo ZGVmdW4gYm9va21hcmstYm1lbnUtdW5tYXJrICgmb3B0aW9uYWwgYmFja3VwKQpkaWZmIC0tZ2l0 IGEvdGVzdC9saXNwL2Jvb2ttYXJrLXRlc3RzLmVsIGIvdGVzdC9saXNwL2Jvb2ttYXJrLXRlc3Rz LmVsCmluZGV4IDZmYTBiMWU5OGQuLmE3NzRkYWU4OWQgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9i b29rbWFyay10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvYm9va21hcmstdGVzdHMuZWwKQEAgLTE4 Niw2ICsxODYsMTggQEAgYm9va21hcmstdGVzdHMtc2V0CiAgICAgICAgOzsgMy4gYm9va21hcmst c2V0LWludGVybmFsCiAgICAgICAgKHNob3VsZC1lcnJvciAoYm9va21hcmstc2V0LWludGVybmFs ICJmb28iICJiYXIiIHQpKSkpKSkKIAorKGVydC1kZWZ0ZXN0IGJvb2ttYXJrLXRlc3RzLXNldC9i b29rbWFyay11c2UtYW5ub3RhdGlvbnMtdCAoKQorICAod2l0aC1ib29rbWFyay10ZXN0LWZpbGUK KyAgIChsZXQgKChib29rbWFyay11c2UtYW5ub3RhdGlvbnMgdCkpCisgICAgIChzYXZlLXdpbmRv dy1leGN1cnNpb24KKyAgICAgICAoc3dpdGNoLXRvLWJ1ZmZlciBidWZmZXIpCisgICAgICAgOzsg U2hvdWxkIGp1bXAgdG8gZWRpdCBhbm5vdGF0aW9uIGJ1ZmZlcgorICAgICAgIChib29rbWFyay1z ZXQgImZvbyIpCisgICAgICAgKHNob3VsZCAoZXF1YWwgbWFqb3ItbW9kZSAnYm9va21hcmstZWRp dC1hbm5vdGF0aW9uLW1vZGUpKQorICAgICAgIDs7IFNob3VsZCByZXR1cm4gdG8gdGhlIG9yaWdp bmFsIGJ1ZmZlcgorICAgICAgIChib29rbWFyay1zZW5kLWVkaXRlZC1hbm5vdGF0aW9uKQorICAg ICAgIChzaG91bGQgKGVxdWFsIChjdXJyZW50LWJ1ZmZlcikgYnVmZmVyKSkpKSkpCisKIChlcnQt ZGVmdGVzdCBib29rbWFyay10ZXN0cy1raWxsLWxpbmUgKCkKICAgKHdpdGgtdGVtcC1idWZmZXIK ICAgICAoaW5zZXJ0ICJmb29iYXJcbiIpCkBAIC0zMTMsNyArMzI1LDQyIEBAIGJvb2ttYXJrLXRl c3RzLWxvYWQKICAgICAgICAgICAgICAgICAgICAgKGxpc3QgYm9va21hcmstdGVzdHMtYm9va21h cmsKICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgIm5hbWU8Mj4iIChjZHIgYm9va21h cmstdGVzdHMtYm9va21hcmspKSkpKSkpKQogCi07OyBUT0RPOiBBZGQgdGVzdHMgZm9yIGJvb2tt YXJrLWJtZW51LgorOzsgVE9ETzogQWRkIG1vcmUgdGVzdHMgZm9yIGJvb2ttYXJrLWJtZW51Lgor CisoZGVmbWFjcm8gd2l0aC1ib29rbWFyay1ibWVudS10ZXN0ICgmcmVzdCBib2R5KQorICAiQ3Jl YXRlIGVudmlyb25tZW50IGZvciB0ZXN0aW5nIGBib29rbWFyay1ibWVudS1saXN0JyBhbmQgZXZh bHVhdGUgQk9EWS4KK1NhbWUgYXMgYHdpdGgtYm9va21hcmstdGVzdCcgYnV0IHdpdGggYWRkaXRp b25zIHN1aXRhYmxlIGZvcgordGVzdGluZyBgYm9va21hcmstYm1lbnUtbGlzdCcuIgorICBgKHdp dGgtYm9va21hcmstdGVzdAorICAgIChsZXQgKChib29rbWFyay1ibWVudS1idWZmZXIgIipCb29r bWFyayBMaXN0IC0gVGVzdGluZyoiKSkKKyAgICAgICh1bndpbmQtcHJvdGVjdAorICAgICAgICAg IChzYXZlLXdpbmRvdy1leGN1cnNpb24KKyAgICAgICAgICAgIChib29rbWFyay1ibWVudS1saXN0 KQorICAgICAgICAgICAgLEBib2R5KQorICAgICAgICAoa2lsbC1idWZmZXIgYm9va21hcmstYm1l bnUtYnVmZmVyKSkpKSkKKworKGVydC1kZWZ0ZXN0IGJvb2ttYXJrLWJtZW51LmVudS1lZGl0LWFu bm90YXRpb24vc2hvdy1hbm5vdGF0aW9uICgpCisgICh3aXRoLWJvb2ttYXJrLWJtZW51LXRlc3QK KyAgIChib29rbWFyay1zZXQtYW5ub3RhdGlvbiAibmFtZSIgImZvbyIpCisgICAoYm9va21hcmst Ym1lbnUtZWRpdC1hbm5vdGF0aW9uKQorICAgKHNob3VsZCAoc3RyaW5nLW1hdGNoICJmb28iIChi dWZmZXItc3RyaW5nKSkpCisgICAoa2lsbC1idWZmZXIgKGN1cnJlbnQtYnVmZmVyKSkpKQorCiso ZXJ0LWRlZnRlc3QgYm9va21hcmstYm1lbnUtc2VuZC1lZGl0ZWQtYW5ub3RhdGlvbiAoKQorICAo d2l0aC1ib29rbWFyay1ibWVudS10ZXN0CisgICAoYm9va21hcmstYm1lbnUtZWRpdC1hbm5vdGF0 aW9uKQorICAgKGluc2VydCAiZm9vIikKKyAgIChib29rbWFyay1zZW5kLWVkaXRlZC1hbm5vdGF0 aW9uKQorICAgKHNob3VsZCAoZXF1YWwgKGJvb2ttYXJrLWdldC1hbm5vdGF0aW9uICJuYW1lIikg ImZvbyIpKSkpCisKKyhlcnQtZGVmdGVzdCBib29rbWFyay1ibWVudS1zZW5kLWVkaXRlZC1hbm5v dGF0aW9uL3Jlc3RvcmUtZm9jdXMgKCkKKyAgIlRlc3QgZm9yIGh0dHBzOi8vZGViYnVncy5nbnUu b3JnLzIwMTUwIC4iCisgICh3aXRoLWJvb2ttYXJrLWJtZW51LXRlc3QKKyAgIChib29rbWFyay1i bWVudS1lZGl0LWFubm90YXRpb24pCisgICAoaW5zZXJ0ICJmb28iKQorICAgKGJvb2ttYXJrLXNl bmQtZWRpdGVkLWFubm90YXRpb24pCisgICAoc2hvdWxkIChlcXVhbCAoYnVmZmVyLW5hbWUgKGN1 cnJlbnQtYnVmZmVyKSkgYm9va21hcmstYm1lbnUtYnVmZmVyKSkKKyAgIChzaG91bGQgKGxvb2tp bmctYXQgIm5hbWUiKSkpKQogCiAocHJvdmlkZSAnYm9va21hcmstdGVzdHMpCiA7OzsgYm9va21h cmstdGVzdHMuZWwgZW5kcyBoZXJlCi0tIAoyLjIxLjAKCg== --0000000000001cbf42058ce0287d--