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#56896: 29.0.50; [PATCH] Make the bookmark fringe icon look like a bookmark Date: Thu, 4 Aug 2022 21:41:56 -0700 Message-ID: <7566691d-090e-f380-b395-4d2aa2fdebdb@gmail.com> References: <39a51230-2a0f-4eb7-a811-e4509a826f5d@gmail.com> <83tu6u5u9r.fsf@gnu.org> <57ab6ad0-8b1f-ac3c-b675-bc4131d3e0c2@gmail.com> <83sfme5acq.fsf@gnu.org> <3b7b3223-3710-c57b-4c75-eb050eec63a9@gmail.com> <83edxw4hzn.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2D4DBE4B10623A0DADBE3CD3" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9842"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 56896@debbugs.gnu.org To: Eli Zaretskii , Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Aug 05 06:43:11 2022 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 1oJpB0-0002MF-M3 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Aug 2022 06:43:10 +0200 Original-Received: from localhost ([::1]:46234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJpAz-00012M-61 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 05 Aug 2022 00:43:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJpAr-00011y-VB for bug-gnu-emacs@gnu.org; Fri, 05 Aug 2022 00:43:01 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:37663) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJpAr-0003vl-Mr for bug-gnu-emacs@gnu.org; Fri, 05 Aug 2022 00:43:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJpAr-0001bz-IS for bug-gnu-emacs@gnu.org; Fri, 05 Aug 2022 00:43:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 05 Aug 2022 04:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56896 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 56896-submit@debbugs.gnu.org id=B56896.16596745326137 (code B ref 56896); Fri, 05 Aug 2022 04:43:01 +0000 Original-Received: (at 56896) by debbugs.gnu.org; 5 Aug 2022 04:42:12 +0000 Original-Received: from localhost ([127.0.0.1]:55645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJpA3-0001ap-8q for submit@debbugs.gnu.org; Fri, 05 Aug 2022 00:42:12 -0400 Original-Received: from mail-pg1-f171.google.com ([209.85.215.171]:43522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJp9x-0001aH-DR for 56896@debbugs.gnu.org; Fri, 05 Aug 2022 00:42:09 -0400 Original-Received: by mail-pg1-f171.google.com with SMTP id h132so1696683pgc.10 for <56896@debbugs.gnu.org>; Thu, 04 Aug 2022 21:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-language:in-reply-to:mime-version:date:message-id:from :references:cc:to:subject:from:to:cc; bh=YSidcQPF3k58v1MGMnXE1HpybtxRQGf/qih58S6t5o4=; b=Eobu+/EZRMESVQeIEEdzzC3dR8+t2r/8xJX4yiO0tji4lk+hCTwYz7zD7JXU4bCfTL GntV0+6+7wFkyHXFsmG69Cwp0SdNofcd+mkiSPHH/uGKCZYtj4U0fUytDrfN0nyyKqRz q5N7FJcFtfoRv/Y+SCqK0nLG3x2wP29LkflZwRST3C1ve4IfBKA9yv0miLVTZgs+be1B JEenuN8oa2N1G63nPFIIZATVLMWPZHFqXR9GB07XjimJAQMfpRvxOi1cHqeN5H6c0AlS pxdbXnPUb7T8KmkHJk3kYJhb5ELTHluHOWAp9YhTNH1xAh3uxHE/VjiC8NySqy4hFx6L 6GZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-language:in-reply-to:mime-version:date:message-id:from :references:cc:to:subject:x-gm-message-state:from:to:cc; bh=YSidcQPF3k58v1MGMnXE1HpybtxRQGf/qih58S6t5o4=; b=jra1C5/vGF7CV4F/24/g48ntlBIm00Ut21li17qXPUkVht+GJLN2dTUR2EsY9Geg7L +ILFI3bJIuJeB7fI1XCAWJtMWZWGUua0u/fc8XeHEHWUNRLbPzIRHTouuyRFzk+OhPEQ 61D/FxZ2QQVNq2TIQzhlNDjmYZRbPQjTwPX2oO0oHED0+B0tCb0eQpF1JCQzng/ZtBT4 OFlGu+VBiXawiMiphfnHt6XBOOxXDNaI8eOvRu4Ze4CFupGq2dcXqs6DkiBL9rB0O/yp lPmjVNoGH8/oCKv7pefZ1D8qEIao3iRhOTW19SoIzm4tAqlX1xubIe/YvBY1qWvnBys6 5AOw== X-Gm-Message-State: ACgBeo2NekL+2dQGAyDaWiLOn7TaQ6GUqqhFJh220A22wRtnlsXIV3fA +uZI9nxS5UG0Mgo5rkCUIasjaajyRsY= X-Google-Smtp-Source: AA6agR5GMXdilM9/nSs/RH+F1+1THTlZ57zp7w3pCzJmQhmtUgfOp0JxvYN5opndZyNijIREpTFi+A== X-Received: by 2002:a62:1a56:0:b0:52d:4352:3ae0 with SMTP id a83-20020a621a56000000b0052d43523ae0mr5138696pfa.35.1659674519261; Thu, 04 Aug 2022 21:41:59 -0700 (PDT) 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 g64-20020a625243000000b0052d6ad246a4sm1875803pfb.144.2022.08.04.21.41.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Aug 2022 21:41:57 -0700 (PDT) In-Reply-To: <83edxw4hzn.fsf@gnu.org> Content-Language: en-US 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:238812 Archived-At: This is a multi-part message in MIME format. --------------2D4DBE4B10623A0DADBE3CD3 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 8/3/2022 11:53 PM, Eli Zaretskii wrote: >> Cc: 56896@debbugs.gnu.org >> From: Jim Porter >> Date: Wed, 3 Aug 2022 20:24:24 -0700 >> >> Finally, I adjusted the names of a couple bookmark variables and let >> users specify a bitmap (or nil) for 'bookmark-fringe-mark'. Note that >> changing this (via Customize or not) doesn't force an update of >> already-set bookmark fringe marks. That would be nice to have, but I'd >> need to study the code quite a bit more to figure out how to do this. > > I think we should fix this aspect, yes. So please do try to find the > way of doing it with some kind of :set function. Ok, I figured out a way to do this. I added a proxy object ('bookmark--fringe-mark') that I can dynamically set the 'fringe' property on, and then the :set function will update that and the display code will Just Work. Well, so long as a redisplay is triggered, but I think happens when you set options via Customize? It worked in my tests, anyway. This method feels kind of hacky, but I can't think of a better way, and it's certainly more feasible than trying to find all the fringe markers manually. (Given that code can define custom bookmark handler functions, I'm not even sure that would have been possible...) > If there's a detailed enough description in the manual(s), the NEWS > entry can be quite short, just mentioning the new capabilities and > variables. If you don't think this is manual-worthy, the NEWS entry > should be a bit more detailed. But don't worry about that, we will > get to it when you submit the actual text for NEWS. I added some documentation and a NEWS entry for the user-facing part of this (the new option). There might be room to add more documentation though. --------------2D4DBE4B10623A0DADBE3CD3 Content-Type: text/plain; charset=UTF-8; name="0001-Make-the-bookmark-fringe-icon-look-like-a-bookmark.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Make-the-bookmark-fringe-icon-look-like-a-bookmark.patc"; filename*1="h" RnJvbSAxYjNmZjc1NzhkMWVhYWE2YzIwZTQ1N2E0MmRlZjQ2ZWE0ZjMxMDhiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgMiBBdWcgMjAyMiAxMTo0MDo0MyAtMDcwMApTdWJqZWN0OiBbUEFU Q0hdIE1ha2UgdGhlIGJvb2ttYXJrIGZyaW5nZSBpY29uIGxvb2sgbGlrZSBhIGJvb2ttYXJr CgoqIHNyYy9mcmluZ2UuYyAobGFyZ2VfY2lyY2xlX2JpdHMpOiBOZXcgdmFyaWFibGUuCihz dGFuZGFyZF9iaXRtYXBzKTogQWRkIGxhcmdlX2NpcmNsZV9iaXRzLgoKKiBsaXNwL2ZyaW5n ZS5lbCAoZnJpbmdlLWJpdG1hcHMpOiBBZGQgJ2xhcmdlLWNpcmNsZScuCgoqIGxpc3AvY3Vz LWVkaXQuZWwgKHdpZGdldC1mcmluZ2UtYml0bWFwLXByb21wdC12YWx1ZS1oaXN0b3J5KTog TmV3CnZhcmlhYmxlLgooZnJpbmdlLWJpdG1hcCk6IE5ldyB3aWRnZXQuCgoqIGxpc3AvYm9v a21hcmsuZWwgKGJvb2ttYXJrLXNldC1mcmluZ2UtbWFyayk6IE9ic29sZXRlIGluIGZhdm9y IG9mLi4uCihib29rbWFyay1mcmluZ2UtbWFyayk6IC4uLiB0aGlzLgooYm9va21hcmstZnJp bmdlLW1hcmspOiBSZW5hbWUgdGhpcyBmcmluZ2UgYml0bWFwIHRvLi4uCihib29rbWFyay1t YXJrKTogLi4uIGFuZCBjaGFuZ2UgaXQgdG8gbG9vayBsaWtlIGEgYm9va21hcmsuCihib29r bWFyay0tZnJpbmdlLW1hcmspOiBOZXcgdmFyaWFibGUuCihib29rbWFyay1mYWNlKTogRG9u J3Qgc2V0IHRoZSAnOmJhY2tncm91bmQnIG9mIHRoZSBmYWNlLiAgSW5zdGVhZCwKc2V0ICc6 ZGlzdGFudC1mb3JlZ3JvdW5kJy4KKGJvb2ttYXJrLS1zZXQtZnJpbmdlLW1hcmssIGJvb2tt YXJrLXN0b3JlLCBib29rbWFyay0tanVtcC12aWEpOgpDb25zdWx0IHRoZSAnYm9va21hcmst ZnJpbmdlLW1hcmsnIG9wdGlvbi4KCiogZG9jL2xpc3ByZWYvY3VzdG9taXplLnRleGkgKFNp bXBsZSBUeXBlcyk6IERvY3VtZW50ICdmcmluZ2UtYml0bWFwJwp0eXBlLgoKKiBkb2MvbGlz cHJlZi9kaXNwbGF5LnRleGkgKEZyaW5nZSBCaXRtYXBzKTogTWVudGlvbiAnbGFyZ2UtY2ly Y2xlJy4KCiogZXRjL05FV1M6IEFubm91bmNlIHRoaXMgY2hhbmdlLgotLS0KIGRvYy9saXNw cmVmL2N1c3RvbWl6ZS50ZXhpIHwgIDQgKysrKwogZG9jL2xpc3ByZWYvZGlzcGxheS50ZXhp ICAgfCAgMSArCiBldGMvTkVXUyAgICAgICAgICAgICAgICAgICB8ICA1ICsrKysKIGxpc3Av Ym9va21hcmsuZWwgICAgICAgICAgIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0KIGxpc3AvY3VzLWVkaXQuZWwgICAgICAgICAgIHwgMjEgKysrKysrKysr KysrKysrKwogbGlzcC9mcmluZ2UuZWwgICAgICAgICAgICAgfCAgMSArCiBzcmMvZnJpbmdl LmMgICAgICAgICAgICAgICB8IDE1ICsrKysrKysrKysrKwogNyBmaWxlcyBjaGFuZ2VkLCA4 MSBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2MvbGlz cHJlZi9jdXN0b21pemUudGV4aSBiL2RvYy9saXNwcmVmL2N1c3RvbWl6ZS50ZXhpCmluZGV4 IDUyODQyMWJmM2IuLjZiYTM1Y2ZmZmYgMTAwNjQ0Ci0tLSBhL2RvYy9saXNwcmVmL2N1c3Rv bWl6ZS50ZXhpCisrKyBiL2RvYy9saXNwcmVmL2N1c3RvbWl6ZS50ZXhpCkBAIC02NzIsNiAr NjcyLDEwIEBAIFNpbXBsZSBUeXBlcwogZm9yIGNvbG9yIG5hbWVzLCBhcyB3ZWxsIGFzIGEg c2FtcGxlIGFuZCBhIGJ1dHRvbiBmb3Igc2VsZWN0aW5nIGEKIGNvbG9yIG5hbWUgZnJvbSBh IGxpc3Qgb2YgY29sb3IgbmFtZXMgc2hvd24gaW4gYSBAZmlsZXsqQ29sb3JzKn0KIGJ1ZmZl ci4KKworQGl0ZW0gZnJpbmdlLWJpdG1hcAorVGhlIHZhbHVlIG11c3QgYmUgYSB2YWxpZCBm cmluZ2UgYml0bWFwIG5hbWUuICBUaGUgd2lkZ2V0IHByb3ZpZGVzCitjb21wbGV0aW9uLgog QGVuZCB0YWJsZQogCiBAbm9kZSBDb21wb3NpdGUgVHlwZXMKZGlmZiAtLWdpdCBhL2RvYy9s aXNwcmVmL2Rpc3BsYXkudGV4aSBiL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aQppbmRleCBh Y2U2N2ZiZWRiLi40OGY0NmI0Y2I2IDEwMDY0NAotLS0gYS9kb2MvbGlzcHJlZi9kaXNwbGF5 LnRleGkKKysrIGIvZG9jL2xpc3ByZWYvZGlzcGxheS50ZXhpCkBAIC00NjI2LDYgKzQ2MjYs NyBAQCBGcmluZ2UgQml0bWFwcwogVXNlZCBmb3IgZGlmZmVyZW50IHR5cGVzIG9mIGZyaW5n ZSBjdXJzb3JzLgogCiBAaXRlbSBAY29kZXtleGNsYW1hdGlvbi1tYXJrfSwgQGNvZGV7cXVl c3Rpb24tbWFya30KK0BpdGVteCBAY29kZXtsYXJnZS1jaXJjbGV9CiBOb3QgdXNlZCBieSBj b3JlIEVtYWNzIGZlYXR1cmVzLgogQGVuZCB0YWJsZQogCmRpZmYgLS1naXQgYS9ldGMvTkVX UyBiL2V0Yy9ORVdTCmluZGV4IGI4OGZiNjM2NjIuLjIxOWU4MTI0ZmUgMTAwNjQ0Ci0tLSBh L2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xOTc5LDYgKzE5NzksMTEgQEAgcmVjZW50 bHkgc2V0LgogKioqIFdoZW4gZWRpdGluZyBhIGJvb2ttYXJrIGFubm90YXRpb24sICdDLWMg Qy1rJyB3aWxsIG5vdyBjYW5jZWwuCiBJdCBpcyBib3VuZCB0byB0aGUgbmV3IGNvbW1hbmQg J2Jvb2ttYXJrLWVkaXQtYW5ub3RhdGlvbi1jYW5jZWwnLgogCistLS0KKyoqKiBOZXcgb3B0 aW9uICdib29rbWFyay1mcmluZ2UtbWFyaycuCitUaGlzIG9wdGlvbiBjb250cm9scyB0aGUg Yml0bWFwIHVzZWQgdG8gaW5kaWNhdGUgYm9va21hcmtzIGluIHRoZQorZnJpbmdlIChvciAn bmlsJyB0byBkaXNhYmxlIHNob3dpbmcgdGhpcyBtYXJrZXIpLgorCiAqKiBFeGlmCiAKIC0t LQpkaWZmIC0tZ2l0IGEvbGlzcC9ib29rbWFyay5lbCBiL2xpc3AvYm9va21hcmsuZWwKaW5k ZXggMzBhMDNlMDQzMS4uMGJkZjNiY2M1OCAxMDA2NDQKLS0tIGEvbGlzcC9ib29rbWFyay5l bAorKysgYi9saXNwL2Jvb2ttYXJrLmVsCkBAIC0xODEsMTAgKzE4MSwzMiBAQCBib29rbWFy ay1zZWFyY2gtZGVsYXkKICAgIlRpbWUgYmVmb3JlIGBib29rbWFyay1ibWVudS1zZWFyY2gn IHVwZGF0ZXMgdGhlIGRpc3BsYXkuIgogICA6dHlwZSAgJ251bWJlcikKIAotKGRlZmN1c3Rv bSBib29rbWFyay1zZXQtZnJpbmdlLW1hcmsgdAotICAiV2hldGhlciB0byBzZXQgYSBmcmlu Z2UgbWFyayBhdCBib29rbWFya2VkIGxpbmVzLiIKLSAgOnR5cGUgICdib29sZWFuCi0gIDp2 ZXJzaW9uICIyOC4xIikKKyhkZWZpbmUtZnJpbmdlLWJpdG1hcCAnYm9va21hcmstbWFyawor ICBbI2IwMTExMTExMAorICAgI2IwMTExMTExMAorICAgI2IwMTExMTExMAorICAgI2IwMTEx MTExMAorICAgI2IwMTExMTExMAorICAgI2IwMTExMTExMAorICAgI2IwMTEwMDExMAorICAg I2IwMTAwMDAxMF0pCisKKyhkZWZ2YXIgYm9va21hcmstLWZyaW5nZS1tYXJrIG5pbAorICAi QSBwcm94eSBvYmplY3QgdG8gdXNlIHdoZW4gc2V0dGluZyB0aGUgYm9va21hcmsgZnJpbmdl IG1hcmsuCitUaGlzIGhvbGRzIGEgYGZyaW5nZScgcHJvcGVydHkgdGhhdCBjYW4gYmUgdXBk YXRlZCBpbi1wbGFjZSB0bworZHluYW1pY2FsbHkgY2hhbmdlIHRoZSBiaXRtYXAgdXNlZCBm b3IgbWFya2luZyBib29rbWFya3MuIikKKworKGRlZmluZS1vYnNvbGV0ZS12YXJpYWJsZS1h bGlhcyAnYm9va21hcmstc2V0LWZyaW5nZS1tYXJrCisgICdib29rbWFyay1mcmluZ2UtbWFy ayAiMjkuMSIpCisKKyhkZWZjdXN0b20gYm9va21hcmstZnJpbmdlLW1hcmsgJ2Jvb2ttYXJr LW1hcmsKKyAgIlRoZSBmcmluZ2UgYml0bWFwIHRvIG1hcmsgYm9va21hcmtlZCBsaW5lcyB3 aXRoLgorSWYgbmlsLCBkb24ndCBkaXNwbGF5IGEgbWFyayBvbiB0aGUgZnJpbmdlLiIKKyAg OnR5cGUgJyhjaG9pY2UgKGNvbnN0IG5pbCkgZnJpbmdlLWJpdG1hcCkKKyAgOnNldCAobGFt YmRhIChzeW1ib2wgdmFsdWUpCisgICAgICAgICAoc2V0IHN5bWJvbCB2YWx1ZSkKKyAgICAg ICAgIChwdXQgJ2Jvb2ttYXJrLS1mcmluZ2UtbWFyayAnZnJpbmdlIChnZXQgdmFsdWUgJ2Zy aW5nZSkpKQorICA6dmVyc2lvbiAiMjkuMSIpCiAKIDs7IEZJWE1FOiBObyBsb25nZXIgdXNl ZC4gIFNob3VsZCBiZSBkZWNsYXJlZCBvYnNvbGV0ZSBvciByZW1vdmVkLgogKGRlZmZhY2Ug Ym9va21hcmstbWVudS1oZWFkaW5nCkBAIC0yMDEsMTAgKzIyMywxMCBAQCBib29rbWFyay1m YWNlCiAgICAgIDpmb3JlZ3JvdW5kICJMaWdodEdyYXkiKQogICAgICgoKGNsYXNzIGNvbG9y KQogICAgICAgKGJhY2tncm91bmQgbGlnaHQpKQotICAgICA6YmFja2dyb3VuZCAiV2hpdGUi IDpmb3JlZ3JvdW5kICJEYXJrT3JhbmdlMSIpCisgICAgIDpmb3JlZ3JvdW5kICJEYXJrT3Jh bmdlMSIgOmRpc3RhbnQtZm9yZWdyb3VuZCAiRGFya09yYW5nZTMiKQogICAgICgoKGNsYXNz IGNvbG9yKQogICAgICAgKGJhY2tncm91bmQgZGFyaykpCi0gICAgIDpiYWNrZ3JvdW5kICJC bGFjayIgOmZvcmVncm91bmQgIkRhcmtPcmFuZ2UxIikpCisgICAgIDpmb3JlZ3JvdW5kICJE YXJrT3JhbmdlMSIgOmRpc3RhbnQtZm9yZWdyb3VuZCAiT3JhbmdlMSIpKQogICAiRmFjZSB1 c2VkIHRvIGhpZ2hsaWdodCBjdXJyZW50IGxpbmUuIgogICA6dmVyc2lvbiAiMjguMSIpCiAK QEAgLTQ4MiwyNCArNTA0LDIxIEBAIGJvb2ttYXJrLXVwZGF0ZS1sYXN0LW1vZGlmaWVkCiAo ZGVmdmFyIGJvb2ttYXJrLWhpc3RvcnkgbmlsCiAgICJUaGUgaGlzdG9yeSBsaXN0IGZvciBi b29rbWFyayBmdW5jdGlvbnMuIikKIAotKGRlZmluZS1mcmluZ2UtYml0bWFwICdib29rbWFy ay1mcmluZ2UtbWFyawotICAiXHgzY1x4N2VceGZmXHhmZlx4ZmZceGZmXHg3ZVx4M2MiKQot CiAoZGVmdW4gYm9va21hcmstLXNldC1mcmluZ2UtbWFyayAoKQogICAiQXBwbHkgYSBjb2xv cml6ZWQgb3ZlcmxheSB0byB0aGUgYm9va21hcmtlZCBsb2NhdGlvbi4KLVNlZSB1c2VyIG9w dGlvbiBgYm9va21hcmstc2V0LWZyaW5nZS1tYXJrJy4iCitTZWUgdXNlciBvcHRpb24gYGJv b2ttYXJrLWZyaW5nZS1tYXJrJy4iCiAgIChsZXQgKChibSAobWFrZS1vdmVybGF5IChwb2lu dC1hdC1ib2wpICgxKyAocG9pbnQtYXQtYm9sKSkpKSkKICAgICAob3ZlcmxheS1wdXQgYm0g J2NhdGVnb3J5ICdib29rbWFyaykKICAgICAob3ZlcmxheS1wdXQgYm0gJ2V2YXBvcmF0ZSB0 KQogICAgIChvdmVybGF5LXB1dCBibSAnYmVmb3JlLXN0cmluZwogICAgICAgICAgICAgICAg ICAocHJvcGVydGl6ZQogICAgICAgICAgICAgICAgICAgIngiICdkaXNwbGF5Ci0gICAgICAg ICAgICAgICAgICBgKGxlZnQtZnJpbmdlIGJvb2ttYXJrLWZyaW5nZS1tYXJrIGJvb2ttYXJr LWZhY2UpKSkpKQorICAgICAgICAgICAgICAgICAgYChsZWZ0LWZyaW5nZSBib29rbWFyay0t ZnJpbmdlLW1hcmsgYm9va21hcmstZmFjZSkpKSkpCiAKIChkZWZ1biBib29rbWFyay0tcmVt b3ZlLWZyaW5nZS1tYXJrIChibSkKICAgIlJlbW92ZSBhIGJvb2ttYXJrJ3MgY29sb3JpemVk IG92ZXJsYXkuCiBCTSBpcyBhIGJvb2ttYXJrIGFzIHJldHVybmVkIGZyb20gZnVuY3Rpb24g YGJvb2ttYXJrLWdldC1ib29rbWFyaycuCi1TZWUgdXNlciBvcHRpb24gYGJvb2ttYXJrLXNl dC1mcmluZ2UnLiIKK1NlZSB1c2VyIG9wdGlvbiBgYm9va21hcmstZnJpbmdlLW1hcmsnLiIK ICAgKGxldCAoKGZpbGVuYW1lIChjZHIgKGFzc3EgJ2ZpbGVuYW1lIGJtKSkpCiAgICAgICAg IChwb3MgKGNkciAoYXNzcSAncG9zaXRpb24gYm0pKSkKICAgICAgICAgb3ZlcmxheXMgZm91 bmQgdGVtcCkKQEAgLTYxNSw3ICs2MzQsNyBAQCBib29rbWFyay1zdG9yZQogICAgICAgICA7 OyBubyBwcmVmaXggYXJnIG1lYW5zIGp1c3Qgb3ZlcndyaXRlIG9sZCBib29rbWFyay4KICAg ICAgICAgKGxldCAoKGJtIChib29rbWFyay1nZXQtYm9va21hcmsgc3RyaXBwZWQtbmFtZSkp KQogICAgICAgICAgIDs7IEZpcnN0IGNsZWFuIHVwIGlmIHByZXZpb3VzbHkgbG9jYXRpb24g d2FzIGZvbnRpZmllZC4KLSAgICAgICAgICAod2hlbiBib29rbWFyay1zZXQtZnJpbmdlLW1h cmsKKyAgICAgICAgICAod2hlbiBib29rbWFyay1mcmluZ2UtbWFyawogICAgICAgICAgICAg KGJvb2ttYXJrLS1yZW1vdmUtZnJpbmdlLW1hcmsgYm0pKQogICAgICAgICAgIDs7IE1vZGlm eSB1c2luZyB0aGUgbmV3IChOQU1FIC4gQUxJU1QpIGZvcm1hdC4KICAgICAgICAgICAoc2V0 Y2RyIGJtIGFsaXN0KSkKQEAgLTkzMSw3ICs5NTAsNyBAQCBib29rbWFyay1zZXQtaW50ZXJu YWwKICAgICAgICAgICAgOzsgQXNrIGZvciBhbiBhbm5vdGF0aW9uIGJ1ZmZlciBmb3IgdGhp cyBib29rbWFyawogICAgICAgICAgICAod2hlbiBib29rbWFyay11c2UtYW5ub3RhdGlvbnMK ICAgICAgICAgICAgICAoYm9va21hcmstZWRpdC1hbm5vdGF0aW9uIHN0cikpCi0gICAgICAg ICAgICh3aGVuIGJvb2ttYXJrLXNldC1mcmluZ2UtbWFyaworICAgICAgICAgICAod2hlbiBi b29rbWFyay1mcmluZ2UtbWFyawogICAgICAgICAgICAgIChib29rbWFyay0tc2V0LWZyaW5n ZS1tYXJrKSkpKQogICAgIChzZXRxIGJvb2ttYXJrLXlhbmstcG9pbnQgbmlsKQogICAgIChz ZXRxIGJvb2ttYXJrLWN1cnJlbnQtYnVmZmVyIG5pbCkpKQpAQCAtMTIxMyw3ICsxMjMyLDcg QEAgYm9va21hcmstLWp1bXAtdmlhCiAgICAgKGlmIHdpbiAoc2V0LXdpbmRvdy1wb2ludCB3 aW4gKHBvaW50KSkpKQogICA7OyBGSVhNRTogd2UgdXNlZCB0byBvbmx5IHJ1biBib29rbWFy ay1hZnRlci1qdW1wLWhvb2sgaW4KICAgOzsgYGJvb2ttYXJrLWp1bXAnIGl0c2VsZiwgYnV0 IGluIG5vbmUgb2YgdGhlIG90aGVyIGNvbW1hbmRzLgotICAod2hlbiBib29rbWFyay1zZXQt ZnJpbmdlLW1hcmsKKyAgKHdoZW4gYm9va21hcmstZnJpbmdlLW1hcmsKICAgICAobGV0ICgo b3ZlcmxheXMgKG92ZXJsYXlzLWluIChwb2ludC1hdC1ib2wpICgxKyAocG9pbnQtYXQtYm9s KSkpKQogICAgICAgICAgIHRlbXAgZm91bmQpCiAgICAgICAod2hpbGUgKGFuZCAobm90IGZv dW5kKSAoc2V0cSB0ZW1wIChwb3Agb3ZlcmxheXMpKSkKZGlmZiAtLWdpdCBhL2xpc3AvY3Vz LWVkaXQuZWwgYi9saXNwL2N1cy1lZGl0LmVsCmluZGV4IGVkYzA5ZjMxOTkuLmNhMjY5MjJj MzAgMTAwNjQ0Ci0tLSBhL2xpc3AvY3VzLWVkaXQuZWwKKysrIGIvbGlzcC9jdXMtZWRpdC5l bApAQCAtNDI4Niw2ICs0Mjg2LDI3IEBAIGN1c3RvbS1ob29rLWNvbnZlcnQtd2lkZ2V0CiAg ICAgKHdpZGdldC1wdXQgd2lkZ2V0IDphcmdzIGFyZ3MpCiAgICAgd2lkZ2V0KSkKIAorOzs7 IFRoZSBgZnJpbmdlLWJpdG1hcCcgV2lkZ2V0LgorCisoZGVmdmFyIHdpZGdldC1mcmluZ2Ut Yml0bWFwLXByb21wdC12YWx1ZS1oaXN0b3J5IG5pbAorICAiSGlzdG9yeSBvZiBpbnB1dCB0 byBgd2lkZ2V0LWZyaW5nZS1iaXRtYXAtcHJvbXB0LXZhbHVlJy4iKQorCisoZGVmaW5lLXdp ZGdldCAnZnJpbmdlLWJpdG1hcCAnc3ltYm9sCisgICJBIExpc3AgZnJpbmdlIGJpdG1hcCBu YW1lIgorICA6Zm9ybWF0ICIldiIKKyAgOnRhZyAiRnJpbmdlIGJpdG1hcCIKKyAgOm1hdGNo IChsYW1iZGEgKF93aWRnZXQgdmFsdWUpIChmcmluZ2UtYml0bWFwLXAgdmFsdWUpKQorICA6 Y29tcGxldGlvbnMgKGFwcGx5LXBhcnRpYWxseSAjJ2NvbXBsZXRpb24tdGFibGUtd2l0aC1w cmVkaWNhdGUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JhcnJheSAjJ2Zy aW5nZS1iaXRtYXAtcCAnc3RyaWN0KQorICA6cHJvbXB0LW1hdGNoICdmcmluZ2UtYml0bWFw LXAKKyAgOnByb21wdC1oaXN0b3J5ICd3aWRnZXQtZmFjZS1wcm9tcHQtdmFsdWUtaGlzdG9y eQorICA6dmFsaWRhdGUgKGxhbWJkYSAod2lkZ2V0KQorCSAgICAgICh1bmxlc3MgKGZyaW5n ZS1iaXRtYXAtcCAod2lkZ2V0LXZhbHVlIHdpZGdldCkpCisJCSh3aWRnZXQtcHV0IHdpZGdl dAorCQkJICAgIDplcnJvciAoZm9ybWF0ICJJbnZhbGlkIGZyaW5nZSBiaXRtYXA6ICVTIgor CQkJCQkgICAod2lkZ2V0LXZhbHVlIHdpZGdldCkpKQorCQl3aWRnZXQpKSkKKwogOzs7IFRo ZSBgY3VzdG9tLWdyb3VwLWxpbmsnIFdpZGdldC4KIAogKGRlZmluZS13aWRnZXQgJ2N1c3Rv bS1ncm91cC1saW5rICdsaW5rCmRpZmYgLS1naXQgYS9saXNwL2ZyaW5nZS5lbCBiL2xpc3Av ZnJpbmdlLmVsCmluZGV4IDY1N2E3Mzc3MmQuLmRhNjgxMmU2OGQgMTAwNjQ0Ci0tLSBhL2xp c3AvZnJpbmdlLmVsCisrKyBiL2xpc3AvZnJpbmdlLmVsCkBAIC00Niw2ICs0Niw3IEBAIGZy aW5nZQogICAobGV0ICgoYml0bWFwcyAnKHF1ZXN0aW9uLW1hcmsgZXhjbGFtYXRpb24tbWFy awogCQkgICBsZWZ0LWFycm93IHJpZ2h0LWFycm93IHVwLWFycm93IGRvd24tYXJyb3cKIAkJ ICAgbGVmdC1jdXJseS1hcnJvdyByaWdodC1jdXJseS1hcnJvdworCQkgICBsYXJnZS1jaXJj bGUKIAkJICAgbGVmdC10cmlhbmdsZSByaWdodC10cmlhbmdsZQogCQkgICB0b3AtbGVmdC1h bmdsZSB0b3AtcmlnaHQtYW5nbGUKIAkJICAgYm90dG9tLWxlZnQtYW5nbGUgYm90dG9tLXJp Z2h0LWFuZ2xlCmRpZmYgLS1naXQgYS9zcmMvZnJpbmdlLmMgYi9zcmMvZnJpbmdlLmMKaW5k ZXggYmYwYjVmZGU3Ni4uNWQ3YzhkY2E5OSAxMDA2NDQKLS0tIGEvc3JjL2ZyaW5nZS5jCisr KyBiL3NyYy9mcmluZ2UuYwpAQCAtMjA5LDYgKzIwOSwyMCBAQAogc3RhdGljIHVuc2lnbmVk IHNob3J0IHJpZ2h0X2N1cmx5X2Fycm93X2JpdHNbXSA9IHsKICAgIDB4M2MsIDB4M2UsIDB4 MDMsIDB4MjcsIDB4M2YsIDB4M2UsIDB4M2MsIDB4M2V9OwogCisvKiBMYXJnZSBjaXJjbGUg Yml0bWFwLiAgKi8KKy8qCisgIC4uLi4uLi4uCisgIC4ueHh4eC4uCisgIC54eHh4eHguCisg IHh4eHh4eHh4CisgIHh4eHh4eHh4CisgIC54eHh4eHguCisgIC4ueHh4eC4uCisgIC4uLi4u Li4uCisqLworc3RhdGljIHVuc2lnbmVkIHNob3J0IGxhcmdlX2NpcmNsZV9iaXRzW10gPSB7 CisgIDB4M2MsIDB4N2UsIDB4ZmYsIDB4ZmYsIDB4ZmYsIDB4ZmYsIDB4N2UsIDB4M2N9Owor CiAvKiBSZXZlcnNlIE92ZXJsYXkgYXJyb3cgYml0bWFwLiAgQSB0cmlhbmd1bGFyIGFycm93 LiAgKi8KIC8qCiAgIC4uLi4uLnh4CkBAIC00NTQsNiArNDY4LDcgQEAgI2RlZmluZSBGUkJJ VFMoYml0cykgIGJpdHMsIFNUQU5EQVJEX0JJVE1BUF9IRUlHSFQgKGJpdHMpCiAgIHsgRlJC SVRTIChkb3duX2Fycm93X2JpdHMpLCAgICAgICAgIDgsIDAsIEFMSUdOX0JJVE1BUF9CT1RU T00sIDAgfSwKICAgeyBGUkJJVFMgKGxlZnRfY3VybHlfYXJyb3dfYml0cyksICAgOCwgMCwg QUxJR05fQklUTUFQX0NFTlRFUiwgMCB9LAogICB7IEZSQklUUyAocmlnaHRfY3VybHlfYXJy b3dfYml0cyksICA4LCAwLCBBTElHTl9CSVRNQVBfQ0VOVEVSLCAwIH0sCisgIHsgRlJCSVRT IChsYXJnZV9jaXJjbGVfYml0cyksICAgICAgIDgsIDAsIEFMSUdOX0JJVE1BUF9DRU5URVIs IDAgfSwKICAgeyBGUkJJVFMgKGxlZnRfdHJpYW5nbGVfYml0cyksICAgICAgOCwgMCwgQUxJ R05fQklUTUFQX0NFTlRFUiwgMCB9LAogICB7IEZSQklUUyAocmlnaHRfdHJpYW5nbGVfYml0 cyksICAgICA4LCAwLCBBTElHTl9CSVRNQVBfQ0VOVEVSLCAwIH0sCiAgIHsgRlJCSVRTICh0 b3BfbGVmdF9hbmdsZV9iaXRzKSwgICAgIDgsIDAsIEFMSUdOX0JJVE1BUF9UT1AsICAgIDAg fSwKLS0gCjIuMjUuMQoK --------------2D4DBE4B10623A0DADBE3CD3--