From unknown Mon Sep 08 16:47:27 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#59397 <59397@debbugs.gnu.org> To: bug#59397 <59397@debbugs.gnu.org> Subject: Status: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes Reply-To: bug#59397 <59397@debbugs.gnu.org> Date: Mon, 08 Sep 2025 23:47:27 +0000 retitle 59397 [PATCH] feature/tree-sitter: Utilize new font-lock faces for = more tree-sitter backed modes reassign 59397 emacs submitter 59397 Randy Taylor severity 59397 normal tag 59397 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 19 22:42:47 2022 Received: (at submit) by debbugs.gnu.org; 20 Nov 2022 03:42:48 +0000 Received: from localhost ([127.0.0.1]:41946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owbEF-0003wD-0u for submit@debbugs.gnu.org; Sat, 19 Nov 2022 22:42:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:37028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owbEC-0003vq-Ta for submit@debbugs.gnu.org; Sat, 19 Nov 2022 22:42:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owbEC-0006Ay-3o for bug-gnu-emacs@gnu.org; Sat, 19 Nov 2022 22:42:44 -0500 Received: from mail-0301.mail-europe.com ([188.165.51.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owbE8-0001Vk-LX for bug-gnu-emacs@gnu.org; Sat, 19 Nov 2022 22:42:43 -0500 Date: Sun, 20 Nov 2022 03:42:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rjt.dev; s=protonmail2; t=1668915744; x=1669174944; bh=uupfEJau7q5jnLfZPi8a04RPGesjxNqPXdYyIhD9xek=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=K/ulFRBuO6GENmKSbsUFoQaxEEWko8bs92Au3U4a+GKsiMsTM0xOKKpTlI56i4rtm vBVXfrhipcRswes/g4YELD2JDoJEUceZvq9+UgkfDSGrBDye5neBOUW1/76T54tUbn Vu8N6Jf+Jqk5Vn2NCJm7++FWhYu7fdFP5XAYMH0DxUHTTQUqB5z62KQ+O9vCP8vPpy O97KpFuH17THMe7wQhuKnhFqPOLdbtowRq2pD6SEkOO0Jf9FTzTK4lxp9ZSmdqm3no 7jn5CQFoFoTFLcnkyBzOF3omw5wtmgP9RDkmUmQ8w4OkUFWstb3MFOpq/Zqim4PYKZ zukM7SlqqCyew== To: "bug-gnu-emacs@gnu.org" From: Randy Taylor Subject: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes Message-ID: Feedback-ID: 44397038:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs" Received-SPF: pass client-ip=188.165.51.139; envelope-from=dev@rjt.dev; helo=mail-0301.mail-europe.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --b1_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs Content-Type: multipart/alternative; boundary="b2_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs" --b2_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 WC1EZWJidWdzLUNDOiBjYXNvdXJpQGdtYWlsLmNvbSwgdGhlb0B0aG9ybmhpbGwubm8KClRoaXMg cGF0Y2ggYWRkcyBzdXBwb3J0IGZvciB1c2luZyB0aGUgbmV3IGZvbnQtbG9jayBmYWNlcyBmb3Ig bW9yZSB0cmVlLXNpdHRlciBiYWNrZWQgbW9kZXMuCgpqcy5lbDoKLSBGb3IgdGhlIG51bWJlciBm ZWF0dXJlLCBpcyB0aGVyZSBhIGJldHRlciB3YXkgdG8gbWF0Y2ggZm9yIGV4YWN0bHkgTmFOIG9y IEluZmluaXR5PwotIEl0IG1pZ2h0IGJlIGEgZ29vZCBpZGVhIHRvIG1ha2UgYSBwYXJlbnQvYmFz ZSBtb2RlIChFQ01BPykgbGlrZSBkb25lIGluIGMtdHMtbW9kZSBmb3IgSlMgYW5kIFRTLCBzaW5j ZSB0aGVyZSdzIGEgYml0IG9mIG92ZXJsYXAuIEknbSBub3Qgdm9sdW50ZWVyaW5nIHRob3VnaCwg c2luY2UgSSBkb24ndCB1c2UgSlMgb3IgVFMgOyku --b2_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: base64 PGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6IHRhaG9tYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAx NHB4OyI+PHNwYW4+WC1EZWJidWdzLUNDOiA8YSB0YXJnZXQ9Il9ibGFuayIgcmVsPSJub3JlZmVy cmVyIG5vZm9sbG93IG5vb3BlbmVyIiBocmVmPSJtYWlsdG86Y2Fzb3VyaUBnbWFpbC5jb20iPmNh c291cmlAZ21haWwuY29tPC9hPiwgPGEgdGFyZ2V0PSJfYmxhbmsiIHJlbD0ibm9yZWZlcnJlciBu b2ZvbGxvdyBub29wZW5lciIgaHJlZj0ibWFpbHRvOnRoZW9AdGhvcm5oaWxsLm5vIj50aGVvQHRo b3JuaGlsbC5ubzwvYT48L3NwYW4+PGRpdj48YnI+PC9kaXY+PGRpdj48c3Bhbj5UaGlzIHBhdGNo IGFkZHMgc3VwcG9ydCBmb3IgdXNpbmcgdGhlIG5ldyBmb250LWxvY2sgZmFjZXMgZm9yIG1vcmUg dHJlZS1zaXR0ZXIgYmFja2VkIG1vZGVzLjwvc3Bhbj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48ZGl2 PjxzcGFuPmpzLmVsOjwvc3Bhbj48L2Rpdj48ZGl2PjxzcGFuPi0gRm9yIHRoZSBudW1iZXIgZmVh dHVyZSwgaXMgdGhlcmUgYSBiZXR0ZXIgd2F5IHRvIG1hdGNoIGZvciBleGFjdGx5IE5hTiBvciBJ bmZpbml0eT88L3NwYW4+PC9kaXY+PGRpdj48c3Bhbj4tIEl0IG1pZ2h0IGJlIGEgZ29vZCBpZGVh IHRvIG1ha2UgYSBwYXJlbnQvYmFzZSBtb2RlIChFQ01BPykgbGlrZSBkb25lIGluIGMtdHMtbW9k ZSBmb3IgSlMgYW5kIFRTLCBzaW5jZSB0aGVyZSdzIGEgYml0IG9mIG92ZXJsYXAuIEknbSBub3Qg dm9sdW50ZWVyaW5nIHRob3VnaCwgc2luY2UgSSBkb24ndCB1c2UgSlMgb3IgVFMgOykuPC9zcGFu PjwvZGl2PjwvZGl2Pg0KPGRpdiBjbGFzcz0icHJvdG9ubWFpbF9zaWduYXR1cmVfYmxvY2sgcHJv dG9ubWFpbF9zaWduYXR1cmVfYmxvY2stZW1wdHkiIHN0eWxlPSJmb250LWZhbWlseTogdGFob21h LCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDE0cHg7Ij4NCiAgICA8ZGl2IGNsYXNzPSJwcm90b25t YWlsX3NpZ25hdHVyZV9ibG9jay11c2VyIHByb3Rvbm1haWxfc2lnbmF0dXJlX2Jsb2NrLWVtcHR5 Ij48L2Rpdj4NCiAgICANCiAgICAgICAgICAgIDxkaXYgY2xhc3M9InByb3Rvbm1haWxfc2lnbmF0 dXJlX2Jsb2NrLXByb3RvbiBwcm90b25tYWlsX3NpZ25hdHVyZV9ibG9jay1lbXB0eSI+DQogICAg ICAgIA0KICAgICAgICAgICAgPC9kaXY+DQo8L2Rpdj4NCg== --b2_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs-- --b1_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs Content-Type: text/x-patch; name=0001-Utilize-new-font-lock-faces-for-more-tree-sitter-bac.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Utilize-new-font-lock-faces-for-more-tree-sitter-bac.patch RnJvbSBhMTU3ZDg3MzI3ZmU1YWYyMDZhOTI4MmY1ODJjZmU5MjYwNWYwNjY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYW5keSBUYXlsb3IgPGRldkByanQuZGV2PgpEYXRlOiBTYXQs IDE5IE5vdiAyMDIyIDIyOjMwOjEzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gVXRpbGl6ZSBuZXcg Zm9udC1sb2NrIGZhY2VzIGZvciBtb3JlIHRyZWUtc2l0dGVyIGJhY2tlZCBtb2RlcwoKKiBsaXNw L3Byb2dtb2Rlcy9qYXZhLXRzLW1vZGUuZWwgKGphdmEtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRp bmdzKToKVXNlIG9wZXJhdG9yIGFuZCBudW1iZXIgZm9udC1sb2NrIGZhY2VzLgooamF2YS10cy1t b2RlKTogQWxwaGFiZXRpemUuCiogbGlzcC9wcm9nbW9kZXMvanMuZWwgKGpzLS10cmVlc2l0LW9w ZXJhdG9ycyk6IERlZmluZSBvcGVyYXRvcnMuCihqcy0tdHJlZXNpdC1mb250LWxvY2stc2V0dGlu Z3MpOiBVc2UgYnJhY2tldCwgZGVsaW1pdGVyLAplc2NhcGUtc2VxdWVuY2UsIHByb3BlcnR5LCBu dW1iZXIsIGFuZCBvcGVyYXRvciBmb250LWxvY2sgZmFjZXMuCihqcy1tb2RlKTogQWRkIHRoZW0g dG8gdGhlIGZlYXR1cmUgbGlzdCBhbmQgYWxwaGFiZXRpemUuCiogbGlzcC9wcm9nbW9kZXMvanNv bi10cy1tb2RlLmVsIChqc29uLXRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncyk6ClVzZSBicmFj a2V0LCBkZWxpbWl0ZXIsIGVzY2FwZS1zZXF1ZW5jZSwgYW5kIG51bWJlciBmYWNlcy4gIFJlbW92 ZQp1bnVzZWQgZmVhdHVyZXMuCihqc29uLXRzLW1vZGUpOiBBZGQgdGhlbSB0byB0aGUgZmVhdHVy ZSBsaXN0IGFuZCBhbHBoYWJldGl6ZS4KKiBsaXNwL3Byb2dtb2Rlcy9zaC1zY3JpcHQuZWwgKHNo LW1vZGUtLXRyZWVzaXQtc2V0dGluZ3MpOiBVc2UgbnVtYmVyCmFuZCBvcGVyYXRvciBmb250LWxv Y2sgZmFjZXMuCihzaC1tb2RlKTogQWRkIHRoZW0gdG8gdGhlIGZlYXR1cmUgbGlzdCBhbmQgYWxw aGFiZXRpemUuCiogbGlzcC9wcm9nbW9kZXMvdHMtbW9kZS5lbCAodHMtbW9kZS0tb3BlcmF0b3Jz KTogRGVmaW5lIG9wZXJhdG9ycy4KKHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncyk6IFVzZSBi cmFja2V0LCBkZWxpbWl0ZXIsCmVzY2FwZS1zZXF1ZW5jZSwgcHJvcGVydHksIG51bWJlciwgYW5k IG9wZXJhdG9yIGZvbnQtbG9jayBmYWNlcy4KKHRzLW1vZGUpOiBBZGQgdGhlbSB0byB0aGUgZmVh dHVyZSBsaXN0IGFuZCBhbHBoYWJldGl6ZS4KLS0tCiBsaXNwL3Byb2dtb2Rlcy9qYXZhLXRzLW1v ZGUuZWwgfCAxNyArKysrLS0tLQogbGlzcC9wcm9nbW9kZXMvanMuZWwgICAgICAgICAgIHwgNjkg KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiBsaXNwL3Byb2dtb2Rlcy9qc29uLXRz LW1vZGUuZWwgfCAzMiArKysrKysrKy0tLS0tLS0KIGxpc3AvcHJvZ21vZGVzL3NoLXNjcmlwdC5l bCAgICB8IDE1ICsrKystLS0KIGxpc3AvcHJvZ21vZGVzL3RzLW1vZGUuZWwgICAgICB8IDcxICsr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTMzIGlu c2VydGlvbnMoKyksIDcxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVz L2phdmEtdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2phdmEtdHMtbW9kZS5lbAppbmRleCA2 YTgwMGQyOTJjLi41YjhkMDI2ZGE0IDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9qYXZhLXRz LW1vZGUuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvamF2YS10cy1tb2RlLmVsCkBAIC0xMzMsOCAr MTMzLDcgQEAgamF2YS10cy1tb2RlLS1mb250LWxvY2stc2V0dGluZ3MKICAgIDpmZWF0dXJlICdj b25zdGFudAogICAgYCgoKGlkZW50aWZpZXIpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQogICAg ICAgKDptYXRjaCAiXltBLVpfXVtBLVpfXFxkXSokIiBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2Up KQotICAgICAodHJ1ZSkgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlCi0gICAgIChmYWxzZSkgQGZv bnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgICBbKHRydWUpIChmYWxzZSldIEBmb250LWxvY2st Y29uc3RhbnQtZmFjZSkKICAgIDpsYW5ndWFnZSAnamF2YQogICAgOm92ZXJyaWRlIHQKICAgIDpm ZWF0dXJlICdrZXl3b3JkCkBAIC0xNDQsNyArMTQzLDcgQEAgamF2YS10cy1tb2RlLS1mb250LWxv Y2stc2V0dGluZ3MKICAgIDpsYW5ndWFnZSAnamF2YQogICAgOm92ZXJyaWRlIHQKICAgIDpmZWF0 dXJlICdvcGVyYXRvcgotICAgYChbLEBqYXZhLXRzLW1vZGUtLW9wZXJhdG9yc10gQGZvbnQtbG9j ay1idWlsdGluLWZhY2UpCisgICBgKFssQGphdmEtdHMtbW9kZS0tb3BlcmF0b3JzXSBAZm9udC1s b2NrLW9wZXJhdG9yLWZhY2UpCiAgICA6bGFuZ3VhZ2UgJ2phdmEKICAgIDpvdmVycmlkZSB0CiAg ICA6ZmVhdHVyZSAnYW5ub3RhdGlvbgpAQCAtMTYxLDggKzE2MCwxMiBAQCBqYXZhLXRzLW1vZGUt LWZvbnQtbG9jay1zZXR0aW5ncwogICAgOm92ZXJyaWRlIHQKICAgIDpmZWF0dXJlICdsaXRlcmFs CiAgICBgKChudWxsX2xpdGVyYWwpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQotICAgICAoZGVj aW1hbF9mbG9hdGluZ19wb2ludF9saXRlcmFsKSAgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlCi0g ICAgIChoZXhfZmxvYXRpbmdfcG9pbnRfbGl0ZXJhbCkgQGZvbnQtbG9jay1jb25zdGFudC1mYWNl KQorICAgICAoYmluYXJ5X2ludGVnZXJfbGl0ZXJhbCkgIEBmb250LWxvY2stbnVtYmVyLWZhY2UK KyAgICAgKGRlY2ltYWxfaW50ZWdlcl9saXRlcmFsKSBAZm9udC1sb2NrLW51bWJlci1mYWNlCisg ICAgIChoZXhfaW50ZWdlcl9saXRlcmFsKSBAZm9udC1sb2NrLW51bWJlci1mYWNlCisgICAgIChv Y3RhbF9pbnRlZ2VyX2xpdGVyYWwpIEBmb250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAgKGRlY2lt YWxfZmxvYXRpbmdfcG9pbnRfbGl0ZXJhbCkgQGZvbnQtbG9jay1udW1iZXItZmFjZQorICAgICAo aGV4X2Zsb2F0aW5nX3BvaW50X2xpdGVyYWwpIEBmb250LWxvY2stbnVtYmVyLWZhY2UpCiAgICA6 bGFuZ3VhZ2UgJ2phdmEKICAgIDpvdmVycmlkZSB0CiAgICA6ZmVhdHVyZSAndHlwZQpAQCAtMzAy LDggKzMwNSw4IEBAIGphdmEtdHMtbW9kZQogICA7OyBGb250LWxvY2suCiAgIChzZXRxLWxvY2Fs IHRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdzIGphdmEtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRp bmdzKQogICAoc2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1mZWF0dXJlLWxpc3QKLSAgICAg ICAgICAgICAgJygoYmFzaWMgY29tbWVudCBrZXl3b3JkIGNvbnN0YW50IHN0cmluZyBvcGVyYXRv cikKLSAgICAgICAgICAgICAgICAodHlwZSBkZWZpbml0aW9uIGV4cHJlc3Npb24gbGl0ZXJhbCBh bm5vdGF0aW9uKQorICAgICAgICAgICAgICAnKChiYXNpYyBjb21tZW50IGNvbnN0YW50IGtleXdv cmQgb3BlcmF0b3Igc3RyaW5nKQorICAgICAgICAgICAgICAgIChhbm5vdGF0aW9uIGRlZmluaXRp b24gZXhwcmVzc2lvbiBsaXRlcmFsIHR5cGUpCiAgICAgICAgICAgICAgICAgKCkpKQogCiAgIDs7 IEltZW51LgpkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvanMuZWwgYi9saXNwL3Byb2dtb2Rl cy9qcy5lbAppbmRleCA0YjA3YzBkMTJjLi4zOWM0ODQ1YzRlIDEwMDY0NAotLS0gYS9saXNwL3By b2dtb2Rlcy9qcy5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9qcy5lbApAQCAtMzQ1Miw2ICszNDUy LDEzIEBAIGpzLS10cmVlc2l0LWtleXdvcmRzCiAgICAgInR5cGVvZiIgInZhciIgInZvaWQiICJ3 aGlsZSIgIndpdGgiICJ5aWVsZCIpCiAgICJKYXZhU2NyaXB0IGtleXdvcmRzIGZvciB0cmVlLXNp dHRlciBmb250LWxvY2tpbmcuIikKIAorKGRlZnZhciBqcy0tdHJlZXNpdC1vcGVyYXRvcnMKKyAg JygiPSIgIis9IiAiLT0iICIqPSIgIi89IiAiJT0iICIqKj0iICI8PD0iICI+Pj0iICI+Pj49IiAi Jj0iICJePSIKKyAgICAifD0iICImJj0iICJ8fD0iICI/Pz0iICI9PSIgIiE9IiAiPT09IiAiIT09 IiAiPiIgIj49IiAiPCIgIjw9IiAiKyIKKyAgICAiLSIgIioiICIvIiAiJSIgIisrIiAiLS0iICIq KiIgIiYiICJ8IiAiXiIgIn4iICI8PCIgIj4+IiAiPj4+IgorICAgICImJiIgInx8IiAiISIpCisg ICJKYXZhU2NyaXB0IG9wZXJhdG9ycyBmb3IgdHJlZS1zaXR0ZXIgZm9udC1sb2NraW5nLiIpCisK IChkZWZ2YXIganMtLXRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdzCiAgICh0cmVlc2l0LWZvbnQt bG9jay1ydWxlcwogCkBAIC0zNDY2LDggKzM0NzMsNyBAQCBqcy0tdHJlZXNpdC1mb250LWxvY2st c2V0dGluZ3MKICAgIGAoKChpZGVudGlmaWVyKSBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2UKICAg ICAgICg6bWF0Y2ggIl5bQS1aX11bQS1aX1xcZF0qJCIgQGZvbnQtbG9jay1jb25zdGFudC1mYWNl KSkKIAotICAgICBbKHRydWUpIChmYWxzZSkgKG51bGwpXSBAZm9udC1sb2NrLWNvbnN0YW50LWZh Y2UKLSAgICAgKG51bWJlcikgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgICBbKHRydWUp IChmYWxzZSkgKG51bGwpXSBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2UpCiAKICAgIDpsYW5ndWFn ZSAnamF2YXNjcmlwdAogICAgOm92ZXJyaWRlIHQKQEAgLTM1NDQsMjEgKzM1NTAsNiBAQCBqcy0t dHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MKICAgICAgICAgICAgICAobWVtYmVyX2V4cHJlc3Np b24KICAgICAgICAgICAgICAgcHJvcGVydHk6IChwcm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9udC1s b2NrLXZhcmlhYmxlLW5hbWUtZmFjZSldKSkKIAotICAgOmxhbmd1YWdlICdqYXZhc2NyaXB0Ci0g ICA6b3ZlcnJpZGUgdAotICAgOmZlYXR1cmUgJ3Byb3BlcnR5Ci0gICBgKChwYWlyIGtleTogKHBy b3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUtbmFtZS1mYWNlKQotCi0gICAg IChwYWlyIHZhbHVlOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2Up Ci0KLSAgICAgKHBhaXIKLSAgICAgIGtleTogKHByb3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxv Y2stZnVuY3Rpb24tbmFtZS1mYWNlCi0gICAgICB2YWx1ZTogWyhmdW5jdGlvbikgKGFycm93X2Z1 bmN0aW9uKV0pCi0KLSAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlfaWRlbnRpZmllcikgQGZvbnQt bG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCi0KLSAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlfaWRl bnRpZmllcl9wYXR0ZXJuKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkpCi0KICAgIDps YW5ndWFnZSAnamF2YXNjcmlwdAogICAgOm92ZXJyaWRlIHQKICAgIDpmZWF0dXJlICdwYXR0ZXJu CkBAIC0zNTgzLDcgKzM1NzQsNDIgQEAganMtLXRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdzCiAK ICAgICAgKGpzeF9hdHRyaWJ1dGUKICAgICAgIChwcm9wZXJ0eV9pZGVudGlmaWVyKQotICAgICAg QGZvbnQtbG9jay1jb25zdGFudC1mYWNlKSkpCisgICAgICBAZm9udC1sb2NrLXByb3BlcnR5LWZh Y2UpKQorCisgICA6bGFuZ3VhZ2UgJ2phdmFzY3JpcHQKKyAgIDpmZWF0dXJlICdudW1iZXIKKyAg IGAoKG51bWJlcikgQGZvbnQtbG9jay1udW1iZXItZmFjZQorICAgICAoKGlkZW50aWZpZXIpIEBm b250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAgICg6bWF0Y2ggIl5cXCg6P05hTlxcfEluZmluaXR5 XFwpJCIgQGZvbnQtbG9jay1udW1iZXItZmFjZSkpKQorCisgICA6bGFuZ3VhZ2UgJ2phdmFzY3Jp cHQKKyAgIDpmZWF0dXJlICdvcGVyYXRvcgorICAgYChbLEBqcy0tdHJlZXNpdC1vcGVyYXRvcnNd IEBmb250LWxvY2stb3BlcmF0b3ItZmFjZQorICAgICAodGVybmFyeV9leHByZXNzaW9uIFsiPyIg IjoiXSBAZm9udC1sb2NrLW9wZXJhdG9yLWZhY2UpKQorCisgICA6bGFuZ3VhZ2UgJ2phdmFzY3Jp cHQKKyAgIDpmZWF0dXJlICdicmFja2V0CisgICAnKFsiKCIgIikiICJbIiAiXSIgInsiICJ9Il0g QGZvbnQtbG9jay1icmFja2V0LWZhY2UpCisKKyAgIDpsYW5ndWFnZSAnamF2YXNjcmlwdAorICAg OmZlYXR1cmUgJ2RlbGltaXRlcgorICAgJyhbIiwiICIuIiAiOyIgIjoiXSBAZm9udC1sb2NrLWRl bGltaXRlci1mYWNlKQorCisgICA6bGFuZ3VhZ2UgJ2phdmFzY3JpcHQKKyAgIDpmZWF0dXJlICdl c2NhcGUtc2VxdWVuY2UKKyAgIDpvdmVycmlkZSB0CisgICAnKChlc2NhcGVfc2VxdWVuY2UpIEBm b250LWxvY2stZXNjYXBlLWZhY2UpCisKKyAgIDpsYW5ndWFnZSAnamF2YXNjcmlwdAorICAgOm92 ZXJyaWRlIHQKKyAgIDpmZWF0dXJlICdwcm9wZXJ0eQorICAgYCgocHJvcGVydHlfaWRlbnRpZmll cikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlCisKKyAgICAgKHBhaXIgdmFsdWU6IChpZGVudGlm aWVyKSBAZm9udC1sb2NrLXByb3BlcnR5LWZhY2UpCisKKyAgICAgKChzaG9ydGhhbmRfcHJvcGVy dHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKQorCisgICAgICgoc2hvcnRo YW5kX3Byb3BlcnR5X2lkZW50aWZpZXJfcGF0dGVybikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNl KSkpCiAgICJUcmVlLXNpdHRlciBmb250LWxvY2sgc2V0dGluZ3MuIikKIAogKGRlZnVuIGpzLS1m b250aWZ5LXRlbXBsYXRlLXN0cmluZyAobm9kZSBvdmVycmlkZSBzdGFydCBlbmQgJnJlc3QgXykK QEAgLTM4MzEsOSArMzg1NywxMCBAQCBqcy10cy1tb2RlCiAgICAgOzsgRm9udGlmaWNhdGlvbi4K ICAgICAoc2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1zZXR0aW5ncyBqcy0tdHJlZXNpdC1m b250LWxvY2stc2V0dGluZ3MpCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stZmVh dHVyZS1saXN0Ci0gICAgICAgICAgICAgICAgJygoY29tbWVudCBkZWNsYXJhdGlvbikKLSAgICAg ICAgICAgICAgICAgIChzdHJpbmcga2V5d29yZCBpZGVudGlmaWVyIGV4cHJlc3Npb24gY29uc3Rh bnQpCi0gICAgICAgICAgICAgICAgICAocHJvcGVydHkgcGF0dGVybiBqc3ggKSkpCisgICAgICAg ICAgICAgICAgJygoIGNvbW1lbnQgZGVjbGFyYXRpb24pCisgICAgICAgICAgICAgICAgICAoIGNv bnN0YW50IGV4cHJlc3Npb24gaWRlbnRpZmllciBrZXl3b3JkIHN0cmluZykKKyAgICAgICAgICAg ICAgICAgICggYnJhY2tldCBkZWxpbWl0ZXIgZXNjYXBlLXNlcXVlbmNlIGpzeCBudW1iZXIgb3Bl cmF0b3IKKyAgICAgICAgICAgICAgICAgICAgcGF0dGVybiBwcm9wZXJ0eSkpKQogICAgIDs7IElt ZW51CiAgICAgKHNldHEtbG9jYWwgaW1lbnUtY3JlYXRlLWluZGV4LWZ1bmN0aW9uCiAgICAgICAg ICAgICAgICAgIydqcy0tdHJlZXNpdC1pbWVudSkKZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVz L2pzb24tdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2pzb24tdHMtbW9kZS5lbAppbmRleCA3 ZTBkZDE3OTExLi4zZWRjMGE2ODg4IDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9qc29uLXRz LW1vZGUuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvanNvbi10cy1tb2RlLmVsCkBAIC02OCwyNiAr NjgsMjggQEAganNvbi10cy0taW5kZW50LXJ1bGVzCiAoZGVmdmFyIGpzb24tdHMtbW9kZS0tZm9u dC1sb2NrLXNldHRpbmdzCiAgICh0cmVlc2l0LWZvbnQtbG9jay1ydWxlcwogICAgOmxhbmd1YWdl ICdqc29uCi0gICA6ZmVhdHVyZSAnY29tbWVudAotICAgOm92ZXJyaWRlIHQKLSAgICcoKGNvbW1l bnQpIEBmb250LWxvY2stY29tbWVudC1mYWNlKQorICAgOmZlYXR1cmUgJ2JyYWNrZXQKKyAgICco WyJbIiAiXSIgInsiICJ9Il0gQGZvbnQtbG9jay1icmFja2V0LWZhY2UpCiAgICA6bGFuZ3VhZ2Ug J2pzb24KLSAgIDpmZWF0dXJlICdzdHJpbmcKLSAgIDpvdmVycmlkZSB0Ci0gICAnKChlc2NhcGVf c2VxdWVuY2UpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQotICAgICAoc3RyaW5nKSBAZm9udC1s b2NrLXN0cmluZy1mYWNlKQorICAgOmZlYXR1cmUgJ2NvbnN0YW50CisgICAnKFsobnVsbCkgKHRy dWUpIChmYWxzZSldIEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkKKyAgIDpsYW5ndWFnZSAnanNv bgorICAgOmZlYXR1cmUgJ2RlbGltaXRlcgorICAgJyhbIiwiICI6Il0gQGZvbnQtbG9jay1kZWxp bWl0ZXItZmFjZSkKICAgIDpsYW5ndWFnZSAnanNvbgogICAgOmZlYXR1cmUgJ251bWJlcgotICAg Om92ZXJyaWRlIHQKLSAgICcoKG51bWJlcikgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAg JygobnVtYmVyKSBAZm9udC1sb2NrLW51bWJlci1mYWNlKQogICAgOmxhbmd1YWdlICdqc29uCi0g ICA6ZmVhdHVyZSAnY29uc3RhbnQKKyAgIDpmZWF0dXJlICdzdHJpbmcKKyAgICcoKHN0cmluZykg QGZvbnQtbG9jay1zdHJpbmctZmFjZSkKKyAgIDpsYW5ndWFnZSAnanNvbgorICAgOmZlYXR1cmUg J2VzY2FwZS1zZXF1ZW5jZQogICAgOm92ZXJyaWRlIHQKLSAgICcoWyhudWxsKSAodHJ1ZSkgKGZh bHNlKV0gQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgJygoZXNjYXBlX3NlcXVlbmNlKSBA Zm9udC1sb2NrLWVzY2FwZS1mYWNlKQogICAgOmxhbmd1YWdlICdqc29uCi0gICA6ZmVhdHVyZSAn cGFpcgorICAgOmZlYXR1cmUgJ2Vycm9yCiAgICA6b3ZlcnJpZGUgdAotICAgYCgocGFpciBrZXk6 IChfKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkpKQorICAgJygoRVJST1IpIEBmb250 LWxvY2std2FybmluZy1mYWNlKSkKICAgIkZvbnQtbG9jayBzZXR0aW5ncyBmb3IgSlNPTi4iKQog CiAoZGVmdW4ganNvbi10cy1tb2RlLS1pbWVudS0xIChub2RlKQpAQCAtMTQ4LDcgKzE1MCw5IEBA IGpzb24tdHMtbW9kZQogICA7OyBGb250LWxvY2suCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9u dC1sb2NrLXNldHRpbmdzIGpzb24tdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzKQogICAoc2V0 cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1mZWF0dXJlLWxpc3QKLSAgICAgICAgICAgICAgJygo Y29tbWVudCBzdHJpbmcgbnVtYmVyKSAoY29uc3RhbnQgcGFpcikgKCkpKQorICAgICAgICAgICAg ICAnKChjb25zdGFudCBudW1iZXIgc3RyaW5nKQorICAgICAgICAgICAgICAgIChlc2NhcGUtc2Vx dWVuY2UpCisgICAgICAgICAgICAgICAgKGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yKSkpCiAKICAg OzsgSW1lbnUuCiAgIChzZXRxLWxvY2FsIGltZW51LWNyZWF0ZS1pbmRleC1mdW5jdGlvbiAjJ2pz b24tdHMtbW9kZS0taW1lbnUpCmRpZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rlcy9zaC1zY3JpcHQu ZWwgYi9saXNwL3Byb2dtb2Rlcy9zaC1zY3JpcHQuZWwKaW5kZXggZWQwNmYyMjYzZS4uZDQwY2Uy MGU0OSAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvc2gtc2NyaXB0LmVsCisrKyBiL2xpc3Av cHJvZ21vZGVzL3NoLXNjcmlwdC5lbApAQCAtMTU4OSw5ICsxNTg5LDkgQEAgc2gtbW9kZQogICAg OzsgVHJlZS1zaXR0ZXIuICBJZiB0aGUgc2hlbGwgaXMgYmFzaCwgd2UgY2FuIGVuYWJsZSB0cmVl LXNpdHRlci4KICAgICgodHJlZXNpdC1yZWFkeS1wIHNoLXNoZWxsKQogICAgIChzZXRxLWxvY2Fs IHRyZWVzaXQtZm9udC1sb2NrLWZlYXR1cmUtbGlzdAotICAgICAgICAgICAgICAgICcoKGNvbW1l bnQgZnVuY3Rpb24gc3RyaW5nIGhlcmVkb2MpCi0gICAgICAgICAgICAgICAgICAodmFyaWFibGUg a2V5d29yZCBjb21tYW5kIGRlY2xhcmF0aW9uLWNvbW1hbmQpCi0gICAgICAgICAgICAgICAgICAo Y29uc3RhbnQgb3BlcmF0b3IgYnVpbHRpbi12YXJpYWJsZSkpKQorICAgICAgICAgICAgICAgICco KGNvbW1lbnQgZnVuY3Rpb24gaGVyZWRvYyBzdHJpbmcpCisgICAgICAgICAgICAgICAgICAoY29t bWFuZCBkZWNsYXJhdGlvbi1jb21tYW5kIGtleXdvcmQgdmFyaWFibGUpCisgICAgICAgICAgICAg ICAgICAoYnVpbHRpbi12YXJpYWJsZSBjb25zdGFudCBudW1iZXIgb3BlcmF0b3IpKSkKICAgICAo c2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1zZXR0aW5ncwogICAgICAgICAgICAgICAgIHNo LW1vZGUtLXRyZWVzaXQtc2V0dGluZ3MpCiAgICAgKHRyZWVzaXQtbWFqb3ItbW9kZS1zZXR1cCkp CkBAIC0zMzA2LDcgKzMzMDYsNyBAQCBzaC1tb2RlLS10cmVlc2l0LXNldHRpbmdzCiAKICAgIDpm ZWF0dXJlICdvcGVyYXRvcgogICAgOmxhbmd1YWdlICdiYXNoCi0gICBgKFsgLEBzaC1tb2RlLS10 cmVlc2l0LW9wZXJhdG9ycyBdIEBmb250LWxvY2stYnVpbHRpbi1mYWNlKQorICAgYChbLEBzaC1t b2RlLS10cmVlc2l0LW9wZXJhdG9yc10gQGZvbnQtbG9jay1vcGVyYXRvci1mYWNlKQogCiAgICA6 ZmVhdHVyZSAnYnVpbHRpbi12YXJpYWJsZQogICAgOmxhbmd1YWdlICdiYXNoCkBAIC0zMzE2LDcg KzMzMTYsMTIgQEAgc2gtbW9kZS0tdHJlZXNpdC1zZXR0aW5ncwogICAgICAgICAgICAgICAgICAg YChzZXEgYm9sCiAgICAgICAgICAgICAgICAgICAgICAgICAob3IgLEBidWlsdGluLXZhcnMpCiAg ICAgICAgICAgICAgICAgICAgICAgICBlb2wpKSkKLSAgICAgICAgICAgICAgQGZvbnQtbG9jay1i dWlsdGluLWZhY2UpKSkpCisgICAgICAgICAgICAgIEBmb250LWxvY2stYnVpbHRpbi1mYWNlKSkp CisKKyAgIDpmZWF0dXJlICdudW1iZXIKKyAgIDpsYW5ndWFnZSAnYmFzaAorICAgYCgoKHdvcmQp IEBmb250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAgICg6bWF0Y2ggIl5bMC05XSskIiBAZm9udC1s b2NrLW51bWJlci1mYWNlKSkpKQogICAiVHJlZS1zaXR0ZXIgZm9udC1sb2NrIHNldHRpbmdzIGZv ciBgc2gtbW9kZScuIikKIAogKHByb3ZpZGUgJ3NoLXNjcmlwdCkKZGlmZiAtLWdpdCBhL2xpc3Av cHJvZ21vZGVzL3RzLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rlcy90cy1tb2RlLmVsCmluZGV4IDAx NzE5YTg5ZWUuLjM1Mjc1ZDUwMWQgMTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3RzLW1vZGUu ZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvdHMtbW9kZS5lbApAQCAtMTAxLDYgKzEwMSwxMyBAQCB0 cy1tb2RlLS1rZXl3b3JkcwogICAgICJ3aGlsZSIgIndpdGgiICJ5aWVsZCIpCiAgICJUeXBlU2Ny aXB0IGtleXdvcmRzIGZvciB0cmVlLXNpdHRlciBmb250LWxvY2tpbmcuIikKIAorKGRlZnZhciB0 cy1tb2RlLS1vcGVyYXRvcnMKKyAgJygiPSIgIis9IiAiLT0iICIqPSIgIi89IiAiJT0iICIqKj0i ICI8PD0iICI+Pj0iICI+Pj49IiAiJj0iICJePSIKKyAgICAifD0iICImJj0iICJ8fD0iICI/Pz0i ICI9PSIgIiE9IiAiPT09IiAiIT09IiAiPiIgIj49IiAiPCIgIjw9IiAiKyIKKyAgICAiLSIgIioi ICIvIiAiJSIgIisrIiAiLS0iICIqKiIgIiYiICJ8IiAiXiIgIn4iICI8PCIgIj4+IiAiPj4+Igor ICAgICImJiIgInx8IiAiISIgIj8uIikKKyAgIlR5cGVTY3JpcHQgb3BlcmF0b3JzIGZvciB0cmVl LXNpdHRlciBmb250LWxvY2tpbmcuIikKKwogKGRlZnZhciB0cy1tb2RlLS1mb250LWxvY2stc2V0 dGluZ3MKICAgKHRyZWVzaXQtZm9udC1sb2NrLXJ1bGVzCiAgICA6bGFuZ3VhZ2UgJ3RzeApAQCAt MTE0LDggKzEyMSw3IEBAIHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAgYCgoKGlkZW50 aWZpZXIpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQogICAgICAgKDptYXRjaCAiXltBLVpfXVtB LVpfXFxkXSokIiBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2UpKQogCi0gICAgIFsodHJ1ZSkgKGZh bHNlKSAobnVsbCldIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQotICAgICAobnVtYmVyKSBAZm9u dC1sb2NrLWNvbnN0YW50LWZhY2UpCisgICAgIFsodHJ1ZSkgKGZhbHNlKSAobnVsbCldIEBmb250 LWxvY2stY29uc3RhbnQtZmFjZSkKIAogICAgOmxhbmd1YWdlICd0c3gKICAgIDpvdmVycmlkZSB0 CkBAIC0yMDcsMjUgKzIxMyw2IEBAIHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAgICAg IChtZW1iZXJfZXhwcmVzc2lvbgogICAgICAgICBwcm9wZXJ0eTogKHByb3BlcnR5X2lkZW50aWZp ZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKV0pKQogCi0gICA6bGFuZ3VhZ2UgJ3Rz eAotICAgOm92ZXJyaWRlIHQKLSAgIDpmZWF0dXJlICdwcm9wZXJ0eQotICAgYCgocGFpciBrZXk6 IChwcm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkKLQot ICAgICAocGFpciB2YWx1ZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUtbmFtZS1m YWNlKQotCi0gICAgIChwYWlyCi0gICAgICBrZXk6IChwcm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9u dC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZQotICAgICAgdmFsdWU6IFsoZnVuY3Rpb24pIChhcnJv d19mdW5jdGlvbildKQotCi0gICAgIChwcm9wZXJ0eV9zaWduYXR1cmUKLSAgICAgIG5hbWU6IChw cm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkKLQotICAg ICAoKHNob3J0aGFuZF9wcm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5h bWUtZmFjZSkKLQotICAgICAoKHNob3J0aGFuZF9wcm9wZXJ0eV9pZGVudGlmaWVyX3BhdHRlcm4p Ci0gICAgICBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkpCi0KICAgIDpsYW5ndWFnZSAn dHN4CiAgICA6b3ZlcnJpZGUgdAogICAgOmZlYXR1cmUgJ3BhdHRlcm4KQEAgLTI0OSw3ICsyMzYs NDMgQEAgdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICAgICBbKG5lc3RlZF9pZGVudGlm aWVyIChpZGVudGlmaWVyKSkgKGlkZW50aWZpZXIpXQogICAgICAgQGZvbnQtbG9jay1mdW5jdGlv bi1uYW1lLWZhY2UpCiAKLSAgICAgKGpzeF9hdHRyaWJ1dGUgKHByb3BlcnR5X2lkZW50aWZpZXIp IEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkpKQorICAgICAoanN4X2F0dHJpYnV0ZSAocHJvcGVy dHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKSkKKworICAgOmxhbmd1YWdl ICd0c3gKKyAgIDpmZWF0dXJlICdudW1iZXIKKyAgIGAoKG51bWJlcikgQGZvbnQtbG9jay1udW1i ZXItZmFjZQorICAgICAoKGlkZW50aWZpZXIpIEBmb250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAg ICg6bWF0Y2ggIl5cXCg6P05hTlxcfEluZmluaXR5XFwpJCIgQGZvbnQtbG9jay1udW1iZXItZmFj ZSkpKQorCisgICA6bGFuZ3VhZ2UgJ3RzeAorICAgOmZlYXR1cmUgJ29wZXJhdG9yCisgICBgKFss QHRzLW1vZGUtLW9wZXJhdG9yc10gQGZvbnQtbG9jay1vcGVyYXRvci1mYWNlCisgICAgICh0ZXJu YXJ5X2V4cHJlc3Npb24gWyI/IiAiOiJdIEBmb250LWxvY2stb3BlcmF0b3ItZmFjZSkpCisKKyAg IDpsYW5ndWFnZSAndHN4CisgICA6ZmVhdHVyZSAnYnJhY2tldAorICAgJyhbIigiICIpIiAiWyIg Il0iICJ7IiAifSJdIEBmb250LWxvY2stYnJhY2tldC1mYWNlKQorCisgICA6bGFuZ3VhZ2UgJ3Rz eAorICAgOmZlYXR1cmUgJ2RlbGltaXRlcgorICAgJyhbIiwiICIuIiAiOyIgIjoiXSBAZm9udC1s b2NrLWRlbGltaXRlci1mYWNlKQorCisgICA6bGFuZ3VhZ2UgJ3RzeAorICAgOmZlYXR1cmUgJ2Vz Y2FwZS1zZXF1ZW5jZQorICAgOm92ZXJyaWRlIHQKKyAgICcoKGVzY2FwZV9zZXF1ZW5jZSkgQGZv bnQtbG9jay1lc2NhcGUtZmFjZSkKKworICAgOmxhbmd1YWdlICd0c3gKKyAgIDpvdmVycmlkZSB0 CisgICA6ZmVhdHVyZSAncHJvcGVydHkKKyAgIGAoKChwcm9wZXJ0eV9pZGVudGlmaWVyKSBAZm9u dC1sb2NrLXByb3BlcnR5LWZhY2UpCisKKyAgICAgKHBhaXIgdmFsdWU6IChpZGVudGlmaWVyKSBA Zm9udC1sb2NrLXByb3BlcnR5LWZhY2UpCisKKyAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlfaWRl bnRpZmllcikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKQorCisgICAgICgoc2hvcnRoYW5kX3By b3BlcnR5X2lkZW50aWZpZXJfcGF0dGVybikKKyAgICAgIEBmb250LWxvY2stcHJvcGVydHktZmFj ZSkpKQogICAiVHJlZS1zaXR0ZXIgZm9udC1sb2NrIHNldHRpbmdzLiIpCiAKIDs7OyMjI2F1dG9s b2FkCkBAIC0yOTYsOCArMzE5LDggQEAgdHMtbW9kZQogICAgIChzZXRxLWxvY2FsIHRyZWVzaXQt Zm9udC1sb2NrLXNldHRpbmdzIHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncykKICAgICAoc2V0 cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1mZWF0dXJlLWxpc3QKICAgICAgICAgICAgICAgICAn KChjb21tZW50IGRlY2xhcmF0aW9uKQotICAgICAgICAgICAgICAgICAgKHN0cmluZyBrZXl3b3Jk IGlkZW50aWZpZXIgZXhwcmVzc2lvbiBjb25zdGFudCkKLSAgICAgICAgICAgICAgICAgIChwcm9w ZXJ0eSBwYXR0ZXJuIGpzeCkpKQorICAgICAgICAgICAgICAgICAgKGNvbnN0YW50IGV4cHJlc3Np b24gaWRlbnRpZmllciBrZXl3b3JkIG51bWJlciBzdHJpbmcpCisgICAgICAgICAgICAgICAgICAo YnJhY2tldCBkZWxpbWl0ZXIganN4IHByb3BlcnR5IHBhdHRlcm4pKSkKICAgICA7OyBJbWVudS4K ICAgICAoc2V0cS1sb2NhbCBpbWVudS1jcmVhdGUtaW5kZXgtZnVuY3Rpb24gIydqcy0tdHJlZXNp dC1pbWVudSkKIAotLSAKMi4zOC4xCgo= --b1_phxAmnLwxLAx7gDMYgYXuz3HOJEyJBhWbDgcL7ceZcs-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 21 13:53:07 2022 Received: (at 59397) by debbugs.gnu.org; 21 Nov 2022 18:53:07 +0000 Received: from localhost ([127.0.0.1]:48835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxBul-0000iv-45 for submit@debbugs.gnu.org; Mon, 21 Nov 2022 13:53:07 -0500 Received: from out0.migadu.com ([94.23.1.103]:59200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxBui-0000ik-Lq for 59397@debbugs.gnu.org; Mon, 21 Nov 2022 13:53:05 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1669056783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=HFYSad77256EG7oca/EdzNuDenEfW0621i5FXiBbXQM=; b=B9+cwWMkleIG8f78Xu+L6/+tZFmlvbBlWFm6ygNboIcpLul5bFj6/O25aMF/ti+OtQK8F7 VHOmE3++Zyjq36vVLbSVJj1Fr0Ldq/2vk7tM/XFcFq65XU2ZKW6UdegwAGT3LozdeQw6pB txYvoQu8XrJw4MkPHYaro6mKAwUWK8drGep48LwSiTlNm5REds16ySpC1Mjyq1G9t+PNQO Snqi4eFVyh/3wt9ABAnWmaMoBkV8Rk20vxHTH9FXElN6jOemxQhNEQ/HyVE+5a3KUrqaKG Jh9k+apSzNKCs+IwHREtb4YtUAfjZhY21rripZ8TsGD+SeW6cVhyMSGdzAH6Qg== From: Theodor Thornhill To: Randy Taylor , 59397@debbugs.gnu.org Subject: Re: bug#59397: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes In-Reply-To: References: Date: Mon, 21 Nov 2022 19:52:55 +0100 Message-ID: <87o7t05ed4.fsf@thornhill.no> MIME-Version: 1.0 Content-Type: text/plain X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 59397 Cc: casouri@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Randy Taylor writes: > X-Debbugs-CC: casouri@gmail.com, theo@thornhill.no > > This patch adds support for using the new font-lock faces for more tree-sitter backed modes. Nice, thanks :-) I added some more in a different bug, as I missed this completely! From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 21 16:49:46 2022 Received: (at 59397) by debbugs.gnu.org; 21 Nov 2022 21:49:46 +0000 Received: from localhost ([127.0.0.1]:49029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxEfi-0001eT-EJ for submit@debbugs.gnu.org; Mon, 21 Nov 2022 16:49:46 -0500 Received: from mail-pg1-f182.google.com ([209.85.215.182]:46826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxEfd-0001eC-Se for 59397@debbugs.gnu.org; Mon, 21 Nov 2022 16:49:44 -0500 Received: by mail-pg1-f182.google.com with SMTP id 62so12308386pgb.13 for <59397@debbugs.gnu.org>; Mon, 21 Nov 2022 13:49:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=0cWAW006CexhQzxaOJzGTrmRgtZUcaSoL9vMcltxRY8=; b=nMjviLEKoPCwG+nfq6I2RJKal3SZkeMAh+BLjnEM01ZsnTGBC9CBTZ+ehl7bQREE7u zwTyo5DZH7b54LQyXnc0aD1eNEyMDawS688PY9eWKgvhraSL0w/m0XP3+233mRhvA/eR UdjzF3LM4KBdpXjZLhT9mS/F5vN5x19rmYbrG4g8g2oL+c9g53VRJoAPxOu2lvmljRvw tSQvgs6GGBSBSCpZfesbbJm59MrQu5AiSiDsmHiCHcSFMmaQrJQ/rzi5p8lDpFXIe5vE ehgDIrT5H4DCPQnl6ppbvevdFSHpCjxDS4gcOsNmgWkXv/SjpkQ+BL0XhzzMBJ6ZJIIV cHNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0cWAW006CexhQzxaOJzGTrmRgtZUcaSoL9vMcltxRY8=; b=ZYth9HxktuO0V/dCvKzQvFor7ax3h+5P4yGlNQVB74uDs+aB0vdeLgXcZPVocRCFF5 ebGY9s6nCGbucY0r7Tb+aDpl6ZXcY8JBZx5YnQJ5ccBlqfCdTQeHgeZZKHqnmKaHxhO6 lnYVcrOq0axuDQc4HCNFpqeZ82pBDffOGRZy35kj3jPYW9vWdr+0P/soYXYITYnVkgwi FRhqn2AYIv1lTqi958cHprpUczX4GGc13rkz3vuvkmJmahOKEFmTbvnyuE8nu5kSrQAj Ki0RPkYfRyvJnX2E/06h5Jt7BGORM2GsjXZDzOGcpWXoBvcOprfqzqwFpslbHIouTLDC +Jgw== X-Gm-Message-State: ANoB5pnEn1c4RmGpGP7g/vo7ZzZbZpX2dE4eFH4y2dpa5V038W7Ex/+7 fwZOAIAREWN+bmuvKT1V4Aw= X-Google-Smtp-Source: AA0mqf7lbiVan4e6ENsCcGCuwQBEuWgcZ85AVgin3cpGJcpg639xYbY+Xc35l2AiQEmRL7nZXYFOzw== X-Received: by 2002:a05:6a00:d69:b0:55a:d8f6:c65 with SMTP id n41-20020a056a000d6900b0055ad8f60c65mr930086pfv.32.1669067375592; Mon, 21 Nov 2022 13:49:35 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id c10-20020a170902d48a00b0016d9b101413sm760469plg.200.2022.11.21.13.49.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2022 13:49:34 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: bug#59397: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes From: Yuan Fu In-Reply-To: Date: Mon, 21 Nov 2022 13:49:33 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: References: To: Randy Taylor X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59397 Cc: theo@thornhill.no, 59397@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > On Nov 19, 2022, at 7:42 PM, Randy Taylor wrote: >=20 > X-Debbugs-CC: casouri@gmail.com, theo@thornhill.no >=20 > This patch adds support for using the new font-lock faces for more = tree-sitter backed modes. >=20 > js.el: > - For the number feature, is there a better way to match for exactly = NaN or Infinity? > - It might be a good idea to make a parent/base mode (ECMA?) like done = in c-ts-mode for JS and TS, since there's a bit of overlap. I'm not = volunteering though, since I don't use JS or TS ;). > <0001-Utilize-new-font-lock-faces-for-more-tree-sitter-bac.patch> Thanks! I was busy with other things, but I=E2=80=99ll try to merge this = soon! Yuan= From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 21 22:38:39 2022 Received: (at 59397) by debbugs.gnu.org; 22 Nov 2022 03:38:39 +0000 Received: from localhost ([127.0.0.1]:49345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxK7K-0001oC-VY for submit@debbugs.gnu.org; Mon, 21 Nov 2022 22:38:39 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:64197) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxK7G-0001nw-TB for 59397@debbugs.gnu.org; Mon, 21 Nov 2022 22:38:37 -0500 Date: Tue, 22 Nov 2022 03:38:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rjt.dev; s=protonmail2; t=1669088306; x=1669347506; bh=o7frK3WaknDz2e24YreCmXNJf+gaclJzMEOnqP+wV2o=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PL05otyBfxmFwNtpyUw+svORE1AxlzVyAxplle0NrSGvU7kY0Wre20nQfT3HTNKFY JEIX6JGvTsdyDataFLK9vPzyrMi8V3+oWHKHoTJeFbmh9FHjY1G4J0GQKQQXDhrthX usyiGvxEdYNbhP4WDuqMbeKS/jTEIEfvG7FQIzoeQDNgPKQI/CHJ2Dyuu4OhiOwI/R RbxAqii6jW41NGxt2GokmiUIfGfAoShCkQk832tRbXcLA+X8Sc/Ww5BraQg1R1hWAw okWI56avT2844/2XknbqGfEx04otpWVrpDb7tmitgV/1Bo1ZwnSm7zMQDLV+ZatQYJ lqJm62ruTfQQw== To: Yuan Fu From: Randy Taylor Subject: Re: bug#59397: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes Message-ID: In-Reply-To: References: Feedback-ID: 44397038:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59397 Cc: theo@thornhill.no, 59397@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Monday, November 21st, 2022 at 16:49, Yuan Fu wrote: >=20 > Thanks! I was busy with other things, but I=E2=80=99ll try to merge this = soon! >=20 > Yuan No worries, take your time. It's probably best to merge Theo's first (Bug#59445) since it's smaller, af= ter which I will rebase and post a new patch. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 22 17:21:42 2022 Received: (at 59397) by debbugs.gnu.org; 22 Nov 2022 22:21:42 +0000 Received: from localhost ([127.0.0.1]:52768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxbe9-0006bj-7c for submit@debbugs.gnu.org; Tue, 22 Nov 2022 17:21:42 -0500 Received: from mail-40136.proton.ch ([185.70.40.136]:29491) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxbe6-0006bV-5y for 59397@debbugs.gnu.org; Tue, 22 Nov 2022 17:21:40 -0500 Date: Tue, 22 Nov 2022 22:21:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rjt.dev; s=protonmail2; t=1669155690; x=1669414890; bh=cMN+PI+QTBV4YXtIKB0c5pCAeyFIdoPKKAONniOE0ug=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=q40kL9QN1y5u5p0UF/zMv3WVp2hrKWheuGLP9wSdSnQFpYxhKVJtP0s3/MKevmlRg /m1t5DD981HkSYrmOHmkzGsJzbndupic1yNN146RlmwAByaOO6cc86ZHFbWf+VwuFZ exsbxW/3hQK1+ecqeffsqrTVormVB9U06WEc8qLeJfOyr89rRqExXRg/lP1hTUvbfG qNOAKeV6aoXnsC9QmWdQRbTWyZpcwMvnQ89GWhJ3nQDZ3NA1QiZU5yNBBn05dYax1z nuH3huKA1i1bv6aS7DKXl/MUriPgblolxBfQvpCUru+Qi7la5xH/2YBAbyA1BRgfjh bhnFytVDgtvKA== To: Yuan Fu From: Randy Taylor Subject: Re: bug#59397: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes Message-ID: <2OBJBdbAu3ceVL0GZbXHFERWvdUAej1ZxRMn5XcQLPet04uVvIPxHQmJF7pYlxhgDOrSp2hJsS5f0HpdwmHu1txDFLS08LckXRg8OY0eINU=@rjt.dev> In-Reply-To: References: Feedback-ID: 44397038:user:proton MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_V8Khyjp4Ku5zKE1fGvY6Qmneqff2Rx6FwXEig425c" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59397 Cc: theo@thornhill.no, 59397@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --b1_V8Khyjp4Ku5zKE1fGvY6Qmneqff2Rx6FwXEig425c Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Monday, November 21st, 2022 at 22:38, Randy Taylor wrote: >=20 > On Monday, November 21st, 2022 at 16:49, Yuan Fu casouri@gmail.com wrote: >=20 > > Thanks! I was busy with other things, but I=E2=80=99ll try to merge thi= s soon! > >=20 > > Yuan >=20 >=20 > No worries, take your time. >=20 > It's probably best to merge Theo's first (Bug#59445) since it's smaller, = after which I will rebase and post a new patch. >=20 OK, latest and greatest patch attached. --b1_V8Khyjp4Ku5zKE1fGvY6Qmneqff2Rx6FwXEig425c Content-Type: text/x-patch; name=0001-Utilize-new-font-lock-faces-for-more-tree-sitter-mod.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-Utilize-new-font-lock-faces-for-more-tree-sitter-mod.patch RnJvbSBlMWFhMTM3YWNiOTQ4N2U2MDkwMDRmNTVlNDFjY2FjOGEzMDA3ZGNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYW5keSBUYXlsb3IgPGRldkByanQuZGV2PgpEYXRlOiBTYXQs IDE5IE5vdiAyMDIyIDIyOjMwOjEzIC0wNTAwClN1YmplY3Q6IFtQQVRDSF0gVXRpbGl6ZSBuZXcg Zm9udC1sb2NrIGZhY2VzIGZvciBtb3JlIHRyZWUtc2l0dGVyIG1vZGVzCiAoQnVnIzU5Mzk3KQoK KiBsaXNwL3Byb2dtb2Rlcy9qYXZhLXRzLW1vZGUuZWwgKGphdmEtdHMtbW9kZS0tZm9udC1sb2Nr LXNldHRpbmdzKToKVXNlIGZvbnQtbG9jay1udW1iZXItZmFjZS4KKGphdmEtdHMtbW9kZSk6IEFs cGhhYmV0aXplIGZlYXR1cmVzLgoqIGxpc3AvcHJvZ21vZGVzL2pzLmVsIChqcy0tdHJlZXNpdC1v cGVyYXRvcnMpOiBEZWZpbmUgb3BlcmF0b3JzLgooanMtLXRyZWVzaXQtZm9udC1sb2NrLXNldHRp bmdzKTogVXNlIGJyYWNrZXQsIGRlbGltaXRlciwKZXNjYXBlLXNlcXVlbmNlLCBwcm9wZXJ0eSwg bnVtYmVyLCBhbmQgb3BlcmF0b3IgZm9udC1sb2NrIGZhY2VzLgooanMtdHMtbW9kZSk6IEFkZCB0 aGVtIHRvIHRoZSBmZWF0dXJlIGxpc3QgYW5kIGFscGhhYmV0aXplLgoqIGxpc3AvcHJvZ21vZGVz L2pzb24tdHMtbW9kZS5lbCAoanNvbi10cy1tb2RlLS1mb250LWxvY2stc2V0dGluZ3MpOgpVc2Ug YnJhY2tldCwgZGVsaW1pdGVyLCBlc2NhcGUtc2VxdWVuY2UsIGFuZCBudW1iZXIgZmFjZXMuICBS ZW1vdmUKdW51c2VkIGZlYXR1cmVzLgooanNvbi10cy1tb2RlKTogQWRkIHRoZW0gdG8gdGhlIGZl YXR1cmUgbGlzdCBhbmQgYWxwaGFiZXRpemUuCiogbGlzcC9wcm9nbW9kZXMvc2gtc2NyaXB0LmVs IChzaC1tb2RlLS10cmVlc2l0LXNldHRpbmdzKTogVXNlCmJyYWNrZXQsIGRlbGltaXRlciwgbnVt YmVyLCBtaXNjLXB1bmN0dWF0aW9uLCBhbmQgb3BlcmF0b3IgZm9udC1sb2NrCmZhY2VzLgooc2gt bW9kZS0tdHJlZXNpdC1vcGVyYXRvcnMpOiBSZW1vdmUgOyBhbmQgOzsgZnJvbSBsaXN0LgooYmFz aC10cy1tb2RlKTogQWRkIHRoZW0gdG8gdGhlIGZlYXR1cmUgbGlzdCBhbmQgYWxwaGFiZXRpemUu CiogbGlzcC9wcm9nbW9kZXMvdHMtbW9kZS5lbCAodHMtbW9kZS0tb3BlcmF0b3JzKTogRGVmaW5l IG9wZXJhdG9ycy4KKHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncyk6IFVzZSBlc2NhcGUtc2Vx dWVuY2UsIG51bWJlciwgYW5kCm9wZXJhdG9yIGZvbnQtbG9jayBmYWNlcy4KKHRzLW1vZGUpOiBB ZGQgdGhlbSB0byB0aGUgZmVhdHVyZSBsaXN0IGFuZCBhbHBoYWJldGl6ZS4KLS0tCiBsaXNwL3By b2dtb2Rlcy9qYXZhLXRzLW1vZGUuZWwgfCAxNSArKysrKy0tLQogbGlzcC9wcm9nbW9kZXMvanMu ZWwgICAgICAgICAgIHwgNjkgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogbGlz cC9wcm9nbW9kZXMvanNvbi10cy1tb2RlLmVsIHwgMzIgKysrKysrKysrLS0tLS0tLQogbGlzcC9w cm9nbW9kZXMvc2gtc2NyaXB0LmVsICAgIHwgMzEgKysrKysrKysrKystLS0tCiBsaXNwL3Byb2dt b2Rlcy90cy1tb2RlLmVsICAgICAgfCA2NCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t CiA1IGZpbGVzIGNoYW5nZWQsIDEzOSBpbnNlcnRpb25zKCspLCA3MiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rlcy9qYXZhLXRzLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rl cy9qYXZhLXRzLW1vZGUuZWwKaW5kZXggZTc4ZjFiNGM2ZTguLmVlMjkzNGY1M2M2IDEwMDY0NAot LS0gYS9saXNwL3Byb2dtb2Rlcy9qYXZhLXRzLW1vZGUuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMv amF2YS10cy1tb2RlLmVsCkBAIC0xMzQsOCArMTM0LDcgQEAgamF2YS10cy1tb2RlLS1mb250LWxv Y2stc2V0dGluZ3MKICAgIDpmZWF0dXJlICdjb25zdGFudAogICAgYCgoKGlkZW50aWZpZXIpIEBm b250LWxvY2stY29uc3RhbnQtZmFjZQogICAgICAgKDptYXRjaCAiXltBLVpfXVtBLVpfXFxkXSok IiBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2UpKQotICAgICAodHJ1ZSkgQGZvbnQtbG9jay1jb25z dGFudC1mYWNlCi0gICAgIChmYWxzZSkgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgICBb KHRydWUpIChmYWxzZSldIEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkKICAgIDpsYW5ndWFnZSAn amF2YQogICAgOm92ZXJyaWRlIHQKICAgIDpmZWF0dXJlICdrZXl3b3JkCkBAIC0xNjMsOCArMTYy LDEyIEBAIGphdmEtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICA6b3ZlcnJpZGUgdAog ICAgOmZlYXR1cmUgJ2xpdGVyYWwKICAgIGAoKG51bGxfbGl0ZXJhbCkgQGZvbnQtbG9jay1jb25z dGFudC1mYWNlCi0gICAgIChkZWNpbWFsX2Zsb2F0aW5nX3BvaW50X2xpdGVyYWwpICBAZm9udC1s b2NrLWNvbnN0YW50LWZhY2UKLSAgICAgKGhleF9mbG9hdGluZ19wb2ludF9saXRlcmFsKSBAZm9u dC1sb2NrLWNvbnN0YW50LWZhY2UpCisgICAgIChiaW5hcnlfaW50ZWdlcl9saXRlcmFsKSAgQGZv bnQtbG9jay1udW1iZXItZmFjZQorICAgICAoZGVjaW1hbF9pbnRlZ2VyX2xpdGVyYWwpIEBmb250 LWxvY2stbnVtYmVyLWZhY2UKKyAgICAgKGhleF9pbnRlZ2VyX2xpdGVyYWwpIEBmb250LWxvY2st bnVtYmVyLWZhY2UKKyAgICAgKG9jdGFsX2ludGVnZXJfbGl0ZXJhbCkgQGZvbnQtbG9jay1udW1i ZXItZmFjZQorICAgICAoZGVjaW1hbF9mbG9hdGluZ19wb2ludF9saXRlcmFsKSBAZm9udC1sb2Nr LW51bWJlci1mYWNlCisgICAgIChoZXhfZmxvYXRpbmdfcG9pbnRfbGl0ZXJhbCkgQGZvbnQtbG9j ay1udW1iZXItZmFjZSkKICAgIDpsYW5ndWFnZSAnamF2YQogICAgOm92ZXJyaWRlIHQKICAgIDpm ZWF0dXJlICd0eXBlCkBAIC0zMTQsOCArMzE3LDggQEAgamF2YS10cy1tb2RlCiAgIDs7IEZvbnQt bG9jay4KICAgKHNldHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MgamF2YS10cy1t b2RlLS1mb250LWxvY2stc2V0dGluZ3MpCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2Nr LWZlYXR1cmUtbGlzdAotICAgICAgICAgICAgICAnKChjb21tZW50IGtleXdvcmQgY29uc3RhbnQg c3RyaW5nKQotICAgICAgICAgICAgICAgICh0eXBlIGRlZmluaXRpb24gZXhwcmVzc2lvbiBsaXRl cmFsIGFubm90YXRpb24pCisgICAgICAgICAgICAgICcoKGNvbW1lbnQgY29uc3RhbnQga2V5d29y ZCBzdHJpbmcpCisgICAgICAgICAgICAgICAgKGFubm90YXRpb24gZGVmaW5pdGlvbiBleHByZXNz aW9uIGxpdGVyYWwgdHlwZSkKICAgICAgICAgICAgICAgICAoYnJhY2tldCBkZWxpbWl0ZXIgb3Bl cmF0b3IpKSkKIAogICA7OyBJbWVudS4KZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2pzLmVs IGIvbGlzcC9wcm9nbW9kZXMvanMuZWwKaW5kZXggNTFkMTA1YjlkN2QuLmRhMDViN2IzNjRhIDEw MDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9qcy5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9qcy5l bApAQCAtMzQ2NSw2ICszNDY1LDEzIEBAIGpzLS10cmVlc2l0LWtleXdvcmRzCiAgICAgInR5cGVv ZiIgInZhciIgInZvaWQiICJ3aGlsZSIgIndpdGgiICJ5aWVsZCIpCiAgICJKYXZhU2NyaXB0IGtl eXdvcmRzIGZvciB0cmVlLXNpdHRlciBmb250LWxvY2tpbmcuIikKIAorKGRlZnZhciBqcy0tdHJl ZXNpdC1vcGVyYXRvcnMKKyAgJygiPSIgIis9IiAiLT0iICIqPSIgIi89IiAiJT0iICIqKj0iICI8 PD0iICI+Pj0iICI+Pj49IiAiJj0iICJePSIKKyAgICAifD0iICImJj0iICJ8fD0iICI/Pz0iICI9 PSIgIiE9IiAiPT09IiAiIT09IiAiPiIgIj49IiAiPCIgIjw9IiAiKyIKKyAgICAiLSIgIioiICIv IiAiJSIgIisrIiAiLS0iICIqKiIgIiYiICJ8IiAiXiIgIn4iICI8PCIgIj4+IiAiPj4+IgorICAg ICImJiIgInx8IiAiISIpCisgICJKYXZhU2NyaXB0IG9wZXJhdG9ycyBmb3IgdHJlZS1zaXR0ZXIg Zm9udC1sb2NraW5nLiIpCisKIChkZWZ2YXIganMtLXRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdz CiAgICh0cmVlc2l0LWZvbnQtbG9jay1ydWxlcwogCkBAIC0zNDc5LDggKzM0ODYsNyBAQCBqcy0t dHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MKICAgIGAoKChpZGVudGlmaWVyKSBAZm9udC1sb2Nr LWNvbnN0YW50LWZhY2UKICAgICAgICg6bWF0Y2ggIl5bQS1aX11bQS1aX1xcZF0qJCIgQGZvbnQt bG9jay1jb25zdGFudC1mYWNlKSkKIAotICAgICBbKHRydWUpIChmYWxzZSkgKG51bGwpXSBAZm9u dC1sb2NrLWNvbnN0YW50LWZhY2UKLSAgICAgKG51bWJlcikgQGZvbnQtbG9jay1jb25zdGFudC1m YWNlKQorICAgICBbKHRydWUpIChmYWxzZSkgKG51bGwpXSBAZm9udC1sb2NrLWNvbnN0YW50LWZh Y2UpCiAKICAgIDpsYW5ndWFnZSAnamF2YXNjcmlwdAogICAgOm92ZXJyaWRlIHQKQEAgLTM1NTcs MjEgKzM1NjMsNiBAQCBqcy0tdHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MKICAgICAgICAgICAg ICAobWVtYmVyX2V4cHJlc3Npb24KICAgICAgICAgICAgICAgcHJvcGVydHk6IChwcm9wZXJ0eV9p ZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSldKSkKIAotICAgOmxhbmd1 YWdlICdqYXZhc2NyaXB0Ci0gICA6b3ZlcnJpZGUgdAotICAgOmZlYXR1cmUgJ3Byb3BlcnR5Ci0g ICBgKChwYWlyIGtleTogKHByb3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUt bmFtZS1mYWNlKQotCi0gICAgIChwYWlyIHZhbHVlOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12 YXJpYWJsZS1uYW1lLWZhY2UpCi0KLSAgICAgKHBhaXIKLSAgICAgIGtleTogKHByb3BlcnR5X2lk ZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlCi0gICAgICB2YWx1ZTogWyhm dW5jdGlvbikgKGFycm93X2Z1bmN0aW9uKV0pCi0KLSAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlf aWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCi0KLSAgICAgKChzaG9y dGhhbmRfcHJvcGVydHlfaWRlbnRpZmllcl9wYXR0ZXJuKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5h bWUtZmFjZSkpCi0KICAgIDpsYW5ndWFnZSAnamF2YXNjcmlwdAogICAgOm92ZXJyaWRlIHQKICAg IDpmZWF0dXJlICdwYXR0ZXJuCkBAIC0zNTk2LDcgKzM1ODcsNDIgQEAganMtLXRyZWVzaXQtZm9u dC1sb2NrLXNldHRpbmdzCiAKICAgICAgKGpzeF9hdHRyaWJ1dGUKICAgICAgIChwcm9wZXJ0eV9p ZGVudGlmaWVyKQotICAgICAgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKSkpCisgICAgICBAZm9u dC1sb2NrLWNvbnN0YW50LWZhY2UpKQorCisgICA6bGFuZ3VhZ2UgJ2phdmFzY3JpcHQKKyAgIDpm ZWF0dXJlICdudW1iZXIKKyAgIGAoKG51bWJlcikgQGZvbnQtbG9jay1udW1iZXItZmFjZQorICAg ICAoKGlkZW50aWZpZXIpIEBmb250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAgICg6bWF0Y2ggIl5c XCg6P05hTlxcfEluZmluaXR5XFwpJCIgQGZvbnQtbG9jay1udW1iZXItZmFjZSkpKQorCisgICA6 bGFuZ3VhZ2UgJ2phdmFzY3JpcHQKKyAgIDpmZWF0dXJlICdvcGVyYXRvcgorICAgYChbLEBqcy0t dHJlZXNpdC1vcGVyYXRvcnNdIEBmb250LWxvY2stb3BlcmF0b3ItZmFjZQorICAgICAodGVybmFy eV9leHByZXNzaW9uIFsiPyIgIjoiXSBAZm9udC1sb2NrLW9wZXJhdG9yLWZhY2UpKQorCisgICA6 bGFuZ3VhZ2UgJ2phdmFzY3JpcHQKKyAgIDpmZWF0dXJlICdicmFja2V0CisgICAnKChbIigiICIp IiAiWyIgIl0iICJ7IiAifSJdKSBAZm9udC1sb2NrLWJyYWNrZXQtZmFjZSkKKworICAgOmxhbmd1 YWdlICdqYXZhc2NyaXB0CisgICA6ZmVhdHVyZSAnZGVsaW1pdGVyCisgICAnKChbIiwiICIuIiAi OyIgIjoiXSkgQGZvbnQtbG9jay1kZWxpbWl0ZXItZmFjZSkKKworICAgOmxhbmd1YWdlICdqYXZh c2NyaXB0CisgICA6ZmVhdHVyZSAnZXNjYXBlLXNlcXVlbmNlCisgICA6b3ZlcnJpZGUgdAorICAg JygoZXNjYXBlX3NlcXVlbmNlKSBAZm9udC1sb2NrLWVzY2FwZS1mYWNlKQorCisgICA6bGFuZ3Vh Z2UgJ2phdmFzY3JpcHQKKyAgIDpvdmVycmlkZSB0CisgICA6ZmVhdHVyZSAncHJvcGVydHkKKyAg IGAoKHByb3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxvY2stcHJvcGVydHktZmFjZQorCisgICAg IChwYWlyIHZhbHVlOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2Up CisKKyAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcm9w ZXJ0eS1mYWNlKQorCisgICAgICgoc2hvcnRoYW5kX3Byb3BlcnR5X2lkZW50aWZpZXJfcGF0dGVy bikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKSkpCiAgICJUcmVlLXNpdHRlciBmb250LWxvY2sg c2V0dGluZ3MuIikKIAogKGRlZnVuIGpzLS1mb250aWZ5LXRlbXBsYXRlLXN0cmluZyAobm9kZSBv dmVycmlkZSBzdGFydCBlbmQgJnJlc3QgXykKQEAgLTM4NDYsOSArMzg3MiwxMCBAQCBqcy10cy1t b2RlCiAgICAgOzsgRm9udGlmaWNhdGlvbi4KICAgICAoc2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQt bG9jay1zZXR0aW5ncyBqcy0tdHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MpCiAgICAgKHNldHEt bG9jYWwgdHJlZXNpdC1mb250LWxvY2stZmVhdHVyZS1saXN0Ci0gICAgICAgICAgICAgICAgJygo Y29tbWVudCBkZWNsYXJhdGlvbikKLSAgICAgICAgICAgICAgICAgIChzdHJpbmcga2V5d29yZCBp ZGVudGlmaWVyIGV4cHJlc3Npb24gY29uc3RhbnQpCi0gICAgICAgICAgICAgICAgICAocHJvcGVy dHkgcGF0dGVybiBqc3ggKSkpCisgICAgICAgICAgICAgICAgJygoIGNvbW1lbnQgZGVjbGFyYXRp b24pCisgICAgICAgICAgICAgICAgICAoIGNvbnN0YW50IGV4cHJlc3Npb24gaWRlbnRpZmllciBr ZXl3b3JkIG51bWJlciBzdHJpbmcpCisgICAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1p dGVyIGVzY2FwZS1zZXF1ZW5jZSBqc3ggb3BlcmF0b3IKKyAgICAgICAgICAgICAgICAgICAgcGF0 dGVybiBwcm9wZXJ0eSkpKQogICAgIDs7IEltZW51CiAgICAgKHNldHEtbG9jYWwgaW1lbnUtY3Jl YXRlLWluZGV4LWZ1bmN0aW9uCiAgICAgICAgICAgICAgICAgIydqcy0tdHJlZXNpdC1pbWVudSkK ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL2pzb24tdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21v ZGVzL2pzb24tdHMtbW9kZS5lbAppbmRleCA0ZWEyODViZDQzOS4uMTAxZTg3M2NmNmUgMTAwNjQ0 Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2pzb24tdHMtbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rl cy9qc29uLXRzLW1vZGUuZWwKQEAgLTc0LDI2ICs3NCwyOCBAQCBqc29uLXRzLS1pbmRlbnQtcnVs ZXMKIChkZWZ2YXIganNvbi10cy1tb2RlLS1mb250LWxvY2stc2V0dGluZ3MKICAgKHRyZWVzaXQt Zm9udC1sb2NrLXJ1bGVzCiAgICA6bGFuZ3VhZ2UgJ2pzb24KLSAgIDpmZWF0dXJlICdjb21tZW50 Ci0gICA6b3ZlcnJpZGUgdAotICAgJygoY29tbWVudCkgQGZvbnQtbG9jay1jb21tZW50LWZhY2Up CisgICA6ZmVhdHVyZSAnYnJhY2tldAorICAgJygoWyJbIiAiXSIgInsiICJ9Il0pIEBmb250LWxv Y2stYnJhY2tldC1mYWNlKQogICAgOmxhbmd1YWdlICdqc29uCi0gICA6ZmVhdHVyZSAnc3RyaW5n Ci0gICA6b3ZlcnJpZGUgdAotICAgJygoZXNjYXBlX3NlcXVlbmNlKSBAZm9udC1sb2NrLWNvbnN0 YW50LWZhY2UKLSAgICAgKHN0cmluZykgQGZvbnQtbG9jay1zdHJpbmctZmFjZSkKKyAgIDpmZWF0 dXJlICdjb25zdGFudAorICAgJyhbKG51bGwpICh0cnVlKSAoZmFsc2UpXSBAZm9udC1sb2NrLWNv bnN0YW50LWZhY2UpCisgICA6bGFuZ3VhZ2UgJ2pzb24KKyAgIDpmZWF0dXJlICdkZWxpbWl0ZXIK KyAgICcoKFsiLCIgIjoiXSkgQGZvbnQtbG9jay1kZWxpbWl0ZXItZmFjZSkKICAgIDpsYW5ndWFn ZSAnanNvbgogICAgOmZlYXR1cmUgJ251bWJlcgotICAgOm92ZXJyaWRlIHQKLSAgICcoKG51bWJl cikgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgJygobnVtYmVyKSBAZm9udC1sb2NrLW51 bWJlci1mYWNlKQogICAgOmxhbmd1YWdlICdqc29uCi0gICA6ZmVhdHVyZSAnY29uc3RhbnQKKyAg IDpmZWF0dXJlICdzdHJpbmcKKyAgICcoKHN0cmluZykgQGZvbnQtbG9jay1zdHJpbmctZmFjZSkK KyAgIDpsYW5ndWFnZSAnanNvbgorICAgOmZlYXR1cmUgJ2VzY2FwZS1zZXF1ZW5jZQogICAgOm92 ZXJyaWRlIHQKLSAgICcoWyhudWxsKSAodHJ1ZSkgKGZhbHNlKV0gQGZvbnQtbG9jay1jb25zdGFu dC1mYWNlKQorICAgJygoZXNjYXBlX3NlcXVlbmNlKSBAZm9udC1sb2NrLWVzY2FwZS1mYWNlKQog ICAgOmxhbmd1YWdlICdqc29uCi0gICA6ZmVhdHVyZSAncGFpcgorICAgOmZlYXR1cmUgJ2Vycm9y CiAgICA6b3ZlcnJpZGUgdAotICAgYCgocGFpciBrZXk6IChfKSBAZm9udC1sb2NrLXZhcmlhYmxl LW5hbWUtZmFjZSkpKQorICAgJygoRVJST1IpIEBmb250LWxvY2std2FybmluZy1mYWNlKSkKICAg IkZvbnQtbG9jayBzZXR0aW5ncyBmb3IgSlNPTi4iKQogCiAoZGVmdW4ganNvbi10cy1tb2RlLS1p bWVudS0xIChub2RlKQpAQCAtMTU0LDcgKzE1Niw5IEBAIGpzb24tdHMtbW9kZQogICA7OyBGb250 LWxvY2suCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdzIGpzb24tdHMt bW9kZS0tZm9udC1sb2NrLXNldHRpbmdzKQogICAoc2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9j ay1mZWF0dXJlLWxpc3QKLSAgICAgICAgICAgICAgJygoY29tbWVudCBzdHJpbmcgbnVtYmVyKSAo Y29uc3RhbnQgcGFpcikgKCkpKQorICAgICAgICAgICAgICAnKChjb25zdGFudCBudW1iZXIgc3Ry aW5nKQorICAgICAgICAgICAgICAgIChlc2NhcGUtc2VxdWVuY2UpCisgICAgICAgICAgICAgICAg KGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yKSkpCiAKICAgOzsgSW1lbnUuCiAgIChzZXRxLWxvY2Fs IGltZW51LWNyZWF0ZS1pbmRleC1mdW5jdGlvbiAjJ2pzb24tdHMtbW9kZS0taW1lbnUpCmRpZmYg LS1naXQgYS9saXNwL3Byb2dtb2Rlcy9zaC1zY3JpcHQuZWwgYi9saXNwL3Byb2dtb2Rlcy9zaC1z Y3JpcHQuZWwKaW5kZXggN2ZlMzE4MDJjNDEuLjA2N2FlZjg2NjkyIDEwMDY0NAotLS0gYS9saXNw L3Byb2dtb2Rlcy9zaC1zY3JpcHQuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvc2gtc2NyaXB0LmVs CkBAIC0xNjA4LDkgKzE2MDgsMTAgQEAgYmFzaC10cy1tb2RlCiAgICJNYWpvciBtb2RlIGZvciBl ZGl0aW5nIEJhc2ggc2hlbGwgc2NyaXB0cy4iCiAgICh3aGVuICh0cmVlc2l0LXJlYWR5LXAgJ2Jh c2gpCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stZmVhdHVyZS1saXN0Ci0gICAg ICAgICAgICAgICAgJygoY29tbWVudCBmdW5jdGlvbiBzdHJpbmcgaGVyZWRvYykKLSAgICAgICAg ICAgICAgICAgICh2YXJpYWJsZSBrZXl3b3JkIGNvbW1hbmQgZGVjbGFyYXRpb24tY29tbWFuZCkK LSAgICAgICAgICAgICAgICAgIChjb25zdGFudCBvcGVyYXRvciBidWlsdGluLXZhcmlhYmxlKSkp CisgICAgICAgICAgICAgICAgJygoIGNvbW1lbnQgZnVuY3Rpb24gaGVyZWRvYyBzdHJpbmcpCisg ICAgICAgICAgICAgICAgICAoIGNvbW1hbmQgZGVjbGFyYXRpb24tY29tbWFuZCBrZXl3b3JkIG51 bWJlciB2YXJpYWJsZSkKKyAgICAgICAgICAgICAgICAgICggYnJhY2tldCBidWlsdGluLXZhcmlh YmxlIGNvbnN0YW50IGRlbGltaXRlcgorICAgICAgICAgICAgICAgICAgICBtaXNjLXB1bmN0dWF0 aW9uIG9wZXJhdG9yKSkpCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stc2V0dGlu Z3MKICAgICAgICAgICAgICAgICBzaC1tb2RlLS10cmVlc2l0LXNldHRpbmdzKQogICAgICh0cmVl c2l0LW1ham9yLW1vZGUtc2V0dXApKSkKQEAgLTMyMTYsOCArMzIxNyw3IEBAIHNoLXNoZWxsY2hl Y2stZmx5bWFrZQogOzs7IFRyZWUtc2l0dGVyIGZvbnQtbG9jawogCiAoZGVmdmFyIHNoLW1vZGUt LXRyZWVzaXQtb3BlcmF0b3JzCi0gICcoInwiICJ8JiIgInx8IiAiJiYiICI+IiAiPj4iICI8IiAi PDwiICI8PC0iICI8PDwiICI9PSIgIiE9IiAiOyIKLSAgICAiOzsiICI7JiIgIjs7JiIpCisgICco InwiICJ8JiIgInx8IiAiJiYiICI+IiAiPj4iICI8IiAiPDwiICI8PC0iICI8PDwiICI9PSIgIiE9 IiAiOyYiICI7OyYiKQogICAiQSBsaXN0IG9mIGBzaC1tb2RlJyBvcGVyYXRvcnMgdG8gZm9udGlm eS4iKQogCiAoZGVmdmFyIHNoLW1vZGUtLXRyZWVzaXQta2V5d29yZHMKQEAgLTMzMTIsNyArMzMx Miw3IEBAIHNoLW1vZGUtLXRyZWVzaXQtc2V0dGluZ3MKIAogICAgOmZlYXR1cmUgJ29wZXJhdG9y CiAgICA6bGFuZ3VhZ2UgJ2Jhc2gKLSAgIGAoWyAsQHNoLW1vZGUtLXRyZWVzaXQtb3BlcmF0b3Jz IF0gQGZvbnQtbG9jay1idWlsdGluLWZhY2UpCisgICBgKFssQHNoLW1vZGUtLXRyZWVzaXQtb3Bl cmF0b3JzXSBAZm9udC1sb2NrLW9wZXJhdG9yLWZhY2UpCiAKICAgIDpmZWF0dXJlICdidWlsdGlu LXZhcmlhYmxlCiAgICA6bGFuZ3VhZ2UgJ2Jhc2gKQEAgLTMzMjIsNyArMzMyMiwyNCBAQCBzaC1t b2RlLS10cmVlc2l0LXNldHRpbmdzCiAgICAgICAgICAgICAgICAgICBgKHNlcSBib2wKICAgICAg ICAgICAgICAgICAgICAgICAgIChvciAsQGJ1aWx0aW4tdmFycykKICAgICAgICAgICAgICAgICAg ICAgICAgIGVvbCkpKQotICAgICAgICAgICAgICBAZm9udC1sb2NrLWJ1aWx0aW4tZmFjZSkpKSkK KyAgICAgICAgICAgICAgQGZvbnQtbG9jay1idWlsdGluLWZhY2UpKSkKKworICAgOmZlYXR1cmUg J251bWJlcgorICAgOmxhbmd1YWdlICdiYXNoCisgICBgKCgod29yZCkgQGZvbnQtbG9jay1udW1i ZXItZmFjZQorICAgICAgKDptYXRjaCAiXlswLTldKyQiIEBmb250LWxvY2stbnVtYmVyLWZhY2Up KSkKKworICAgOmZlYXR1cmUgJ2JyYWNrZXQKKyAgIDpsYW5ndWFnZSAnYmFzaAorICAgJygoWyIo IiAiKSIgIigoIiAiKSkiICJbIiAiXSIgIltbIiAiXV0iICJ7IiAifSJdKSBAZm9udC1sb2NrLWJy YWNrZXQtZmFjZSkKKworICAgOmZlYXR1cmUgJ2RlbGltaXRlcgorICAgOmxhbmd1YWdlICdiYXNo CisgICAnKChbIjsiICI7OyJdKSBAZm9udC1sb2NrLWRlbGltaXRlci1mYWNlKQorCisgICA6ZmVh dHVyZSAnbWlzYy1wdW5jdHVhdGlvbgorICAgOmxhbmd1YWdlICdiYXNoCisgICAnKChbIiQiXSkg QGZvbnQtbG9jay1taXNjLXB1bmN0dWF0aW9uLWZhY2UpKQogICAiVHJlZS1zaXR0ZXIgZm9udC1s b2NrIHNldHRpbmdzIGZvciBgc2gtbW9kZScuIikKIAogKHByb3ZpZGUgJ3NoLXNjcmlwdCkKZGlm ZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3RzLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rlcy90cy1t b2RlLmVsCmluZGV4IGE5MWViYTY1MDFhLi40MzZiMTk4ZjU5NCAxMDA2NDQKLS0tIGEvbGlzcC9w cm9nbW9kZXMvdHMtbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy90cy1tb2RlLmVsCkBAIC0x MDEsNiArMTAxLDEzIEBAIHRzLW1vZGUtLWtleXdvcmRzCiAgICAgIndoaWxlIiAid2l0aCIgInlp ZWxkIikKICAgIlR5cGVTY3JpcHQga2V5d29yZHMgZm9yIHRyZWUtc2l0dGVyIGZvbnQtbG9ja2lu Zy4iKQogCisoZGVmdmFyIHRzLW1vZGUtLW9wZXJhdG9ycworICAnKCI9IiAiKz0iICItPSIgIio9 IiAiLz0iICIlPSIgIioqPSIgIjw8PSIgIj4+PSIgIj4+Pj0iICImPSIgIl49IgorICAgICJ8PSIg IiYmPSIgInx8PSIgIj8/PSIgIj09IiAiIT0iICI9PT0iICIhPT0iICI+IiAiPj0iICI8IiAiPD0i ICIrIgorICAgICItIiAiKiIgIi8iICIlIiAiKysiICItLSIgIioqIiAiJiIgInwiICJeIiAifiIg Ijw8IiAiPj4iICI+Pj4iCisgICAgIiYmIiAifHwiICIhIiAiPy4iKQorICAiVHlwZVNjcmlwdCBv cGVyYXRvcnMgZm9yIHRyZWUtc2l0dGVyIGZvbnQtbG9ja2luZy4iKQorCiAoZGVmdmFyIHRzLW1v ZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAodHJlZXNpdC1mb250LWxvY2stcnVsZXMKICAgIDps YW5ndWFnZSAndHN4CkBAIC0xMTQsOCArMTIxLDcgQEAgdHMtbW9kZS0tZm9udC1sb2NrLXNldHRp bmdzCiAgICBgKCgoaWRlbnRpZmllcikgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlCiAgICAgICAo Om1hdGNoICJeW0EtWl9dW0EtWl9cXGRdKiQiIEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkpCiAK LSAgICAgWyh0cnVlKSAoZmFsc2UpIChudWxsKV0gQGZvbnQtbG9jay1jb25zdGFudC1mYWNlCi0g ICAgIChudW1iZXIpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkKKyAgICAgWyh0cnVlKSAoZmFs c2UpIChudWxsKV0gQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQogCiAgICA6bGFuZ3VhZ2UgJ3Rz eAogICAgOm92ZXJyaWRlIHQKQEAgLTIwNywyNSArMjEzLDYgQEAgdHMtbW9kZS0tZm9udC1sb2Nr LXNldHRpbmdzCiAgICAgICAgKG1lbWJlcl9leHByZXNzaW9uCiAgICAgICAgIHByb3BlcnR5OiAo cHJvcGVydHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpXSkpCiAK LSAgIDpsYW5ndWFnZSAndHN4Ci0gICA6b3ZlcnJpZGUgdAotICAgOmZlYXR1cmUgJ3Byb3BlcnR5 Ci0gICBgKChwYWlyIGtleTogKHByb3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxvY2stcHJvcGVy dHktZmFjZSkKLQotICAgICAocGFpciB2YWx1ZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFy aWFibGUtbmFtZS1mYWNlKQotCi0gICAgIChwYWlyCi0gICAgICBrZXk6IChwcm9wZXJ0eV9pZGVu dGlmaWVyKSBAZm9udC1sb2NrLXByb3BlcnR5LWZhY2UKLSAgICAgIHZhbHVlOiBbKGZ1bmN0aW9u KSAoYXJyb3dfZnVuY3Rpb24pXSkKLQotICAgICAocHJvcGVydHlfc2lnbmF0dXJlCi0gICAgICBu YW1lOiAocHJvcGVydHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKQotCi0g ICAgICgoc2hvcnRoYW5kX3Byb3BlcnR5X2lkZW50aWZpZXIpIEBmb250LWxvY2stcHJvcGVydHkt ZmFjZSkKLQotICAgICAoKHNob3J0aGFuZF9wcm9wZXJ0eV9pZGVudGlmaWVyX3BhdHRlcm4pCi0g ICAgICBAZm9udC1sb2NrLXZhcmlhYmxlLW5hbWUtZmFjZSkpCi0KICAgIDpsYW5ndWFnZSAndHN4 CiAgICA6b3ZlcnJpZGUgdAogICAgOmZlYXR1cmUgJ3BhdHRlcm4KQEAgLTI1MCwxMyArMjM3LDQy IEBAIHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAgICAgQGZvbnQtbG9jay1mdW5jdGlv bi1uYW1lLWZhY2UpCiAKICAgICAgKGpzeF9hdHRyaWJ1dGUgKHByb3BlcnR5X2lkZW50aWZpZXIp IEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkpCisKKyAgIDpsYW5ndWFnZSAndHN4CisgICA6ZmVh dHVyZSAnbnVtYmVyCisgICBgKChudW1iZXIpIEBmb250LWxvY2stbnVtYmVyLWZhY2UKKyAgICAg KChpZGVudGlmaWVyKSBAZm9udC1sb2NrLW51bWJlci1mYWNlCisgICAgICAoOm1hdGNoICJeXFwo Oj9OYU5cXHxJbmZpbml0eVxcKSQiIEBmb250LWxvY2stbnVtYmVyLWZhY2UpKSkKKworICAgOmxh bmd1YWdlICd0c3gKKyAgIDpmZWF0dXJlICdvcGVyYXRvcgorICAgYChbLEB0cy1tb2RlLS1vcGVy YXRvcnNdIEBmb250LWxvY2stb3BlcmF0b3ItZmFjZQorICAgICAodGVybmFyeV9leHByZXNzaW9u IFsiPyIgIjoiXSBAZm9udC1sb2NrLW9wZXJhdG9yLWZhY2UpKQorCiAgICA6bGFuZ3VhZ2UgJ3Rz eAogICAgOmZlYXR1cmUgJ2JyYWNrZXQKICAgICcoKFsiKCIgIikiICJbIiAiXSIgInsiICJ9Il0p IEBmb250LWxvY2stYnJhY2tldC1mYWNlKQogCiAgICA6bGFuZ3VhZ2UgJ3RzeAogICAgOmZlYXR1 cmUgJ2RlbGltaXRlcgotICAgJygoWyIsIiAiOiIgIjsiXSkgQGZvbnQtbG9jay1kZWxpbWl0ZXIt ZmFjZSkpCisgICAnKChbIiwiICIuIiAiOyIgIjoiXSkgQGZvbnQtbG9jay1kZWxpbWl0ZXItZmFj ZSkKKworICAgOmxhbmd1YWdlICd0c3gKKyAgIDpmZWF0dXJlICdlc2NhcGUtc2VxdWVuY2UKKyAg IDpvdmVycmlkZSB0CisgICAnKChlc2NhcGVfc2VxdWVuY2UpIEBmb250LWxvY2stZXNjYXBlLWZh Y2UpCisKKyAgIDpsYW5ndWFnZSAndHN4CisgICA6b3ZlcnJpZGUgdAorICAgOmZlYXR1cmUgJ3By b3BlcnR5CisgICBgKCgocHJvcGVydHlfaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcm9wZXJ0eS1m YWNlKQorCisgICAgIChwYWlyIHZhbHVlOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJs ZS1uYW1lLWZhY2UpCisKKyAgICAgKChzaG9ydGhhbmRfcHJvcGVydHlfaWRlbnRpZmllcikgQGZv bnQtbG9jay1wcm9wZXJ0eS1mYWNlKQorCisgICAgICgoc2hvcnRoYW5kX3Byb3BlcnR5X2lkZW50 aWZpZXJfcGF0dGVybikKKyAgICAgIEBmb250LWxvY2stcHJvcGVydHktZmFjZSkpKQogICAiVHJl ZS1zaXR0ZXIgZm9udC1sb2NrIHNldHRpbmdzLiIpCiAKIDs7OyMjI2F1dG9sb2FkCkBAIC0zMDMs OCArMzE5LDggQEAgdHMtbW9kZQogICAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLXNl dHRpbmdzIHRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncykKICAgICAoc2V0cS1sb2NhbCB0cmVl c2l0LWZvbnQtbG9jay1mZWF0dXJlLWxpc3QKICAgICAgICAgICAgICAgICAnKChjb21tZW50IGRl Y2xhcmF0aW9uKQotICAgICAgICAgICAgICAgICAgKHN0cmluZyBrZXl3b3JkIGlkZW50aWZpZXIg ZXhwcmVzc2lvbiBjb25zdGFudCkKLSAgICAgICAgICAgICAgICAgIChwcm9wZXJ0eSBwYXR0ZXJu IGpzeCBicmFja2V0IGRlbGltaXRlcikpKQorICAgICAgICAgICAgICAgICAgKGNvbnN0YW50IGV4 cHJlc3Npb24gaWRlbnRpZmllciBrZXl3b3JkIG51bWJlciBzdHJpbmcpCisgICAgICAgICAgICAg ICAgICAoYnJhY2tldCBkZWxpbWl0ZXIganN4IHBhdHRlcm4gcHJvcGVydHkpKSkKICAgICA7OyBJ bWVudS4KICAgICAoc2V0cS1sb2NhbCBpbWVudS1jcmVhdGUtaW5kZXgtZnVuY3Rpb24gIydqcy0t dHJlZXNpdC1pbWVudSkKIAotLSAKMi4zOC4xCgo= --b1_V8Khyjp4Ku5zKE1fGvY6Qmneqff2Rx6FwXEig425c-- From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 22 20:50:01 2022 Received: (at 59397-done) by debbugs.gnu.org; 23 Nov 2022 01:50:01 +0000 Received: from localhost ([127.0.0.1]:52972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxetk-0005sq-Qz for submit@debbugs.gnu.org; Tue, 22 Nov 2022 20:50:01 -0500 Received: from mail-pf1-f171.google.com ([209.85.210.171]:40549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxetj-0005sd-Bt for 59397-done@debbugs.gnu.org; Tue, 22 Nov 2022 20:49:59 -0500 Received: by mail-pf1-f171.google.com with SMTP id y13so16025626pfp.7 for <59397-done@debbugs.gnu.org>; Tue, 22 Nov 2022 17:49:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=QA6JgLY8AhoBz0/t97JbowLEYz2cEx6xPz51DSq0fjs=; b=McLDnrIG/EvWIg8uDj8TOTPGznyCJA9IZx7NAxfMAAbtD7xv1CmFL0vhsOvSFCD9ad GxZIhlvGECvbZHjN2L6s1DT7J+jPQndHzjpxbTJmARK4jPuPazSeWiXYwgwXKo6cRoVa zq4cvR8L9Vt2m+QB2d4/5Fdw4C4UfErs1ovxmZq+e0uGF8JF+dUY22+vwtZzmtVmf7WN LzDVV1tez7d4jDCZR/dGij6BvjrdOm5JhzzK6+p7CAcqKqTd/2BmuX7Gqq+xbt8qsS5k HoAkWh0qWK5ETOXGX42gyFNlPZXAqLeieajvmintZAfJdo9nVTXIsAsIfG0Gl6oUIiED 66Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QA6JgLY8AhoBz0/t97JbowLEYz2cEx6xPz51DSq0fjs=; b=tS1v3Tro8ckFCQu/m5rxqzbGBVxjsFLeRC+1iwqXTwKo2Q2+Lvnm0V1Wx2LiuLU28s B5KMo8FUGoHVNO/xp//Himl96ZJzKtMwilbSHWrELBjQyk9/Cn4HtNNepbkF5qWDnaRT /HqQtpsTHFLJU86jteaoRqqkUcShtxqh9GmsvYQ63pHebFZjC6e+TEBvKnJsUlSNDtP+ BjmnpImwddtb33rl4NTL5oIh//ecEs9LV4oxrXDqf+S7Gx7tAHmuiDH8bdtht/k/c4w4 AF0Er7Lzm+onUyxVKDSq1r4Aip4JzpFTmTkvzyaypaUcTpDb08HTafGTrhNb/i5/lXzR 2f+w== X-Gm-Message-State: ANoB5pn83txYr9ULaw6BGE1vix5sIkyLIG8Vl9yu3ETqrnLMDyBAzqlX Yw4EuVojYDfWblxK3cBBiCo= X-Google-Smtp-Source: AA0mqf6UsGUrCSDR2dMdUgxrb6gpZzzgKymcOOok37Hz6UKzl8FprPILib9C+uidJgsuf3UFpLR3rQ== X-Received: by 2002:a05:6a00:f8a:b0:56c:2576:9d2a with SMTP id ct10-20020a056a000f8a00b0056c25769d2amr8416186pfb.60.1669168193401; Tue, 22 Nov 2022 17:49:53 -0800 (PST) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id x4-20020a1709029a4400b0018853dd8832sm12652255plv.4.2022.11.22.17.49.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2022 17:49:53 -0800 (PST) From: Yuan Fu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Subject: Re: bug#59397: [PATCH] feature/tree-sitter: Utilize new font-lock faces for more tree-sitter backed modes Message-Id: <4EAF68CB-CE82-47A6-B0F1-8A3C7D2236F4@gmail.com> Date: Tue, 22 Nov 2022 17:49:51 -0800 To: Randy Taylor X-Mailer: Apple Mail (2.3696.120.41.1.1) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59397-done Cc: Theodor Thornhill , 59397-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Randy Taylor writes: > On Monday, November 21st, 2022 at 22:38, Randy Taylor = wrote: >>=20 >> On Monday, November 21st, 2022 at 16:49, Yuan Fu casouri@gmail.com = wrote: >>=20 >> > Thanks! I was busy with other things, but I=E2=80=99ll try to merge = this soon! >> >=20 >> > Yuan >>=20 >>=20 >> No worries, take your time. >>=20 >> It's probably best to merge Theo's first (Bug#59445) since it's = smaller, after which I will rebase and post a new patch. >>=20 > > OK, latest and greatest patch attached. Thanks! I merged it. Yuan From unknown Mon Sep 08 16:47:27 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 21 Dec 2022 12:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator