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: Sat, 13 Jul 2019 15:09:39 +0200 Message-ID: References: <83r26u1jeu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000ffaaf5058d8fbd34" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="256014"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 20150@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jul 13 15:10:12 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 1hmHmz-0014Np-NA for geb-bug-gnu-emacs@m.gmane.org; Sat, 13 Jul 2019 15:10:09 +0200 Original-Received: from localhost ([::1]:55286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmHmy-0003pU-Cw for geb-bug-gnu-emacs@m.gmane.org; Sat, 13 Jul 2019 09:10:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47259) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmHmu-0003p5-HM for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2019 09:10:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmHms-0004qi-N4 for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2019 09:10:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:32768) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hmHms-0004qd-J4 for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2019 09:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hmHms-00024j-9i for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2019 09:10: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: Sat, 13 Jul 2019 13:10: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.15630233997965 (code B ref 20150); Sat, 13 Jul 2019 13:10:02 +0000 Original-Received: (at 20150) by debbugs.gnu.org; 13 Jul 2019 13:09:59 +0000 Original-Received: from localhost ([127.0.0.1]:41589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmHmo-00024O-Ql for submit@debbugs.gnu.org; Sat, 13 Jul 2019 09:09:59 -0400 Original-Received: from mail-wm1-f41.google.com ([209.85.128.41]:54590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hmHmm-000249-S3 for 20150@debbugs.gnu.org; Sat, 13 Jul 2019 09:09:57 -0400 Original-Received: by mail-wm1-f41.google.com with SMTP id p74so11149174wme.4 for <20150@debbugs.gnu.org>; Sat, 13 Jul 2019 06:09:56 -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:to:cc; bh=9be06F2bMUiS4CfPkpMKnrSZdPZ57hD0XSdkJPpYt/E=; b=toKqC+QosV38tjWyiKMGtk4mgjhdhfUaaoqCJCRb23RUpq9U8coWLRirHsqKPcA53c Cjtjzi+yTJGRCHDKtCxKWwvURgw39kwNnQLHXvPudLkUX7y3NGZrguOwqMYJlkmHgfS3 gfF2gaCwa71Xe8iWm+9jm3t526n1HBqXp7p1oWsm/IIZhUgxtEhO01lpXkIga0025QPV 3LSOKncpFVXCdbnipWL9WJNM8BIPwj01bETHju2HpGX4HD1xYj6TRWTV+I03ppQZb5Vo kn34b+sTVHmH5pXpQiwOrKGt2+LKHJejni0ZZ+DhToFIMq3aFQvbe+B2Tx6+rtFXmc6m nFqA== X-Gm-Message-State: APjAAAXSrjY4i2JQzVZxB0JMD5YAF+fEYSJjVfpyOroCWkLvVWIcYRdW QlXJeYmpXDWX+KC+AiMtP8jMwXPIZOYplKzWtjtszpFl X-Google-Smtp-Source: APXvYqwgWdWbwY5jgkbafFRP5+fKa1n2OcryYLKgVZdd0o0uZYXIJc5CJAHF8YCjoqPqNw8CDFquX37QG8hScQ4OE30= X-Received: by 2002:a7b:c04f:: with SMTP id u15mr14611732wmc.106.1563023391029; Sat, 13 Jul 2019 06:09:51 -0700 (PDT) In-Reply-To: <83r26u1jeu.fsf@gnu.org> 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:162872 Archived-At: --000000000000ffaaf5058d8fbd34 Content-Type: text/plain; charset="UTF-8" Eli Zaretskii writes: > > +(define-obsolete-variable-alias 'bookmark-annotation-name > > + 'bookmark-annotation--name "27.1") > > Hmm... we declare a non-internal variable obsolete and replace it with > an internal variable? Why is that a good idea? Does the new variable > have to be internal? I thought about it a bit more, and I guess it doesn't have to be internal. I suggest that the new variable should be kept internal for now though. I also don't know why I named the new variable bookmark-annotation--name, so I've changed that to bookmark--annotation-name to better reflect current practices. Please see this updated patch with those two changes. Thanks, Stefan Kangas --000000000000ffaaf5058d8fbd34 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Restore-focus-to-Bookmark-List-after-editing-annotat.patch" Content-Disposition: attachment; filename="0001-Restore-focus-to-Bookmark-List-after-editing-annotat.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jy1jr2lr0 RnJvbSA2NjUwYzRmNTFlZWFiNGJmYWYyZTE5ZDBiYTIwOTI4N2EwNTgwNGE4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5rYW5nYXNAZ21haWwuY29t PgpEYXRlOiBUdWUsIDIgSnVsIDIwMTkgMDM6MDY6MzcgKzAyMDAKU3ViamVjdDogW1BBVENIXSBS ZXN0b3JlIGZvY3VzIHRvIEJvb2ttYXJrIExpc3QgYWZ0ZXIgZWRpdGluZyBhbm5vdGF0aW9uCgpU aGVyZSBhcmUgdHdvIGVudHJ5IHBvaW50cyB0byBib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9k ZTogdGhlIGZpcnN0CndoZW4gd2UgYWRkIGEgYm9va21hcmsgYW5kIGJvb2ttYXJrLXVzZS1hbm5v dGF0aW9ucyBpcyBub24tbmlsOyB0aGUKc2Vjb25kIHdoZW4gYm9va21hcmstYm1lbnUtZWRpdC1h bm5vdGF0aW9uIGlzIHJ1biBmcm9tIHRoZSBib29rbWFyawpsaXN0LiAgV2hlbiBlZGl0aW5nIGlz IGNvbmNsdWRlZCwgaW4gdGhlIGZpcnN0IGNhc2UsIHdlIHNob3VsZCBqdXN0CnF1aXQgd2luZG93 LiAgSW4gdGhlIHNlY29uZCBjYXNlLCB3ZSBzaG91bGQgaW5zdGVhZCByZXR1cm4gdG8gdGhlCmJv b2ttYXJrIGxpc3QuCgoqIGxpc3AvYm9va21hcmsuZWwgKHRleHQtcHJvcGVydHktc2VhcmNoKTog UmVxdWlyZS4KKGJvb2ttYXJrLWFubm90YXRpb24tbmFtZSk6IE1ha2UgYnVmZmVyLWxvY2FsIGFu ZCBpbXByb3ZlIGRvYyBzdHJpbmcuCihib29rbWFyay0tYW5ub3RhdGlvbi1mcm9tLWJvb2ttYXJr LWxpc3QpOiBOZXcgYnVmZmVyLWxvY2FsIHZhcmlhYmxlLgooYm9va21hcmstZWRpdC1hbm5vdGF0 aW9uKTogTmV3IGFyZ3VtZW50IGZyb20tYm9va21hcmstbGlzdCBzZXRzCmJvb2ttYXJrLS1hbm5v dGF0aW9uLWZyb20tYm9va21hcmstbGlzdC4KKGJvb2ttYXJrLWJtZW51LWVkaXQtYW5ub3RhdGlv bik6IENhbGwgYm9va21hcmstZWRpdC1hbm5vdGF0aW9uIHdpdGgKYXJndW1lbnQgZnJvbS1ib29r bWFyay1saXN0IHNldCB0byB0LgooYm9va21hcmstc2VuZC1lZGl0ZWQtYW5ub3RhdGlvbik6IFdo ZW4gZWRpdGluZyBvcmlnaW5hdGVkIGluIHRoZQpib29rbWFyayBsaXN0LCByZXN0b3JlIGZvY3Vz IHRvIGJvb2ttYXJrIGxpc3QgYW5kIG1vdmUgcG9pbnQgYmFjayB0bwplZGl0ZWQgYm9va21hcmsu IChCdWcjMjAxNTApCgooYm9va21hcmstZWRpdC1hbm5vdGF0aW9uLW1vZGUpOiBGaXggdHlwby4K KGJvb2ttYXJrLWJtZW51LWJ1ZmZlcik6IE5ldyB2YXJpYWJsZS4KKGJvb2ttYXJrLWJtZW51LXN1 cnJlcHRpdGlvdXNseS1yZWJ1aWxkLWxpc3QpCihib29rbWFyay1ibWVudS1saXN0KTogVXNlIGl0 LgoKKiB0ZXN0L2xpc3AvYm9va21hcmstdGVzdHMuZWwgKHdpdGgtYm9va21hcmstYm1lbnUtdGVz dCk6IE5ldyBtYWNyby4KKGJvb2ttYXJrLXRlc3RzLXNldC9ib29rbWFyay11c2UtYW5ub3RhdGlv bnMtdCkKKGJvb2ttYXJrLWJtZW51LWVkaXQtYW5ub3RhdGlvbi9zaG93LWFubm90YXRpb24pCihi b29rbWFyay1ibWVudS1zZW5kLWVkaXRlZC1hbm5vdGF0aW9uKQooYm9va21hcmstYm1lbnUtc2Vu ZC1lZGl0ZWQtYW5ub3RhdGlvbi9yZXN0b3JlLWZvY3VzKTogTmV3IHRlc3QgY2FzZXMuCi0tLQog bGlzcC9ib29rbWFyay5lbCAgICAgICAgICAgIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tCiB0ZXN0L2xpc3AvYm9va21hcmstdGVzdHMuZWwgfCA0OSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hh bmdlZCwgNzkgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlz cC9ib29rbWFyay5lbCBiL2xpc3AvYm9va21hcmsuZWwKaW5kZXggMjY0MGIyMTU3YS4uZjU2NGNk NmI0MyAxMDA2NDQKLS0tIGEvbGlzcC9ib29rbWFyay5lbAorKysgYi9saXNwL2Jvb2ttYXJrLmVs CkBAIC0zMiw2ICszMiw3IEBACiA7OzsgQ29kZToKIAogKHJlcXVpcmUgJ3BwKQorKHJlcXVpcmUg J3RleHQtcHJvcGVydHktc2VhcmNoKQogKGV2YWwtd2hlbi1jb21waWxlIChyZXF1aXJlICdjbC1s aWIpKQogCiA7OzsgTWlzYyBjb21tZW50czoKQEAgLTEyMiw2ICsxMjMsOSBAQCBib29rbWFyay1h dXRvbWF0aWNhbGx5LXNob3ctYW5ub3RhdGlvbnMKICAgIk5vbi1uaWwgbWVhbnMgc2hvdyBhbm5v dGF0aW9ucyB3aGVuIGp1bXBpbmcgdG8gYSBib29rbWFyay4iCiAgIDp0eXBlICdib29sZWFuKQog CisoZGVmY29uc3QgYm9va21hcmstYm1lbnUtYnVmZmVyICIqQm9va21hcmsgTGlzdCoiCisgICJO YW1lIG9mIGJ1ZmZlciB1c2VkIGZvciBCb29rbWFyayBMaXN0LiIpCisKIChkZWZjdXN0b20gYm9v a21hcmstYm1lbnUtdXNlLWhlYWRlci1saW5lIHQKICAgIk5vbi1uaWwgbWVhbnMgdG8gdXNlIGFu IGltbW92YWJsZSBoZWFkZXIgbGluZS4KIFRoaXMgaXMgYXMgb3Bwb3NlZCB0byBpbmxpbmUgdGV4 dCBhdCB0aGUgdG9wIG9mIHRoZSBidWZmZXIuIgpAQCAtODg5LDEzICs4OTMsMTMgQEAgYm9va21h cmsta2lsbC1saW5lCiAgICAgKHdoZW4gKGFuZCBuZXdsaW5lLXRvbyAoPSAoZm9sbG93aW5nLWNo YXIpID9cbikpCiAgICAgICAoZGVsZXRlLWNoYXIgMSkpKSkKIAotCi07OyBEZWZ2YXJzIHRvIGF2 b2lkIGNvbXBpbGF0aW9uIHdhcm5pbmdzOgogKGRlZnZhciBib29rbWFyay1hbm5vdGF0aW9uLW5h bWUgbmlsCi0gICJWYXJpYWJsZSBob2xkaW5nIHRoZSBuYW1lIG9mIHRoZSBib29rbWFyay4KLVRo aXMgaXMgdXNlZCBpbiBgYm9va21hcmstZWRpdC1hbm5vdGF0aW9uJyB0byByZWNvcmQgdGhlIGJv b2ttYXJrCi13aG9zZSBhbm5vdGF0aW9uIGlzIGJlaW5nIGVkaXRlZC4iKQorICAiTmFtZSBvZiBi b29rbWFyayB1bmRlciBlZGl0IGluIGBib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9kZScuIikK KyhtYWtlLXZhcmlhYmxlLWJ1ZmZlci1sb2NhbCAnYm9va21hcmstYW5ub3RhdGlvbi1uYW1lKQog CisoZGVmdmFyIGJvb2ttYXJrLS1hbm5vdGF0aW9uLWZyb20tYm9va21hcmstbGlzdCBuaWwKKyAg IklmIG5vbi1uaWwsIGBib29rbWFyay1lZGl0LWFubm90YXRpb24tbW9kZScgc2hvdWxkIHJldHVy biB0byBib29rbWFyayBsaXN0LiIpCisobWFrZS12YXJpYWJsZS1idWZmZXItbG9jYWwgJ2Jvb2tt YXJrLS1hbm5vdGF0aW9uLWZyb20tYm9va21hcmstbGlzdCkKIAogKGRlZnVuIGJvb2ttYXJrLWRl ZmF1bHQtYW5ub3RhdGlvbi10ZXh0IChib29rbWFyay1uYW1lKQogICAiUmV0dXJuIGRlZmF1bHQg YW5ub3RhdGlvbiB0ZXh0IGZvciBCT09LTUFSSy1OQU1FLgpAQCAtOTM3LDcgKzk0MSw3IEBAIGJv b2ttYXJrLWluc2VydC1hbm5vdGF0aW9uCiAoZGVmaW5lLWRlcml2ZWQtbW9kZSBib29rbWFyay1l ZGl0LWFubm90YXRpb24tbW9kZQogICB0ZXh0LW1vZGUgIkVkaXQgQm9va21hcmsgQW5ub3RhdGlv biIKICAgIk1vZGUgZm9yIGVkaXRpbmcgdGhlIGFubm90YXRpb24gb2YgYm9va21hcmtzLgotV2hl biB5b3UgaGF2ZSBmaW5pc2hlZCBjb21wb3NpbmcsIHR5cGUgXFxbYm9va21hcmstc2VuZC1hbm5v dGF0aW9uXS4KK1doZW4geW91IGhhdmUgZmluaXNoZWQgY29tcG9zaW5nLCB0eXBlIFxcW2Jvb2tt YXJrLXNlbmQtZWRpdGVkLWFubm90YXRpb25dLgogCiBcXHtib29rbWFyay1lZGl0LWFubm90YXRp b24tbW9kZS1tYXB9IikKIApAQCAtOTU1LDIxICs5NTksMzEgQEAgYm9va21hcmstc2VuZC1lZGl0 ZWQtYW5ub3RhdGlvbgogICAgICAgKGZvcndhcmQtbGluZSAxKSkpCiAgIDs7IFRha2Ugbm8gY2hh bmNlcyB3aXRoIHRleHQgcHJvcGVydGllcy4KICAgKGxldCAoKGFubm90YXRpb24gKGJ1ZmZlci1z dWJzdHJpbmctbm8tcHJvcGVydGllcyAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpCi0JKGJvb2tt YXJrLW5hbWUgYm9va21hcmstYW5ub3RhdGlvbi1uYW1lKSkKKyAgICAgICAgKGJvb2ttYXJrLW5h bWUgYm9va21hcmstYW5ub3RhdGlvbi1uYW1lKQorICAgICAgICAoZnJvbS1ib29rbWFyay1saXN0 IGJvb2ttYXJrLS1hbm5vdGF0aW9uLWZyb20tYm9va21hcmstbGlzdCkKKyAgICAgICAgKG9sZC1i dWZmZXIgKGN1cnJlbnQtYnVmZmVyKSkpCiAgICAgKGJvb2ttYXJrLXNldC1hbm5vdGF0aW9uIGJv b2ttYXJrLW5hbWUgYW5ub3RhdGlvbikKICAgICAoc2V0cSBib29rbWFyay1hbGlzdC1tb2RpZmlj YXRpb24tY291bnQKICAgICAgICAgICAoMSsgYm9va21hcmstYWxpc3QtbW9kaWZpY2F0aW9uLWNv dW50KSkKLSAgICAoYm9va21hcmstYm1lbnUtc3VycmVwdGl0aW91c2x5LXJlYnVpbGQtbGlzdCkp Ci0gIChraWxsLWJ1ZmZlciAoY3VycmVudC1idWZmZXIpKSkKKyAgICAobWVzc2FnZSAiQW5ub3Rh dGlvbiB1cGRhdGVkIGZvciBcIiVzXCIiIGJvb2ttYXJrLW5hbWUpCisgICAgKHF1aXQtd2luZG93 KQorICAgIChib29rbWFyay1ibWVudS1zdXJyZXB0aXRpb3VzbHktcmVidWlsZC1saXN0KQorICAg ICh3aGVuIGZyb20tYm9va21hcmstbGlzdAorICAgICAgKHBvcC10by1idWZmZXIgKGdldC1idWZm ZXIgYm9va21hcmstYm1lbnUtYnVmZmVyKSkKKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikp CisgICAgICAodGV4dC1wcm9wZXJ0eS1zZWFyY2gtZm9yd2FyZCAnYm9va21hcmstbmFtZS1wcm9w IGJvb2ttYXJrLW5hbWUpKQorICAgIChraWxsLWJ1ZmZlciBvbGQtYnVmZmVyKSkpCiAKIAotKGRl ZnVuIGJvb2ttYXJrLWVkaXQtYW5ub3RhdGlvbiAoYm9va21hcmstbmFtZS1vci1yZWNvcmQpCi0g ICJQb3AgdXAgYSBidWZmZXIgZm9yIGVkaXRpbmcgYm9va21hcmsgQk9PS01BUkstTkFNRS1PUi1S RUNPUkQncyBhbm5vdGF0aW9uLiIKKyhkZWZ1biBib29rbWFyay1lZGl0LWFubm90YXRpb24gKGJv b2ttYXJrLW5hbWUtb3ItcmVjb3JkICZvcHRpb25hbCBmcm9tLWJvb2ttYXJrLWxpc3QpCisgICJQ b3AgdXAgYSBidWZmZXIgZm9yIGVkaXRpbmcgYm9va21hcmsgQk9PS01BUkstTkFNRS1PUi1SRUNP UkQncyBhbm5vdGF0aW9uLgorSWYgb3B0aW9uYWwgYXJndW1lbnQgRlJPTS1CT09LTUFSSy1MSVNU IGlzIG5vbi1uaWwsIHJldHVybiB0byB0aGUKK2Jvb2ttYXJrIGxpc3Qgd2hlbiBlZGl0aW5nIGlz IGRvbmUuIgogICAocG9wLXRvLWJ1ZmZlciAoZ2VuZXJhdGUtbmV3LWJ1ZmZlci1uYW1lICIqQm9v a21hcmsgQW5ub3RhdGlvbiBDb21wb3NlKiIpKQogICAoYm9va21hcmstaW5zZXJ0LWFubm90YXRp b24gYm9va21hcmstbmFtZS1vci1yZWNvcmQpCiAgIChib29rbWFyay1lZGl0LWFubm90YXRpb24t bW9kZSkKLSAgKHNldCAobWFrZS1sb2NhbC12YXJpYWJsZSAnYm9va21hcmstYW5ub3RhdGlvbi1u YW1lKQotICAgICAgIGJvb2ttYXJrLW5hbWUtb3ItcmVjb3JkKSkKKyAgKHNldHEgYm9va21hcmst LWFubm90YXRpb24tZnJvbS1ib29rbWFyay1saXN0IGZyb20tYm9va21hcmstbGlzdCkKKyAgKHNl dHEgYm9va21hcmstYW5ub3RhdGlvbi1uYW1lIGJvb2ttYXJrLW5hbWUtb3ItcmVjb3JkKSkKIAog CiAoZGVmdW4gYm9va21hcmstYnVmZmVyLW5hbWUgKCkKQEAgLTE1NTUsMTAgKzE1NjksOSBAQCBi b29rbWFyay1sb2FkCiAJKHByb2dyZXNzLXJlcG9ydGVyLWRvbmUgcmVwb3J0ZXIpKSkpKQogCiAM Ci07OzsgQ29kZSBzdXBwb3J0aW5nIHRoZSBkaXJlZC1saWtlIGJvb2ttYXJrIG1lbnUuCis7Ozsg Q29kZSBzdXBwb3J0aW5nIHRoZSBkaXJlZC1saWtlIGJvb2ttYXJrIGxpc3QuCiA7OyBQcmVmaXgg aXMgImJvb2ttYXJrLWJtZW51IiBmb3IgImJ1ZmZlci1tZW51IjoKIAotCiAoZGVmdmFyIGJvb2tt YXJrLWJtZW51LWhpZGRlbi1ib29rbWFya3MgKCkpCiAKIApAQCAtMTY0Miw3ICsxNjU1LDcgQEAg Ym9va21hcmstYm1lbnUtbW9kZS1tYXAKIChkZWZ1biBib29rbWFyay1ibWVudS1zdXJyZXB0aXRp b3VzbHktcmVidWlsZC1saXN0ICgpCiAgICJSZWJ1aWxkIHRoZSBCb29rbWFyayBMaXN0IGlmIGl0 IGV4aXN0cy4KIERvbid0IGFmZmVjdCB0aGUgYnVmZmVyIHJpbmcgb3JkZXIuIgotICAoaWYgKGdl dC1idWZmZXIgIipCb29rbWFyayBMaXN0KiIpCisgIChpZiAoZ2V0LWJ1ZmZlciBib29rbWFyay1i bWVudS1idWZmZXIpCiAgICAgICAoc2F2ZS1leGN1cnNpb24KICAgICAgICAgKHNhdmUtd2luZG93 LWV4Y3Vyc2lvbgogICAgICAgICAgIChib29rbWFyay1ibWVudS1saXN0KSkpKSkKQEAgLTE2NTYs NyArMTY2OSw3IEBAIGJvb2ttYXJrLWJtZW51LWxpc3QKIGRlbGV0aW9uLCBvciA+IGlmIGl0IGlz IGZsYWdnZWQgZm9yIGRpc3BsYXlpbmcuIgogICAoaW50ZXJhY3RpdmUpCiAgIChib29rbWFyay1t YXliZS1sb2FkLWRlZmF1bHQtZmlsZSkKLSAgKGxldCAoKGJ1ZiAoZ2V0LWJ1ZmZlci1jcmVhdGUg IipCb29rbWFyayBMaXN0KiIpKSkKKyAgKGxldCAoKGJ1ZiAoZ2V0LWJ1ZmZlci1jcmVhdGUgYm9v a21hcmstYm1lbnUtYnVmZmVyKSkpCiAgICAgKGlmIChjYWxsZWQtaW50ZXJhY3RpdmVseS1wICdp bnRlcmFjdGl2ZSkKICAgICAgICAgKHN3aXRjaC10by1idWZmZXIgYnVmKQogICAgICAgKHNldC1i dWZmZXIgYnVmKSkpCkBAIC0yMDU5LDcgKzIwNzIsNyBAQCBib29rbWFyay1ibWVudS1lZGl0LWFu bm90YXRpb24KICAgIkVkaXQgdGhlIGFubm90YXRpb24gZm9yIHRoZSBjdXJyZW50IGJvb2ttYXJr IGluIGFub3RoZXIgd2luZG93LiIKICAgKGludGVyYWN0aXZlKQogICAobGV0ICgoYm9va21hcmsg KGJvb2ttYXJrLWJtZW51LWJvb2ttYXJrKSkpCi0gICAgKGJvb2ttYXJrLWVkaXQtYW5ub3RhdGlv biBib29rbWFyaykpKQorICAgIChib29rbWFyay1lZGl0LWFubm90YXRpb24gYm9va21hcmsgdCkp KQogCiAKIChkZWZ1biBib29rbWFyay1ibWVudS11bm1hcmsgKCZvcHRpb25hbCBiYWNrdXApCmRp ZmYgLS1naXQgYS90ZXN0L2xpc3AvYm9va21hcmstdGVzdHMuZWwgYi90ZXN0L2xpc3AvYm9va21h cmstdGVzdHMuZWwKaW5kZXggNmZhMGIxZTk4ZC4uYTc3NGRhZTg5ZCAxMDA2NDQKLS0tIGEvdGVz dC9saXNwL2Jvb2ttYXJrLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9ib29rbWFyay10ZXN0cy5l bApAQCAtMTg2LDYgKzE4NiwxOCBAQCBib29rbWFyay10ZXN0cy1zZXQKICAgICAgICA7OyAzLiBi b29rbWFyay1zZXQtaW50ZXJuYWwKICAgICAgICAoc2hvdWxkLWVycm9yIChib29rbWFyay1zZXQt aW50ZXJuYWwgImZvbyIgImJhciIgdCkpKSkpKQogCisoZXJ0LWRlZnRlc3QgYm9va21hcmstdGVz dHMtc2V0L2Jvb2ttYXJrLXVzZS1hbm5vdGF0aW9ucy10ICgpCisgICh3aXRoLWJvb2ttYXJrLXRl c3QtZmlsZQorICAgKGxldCAoKGJvb2ttYXJrLXVzZS1hbm5vdGF0aW9ucyB0KSkKKyAgICAgKHNh dmUtd2luZG93LWV4Y3Vyc2lvbgorICAgICAgIChzd2l0Y2gtdG8tYnVmZmVyIGJ1ZmZlcikKKyAg ICAgICA7OyBTaG91bGQganVtcCB0byBlZGl0IGFubm90YXRpb24gYnVmZmVyCisgICAgICAgKGJv b2ttYXJrLXNldCAiZm9vIikKKyAgICAgICAoc2hvdWxkIChlcXVhbCBtYWpvci1tb2RlICdib29r bWFyay1lZGl0LWFubm90YXRpb24tbW9kZSkpCisgICAgICAgOzsgU2hvdWxkIHJldHVybiB0byB0 aGUgb3JpZ2luYWwgYnVmZmVyCisgICAgICAgKGJvb2ttYXJrLXNlbmQtZWRpdGVkLWFubm90YXRp b24pCisgICAgICAgKHNob3VsZCAoZXF1YWwgKGN1cnJlbnQtYnVmZmVyKSBidWZmZXIpKSkpKSkK KwogKGVydC1kZWZ0ZXN0IGJvb2ttYXJrLXRlc3RzLWtpbGwtbGluZSAoKQogICAod2l0aC10ZW1w LWJ1ZmZlcgogICAgIChpbnNlcnQgImZvb2JhclxuIikKQEAgLTMxMyw3ICszMjUsNDIgQEAgYm9v a21hcmstdGVzdHMtbG9hZAogICAgICAgICAgICAgICAgICAgICAobGlzdCBib29rbWFyay10ZXN0 cy1ib29rbWFyawogICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAibmFtZTwyPiIgKGNk ciBib29rbWFyay10ZXN0cy1ib29rbWFyaykpKSkpKSkpCiAKLTs7IFRPRE86IEFkZCB0ZXN0cyBm b3IgYm9va21hcmstYm1lbnUuCis7OyBUT0RPOiBBZGQgbW9yZSB0ZXN0cyBmb3IgYm9va21hcmst Ym1lbnUuCisKKyhkZWZtYWNybyB3aXRoLWJvb2ttYXJrLWJtZW51LXRlc3QgKCZyZXN0IGJvZHkp CisgICJDcmVhdGUgZW52aXJvbm1lbnQgZm9yIHRlc3RpbmcgYGJvb2ttYXJrLWJtZW51LWxpc3Qn IGFuZCBldmFsdWF0ZSBCT0RZLgorU2FtZSBhcyBgd2l0aC1ib29rbWFyay10ZXN0JyBidXQgd2l0 aCBhZGRpdGlvbnMgc3VpdGFibGUgZm9yCit0ZXN0aW5nIGBib29rbWFyay1ibWVudS1saXN0Jy4i CisgIGAod2l0aC1ib29rbWFyay10ZXN0CisgICAgKGxldCAoKGJvb2ttYXJrLWJtZW51LWJ1ZmZl ciAiKkJvb2ttYXJrIExpc3QgLSBUZXN0aW5nKiIpKQorICAgICAgKHVud2luZC1wcm90ZWN0Cisg ICAgICAgICAgKHNhdmUtd2luZG93LWV4Y3Vyc2lvbgorICAgICAgICAgICAgKGJvb2ttYXJrLWJt ZW51LWxpc3QpCisgICAgICAgICAgICAsQGJvZHkpCisgICAgICAgIChraWxsLWJ1ZmZlciBib29r bWFyay1ibWVudS1idWZmZXIpKSkpKQorCisoZXJ0LWRlZnRlc3QgYm9va21hcmstYm1lbnUuZW51 LWVkaXQtYW5ub3RhdGlvbi9zaG93LWFubm90YXRpb24gKCkKKyAgKHdpdGgtYm9va21hcmstYm1l bnUtdGVzdAorICAgKGJvb2ttYXJrLXNldC1hbm5vdGF0aW9uICJuYW1lIiAiZm9vIikKKyAgIChi b29rbWFyay1ibWVudS1lZGl0LWFubm90YXRpb24pCisgICAoc2hvdWxkIChzdHJpbmctbWF0Y2gg ImZvbyIgKGJ1ZmZlci1zdHJpbmcpKSkKKyAgIChraWxsLWJ1ZmZlciAoY3VycmVudC1idWZmZXIp KSkpCisKKyhlcnQtZGVmdGVzdCBib29rbWFyay1ibWVudS1zZW5kLWVkaXRlZC1hbm5vdGF0aW9u ICgpCisgICh3aXRoLWJvb2ttYXJrLWJtZW51LXRlc3QKKyAgIChib29rbWFyay1ibWVudS1lZGl0 LWFubm90YXRpb24pCisgICAoaW5zZXJ0ICJmb28iKQorICAgKGJvb2ttYXJrLXNlbmQtZWRpdGVk LWFubm90YXRpb24pCisgICAoc2hvdWxkIChlcXVhbCAoYm9va21hcmstZ2V0LWFubm90YXRpb24g Im5hbWUiKSAiZm9vIikpKSkKKworKGVydC1kZWZ0ZXN0IGJvb2ttYXJrLWJtZW51LXNlbmQtZWRp dGVkLWFubm90YXRpb24vcmVzdG9yZS1mb2N1cyAoKQorICAiVGVzdCBmb3IgaHR0cHM6Ly9kZWJi dWdzLmdudS5vcmcvMjAxNTAgLiIKKyAgKHdpdGgtYm9va21hcmstYm1lbnUtdGVzdAorICAgKGJv b2ttYXJrLWJtZW51LWVkaXQtYW5ub3RhdGlvbikKKyAgIChpbnNlcnQgImZvbyIpCisgICAoYm9v a21hcmstc2VuZC1lZGl0ZWQtYW5ub3RhdGlvbikKKyAgIChzaG91bGQgKGVxdWFsIChidWZmZXIt bmFtZSAoY3VycmVudC1idWZmZXIpKSBib29rbWFyay1ibWVudS1idWZmZXIpKQorICAgKHNob3Vs ZCAobG9va2luZy1hdCAibmFtZSIpKSkpCiAKIChwcm92aWRlICdib29rbWFyay10ZXN0cykKIDs7 OyBib29rbWFyay10ZXN0cy5lbCBlbmRzIGhlcmUKLS0gCjIuMTEuMAoK --000000000000ffaaf5058d8fbd34--