From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Protesilaos Stavrou Newsgroups: gmane.emacs.bugs Subject: bug#46971: 28.0.60; [PATCH] Disable modus-themes font mixing by default (bug#46971) Date: Wed, 06 Oct 2021 16:53:31 +0300 Message-ID: <877deqxns4.fsf@protesilaos.com> References: <831rcsw6cu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30790"; mail-complaints-to="usenet@ciao.gmane.io" To: 46971@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Oct 06 15:54:10 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mY7N4-0007fM-8N for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 06 Oct 2021 15:54:10 +0200 Original-Received: from localhost ([::1]:35014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mY7N2-0005g7-Ks for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 06 Oct 2021 09:54:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY7Mw-0005fc-HS for bug-gnu-emacs@gnu.org; Wed, 06 Oct 2021 09:54:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59676) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mY7Mw-0002B6-9N for bug-gnu-emacs@gnu.org; Wed, 06 Oct 2021 09:54:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mY7Mv-0008Ts-W7 for bug-gnu-emacs@gnu.org; Wed, 06 Oct 2021 09:54:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <831rcsw6cu.fsf@gnu.org> Resent-From: Protesilaos Stavrou Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 06 Oct 2021 13:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46971 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.163352842832573 (code B ref -1); Wed, 06 Oct 2021 13:54:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Oct 2021 13:53:48 +0000 Original-Received: from localhost ([127.0.0.1]:42989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mY7Mh-0008TF-W9 for submit@debbugs.gnu.org; Wed, 06 Oct 2021 09:53:48 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:38402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mY7Md-0008T5-8n for submit@debbugs.gnu.org; Wed, 06 Oct 2021 09:53:46 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY7Md-0005ei-0e for bug-gnu-emacs@gnu.org; Wed, 06 Oct 2021 09:53:43 -0400 Original-Received: from relay11.mail.gandi.net ([217.70.178.231]:34243) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mY7MY-0001rD-MZ for bug-gnu-emacs@gnu.org; Wed, 06 Oct 2021 09:53:41 -0400 Original-Received: (Authenticated sender: public@protesilaos.com) by relay11.mail.gandi.net (Postfix) with ESMTPSA id CC507100005 for ; Wed, 6 Oct 2021 13:53:33 +0000 (UTC) Received-SPF: none client-ip=217.70.178.231; envelope-from=info@protesilaos.com; helo=relay11.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:216561 Archived-At: --=-=-= Content-Type: text/plain Dear maintainers, This is a bugfix for the emacs-28 branch, prompted by the discussion in bug#46971. It changes the default behaviour of the modus-themes to not inherit the 'fixed-pitch' face in various spacing sensitive faces. This now becomes an opt-in feature and its utility is documented in the doc string of the new user option as well as the manual. Note that I have already made these changes to the modus-themes repo and was planning to sync them with the Emacs 'master' branch upon the next release of the project (maybe in a month from now). Please let me know if you think this should be applied to emacs-28. All the best, Protesilaos -- Protesilaos Stavrou https://protesilaos.com --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-Disable-modus-themes-font-mixing-by-default-bug-4697.patch Content-Transfer-Encoding: base64 RnJvbSBiNjY5MjRiZTZkMTM0NDgwYjc2OTk4MmMxZTZhMTljYjRlOTY4MDUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KTWVzc2FnZS1JZDogPGI2NjkyNGJlNmQxMzQ0ODBiNzY5OTgyYzFlNmEx OWNiNGU5NjgwNTIuMTYzMzUyNzYzOS5naXQuaW5mb0Bwcm90ZXNpbGFvcy5jb20+DQpGcm9tOiBQ cm90ZXNpbGFvcyBTdGF2cm91IDxpbmZvQHByb3Rlc2lsYW9zLmNvbT4NCkRhdGU6IFdlZCwgNiBP Y3QgMjAyMSAxNjo0MDoxOCArMDMwMA0KU3ViamVjdDogW1BBVENIXSBEaXNhYmxlIG1vZHVzLXRo ZW1lcyBmb250IG1peGluZyBieSBkZWZhdWx0IChidWcjNDY5NzEpDQoNCiogZG9jL21pc2MvbW9k dXMtdGhlbWVzLm9yZyAoQ3VzdG9taXphdGlvbiBPcHRpb25zKTogSW5jbHVkZSBuZXcgdXNlcg0K b3B0aW9uIGluIGNvZGUgc2FtcGxlLg0KKE9wdGlvbiBmb3Igbm8gZm9udCBtaXhpbmcsIE9wdGlv biBmb3IgZm9udCBtaXhpbmcpOiBSZXdyaXRlIHRoZQ0Kc2VjdGlvbiBvbiBmb250IG1peGluZyB0 byBleHBsYWluIHRoZSBuZXcgYmVoYXZpb3VyIG9mIG5vdCBpbmhlcml0aW5nDQp0aGUgJ2ZpeGVk LXBpdGNoJyBmYWNlIGJ5IGRlZmF1bHQuICBVc2VycyBtdXN0IG9wdC1pbiBpbnN0ZWFkLg0KKEFj a25vd2xlZGdlbWVudHMpOiBBY2tub3dsZWRnZSBuYW1lIG9mIHBlcnNvbiB3aG8gZmlyc3QgcmVw b3J0ZWQgdGhlDQpwcm9ibGVtIHdpdGggdGhlIG9sZCBvcHRpb24uDQoNCiogZXRjL3RoZW1lcy9t b2R1cy10aGVtZXMuZWwgKG1vZHVzLXRoZW1lcy12YXJpYWJsZS1waXRjaCkNCihtb2R1cy10aGVt ZXMtZml4ZWQtcGl0Y2gpOiBVcGRhdGUgZG9jIHN0cmluZ3MgdG8gbWVudGlvbiBuZXcgdXNlcg0K b3B0aW9uLg0KKG1vZHVzLXRoZW1lcy1uby1taXhlZC1mb250cyk6IERlcHJlY2F0ZSBvbGQgdXNl ciBvcHRpb24gYW5kIHJlcGxhY2UNCml0IHdpdGggJ21vZHVzLXRoZW1lcy1taXhlZC1mb250cycu DQoobW9kdXMtdGhlbWVzLW1peGVkLWZvbnRzKTogQWRkIG5ldyBkZWZjdXN0b20uDQoobW9kdXMt dGhlbWVzLS1maXhlZC1waXRjaCk6IENoYW5nZSB0aGUgd2F5IGluaGVyaXRhbmNlIG9mDQonZml4 ZWQtcGl0Y2gnIGlzIGhhbmRsZWQsIHNvIHRoYXQgaXQgaXMgZGlzYWJsZWQgYnkgZGVmYXVsdC4N Cihtb2R1cy10aGVtZXMtZmFjZXMpOiBVcGRhdGUgb25lIGZhY2UgdGhhdCBuZWVkcyB0byBpbmhl cml0DQonZml4ZWQtcGl0Y2gnIGNvbmRpdGlvbmFsbHksIHNvIHRoYXQgaXQgZG9lcyBub3QgZG8g aXQgYnkgZGVmYXVsdC4NCg0KRml4ZXMgYnVnIzQ2OTcxLCB3aGljaCBhY3R1YWxseSB3YXMgYWJv dXQgdGhlIG1vZHVzLXRoZW1lcy4NCi0tLQ0KIGRvYy9taXNjL21vZHVzLXRoZW1lcy5vcmcgIHwg NTQgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0NCiBldGMvdGhlbWVzL21v ZHVzLXRoZW1lcy5lbCB8IDQ0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0NCiAyIGZp bGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDQ3IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0t Z2l0IGEvZG9jL21pc2MvbW9kdXMtdGhlbWVzLm9yZyBiL2RvYy9taXNjL21vZHVzLXRoZW1lcy5v cmcNCmluZGV4IDY3NTE0NGQ1MTcuLjllMjk0ZDYyZTkgMTAwNjQ0DQotLS0gYS9kb2MvbWlzYy9t b2R1cy10aGVtZXMub3JnDQorKysgYi9kb2MvbWlzYy9tb2R1cy10aGVtZXMub3JnDQpAQCAtMzgw LDcgKzM4MCw3IEBAICogQ3VzdG9taXphdGlvbiBPcHRpb25zDQogIytiZWdpbl9zcmMgZW1hY3Mt bGlzcA0KIChzZXRxIG1vZHVzLXRoZW1lcy1pdGFsaWMtY29uc3RydWN0cyB0DQogICAgICAgbW9k dXMtdGhlbWVzLWJvbGQtY29uc3RydWN0cyBuaWwNCi0gICAgICBtb2R1cy10aGVtZXMtbm8tbWl4 ZWQtZm9udHMgbmlsDQorICAgICAgbW9kdXMtdGhlbWVzLW1peGVkLWZvbnRzIG5pbA0KICAgICAg IG1vZHVzLXRoZW1lcy1zdWJ0bGUtbGluZS1udW1iZXJzIG5pbA0KICAgICAgIG1vZHVzLXRoZW1l cy1zdWNjZXNzLWRldXRlcmFub3BpYSB0DQogICAgICAgbW9kdXMtdGhlbWVzLXRhYnMtYWNjZW50 ZWQgdA0KQEAgLTYyOSwzNiArNjI5LDM4IEBAICoqIE9wdGlvbiBmb3Igc3ludGF4IGhpZ2hsaWdo dGluZw0KIA0KIFtbI2g6OTc3YzkwMGQtMGQ2ZC00ZGJiLTgyZDktYzJhYWU2OTU0M2Q2XVtPcHRp b24gZm9yIG1vcmUgaXRhbGljIGNvbnN0cnVjdHNdXS4NCiANCi0qKiBPcHRpb24gZm9yIG5vIGZv bnQgbWl4aW5nDQorKiogT3B0aW9uIGZvciBmb250IG1peGluZw0KIDpwcm9wZXJ0aWVzOg0KLTph bHRfdGl0bGU6IE5vIG1peGVkIGZvbnRzDQorOmFsdF90aXRsZTogTWl4ZWQgZm9udHMNCiA6ZGVz Y3JpcHRpb246IFRvZ2dsZSBtaXhpbmcgb2YgZm9udCBmYW1pbGllcw0KIDpjdXN0b21faWQ6IGg6 MTE1ZTZjMjMtZWUzNS00YTE2LThjZWYtZTJmY2JiMDhlMjhiDQogOmVuZDoNCiAjK3ZpbmRleDog bW9kdXMtdGhlbWVzLW5vLW1peGVkLWZvbnRzDQogDQotU3ltYm9sOiB+bW9kdXMtdGhlbWVzLW5v LW1peGVkLWZvbnRzfg0KK1N5bWJvbDogfm1vZHVzLXRoZW1lcy1taXhlZC1mb250c34NCiANCiBQ b3NzaWJsZSB2YWx1ZXM6DQogDQogMS4gfm5pbH4gKGRlZmF1bHQpDQogMi4gfnR+DQogDQotQnkg ZGVmYXVsdCwgdGhlIHRoZW1lcyBjb25maWd1cmUgc29tZSBzcGFjaW5nLXNlbnNpdGl2ZSBmYWNl cyBsaWtlIE9yZw0KK1doZW4gc2V0IHRvIG5vbi1uaWwgKH50fiksIGNvbmZpZ3VyZSBzb21lIHNw YWNpbmctc2Vuc2l0aXZlIGZhY2VzIGxpa2UgT3JnDQogdGFibGVzIGFuZCBjb2RlIGJsb2NrcyB0 byBhbHdheXMgaW5oZXJpdCBmcm9tIHRoZSB+Zml4ZWQtcGl0Y2h+IGZhY2UuDQotVGhpcyBpcyB0 byBlbnN1cmUgdGhhdCB0aG9zZSBjb25zdHJ1Y3RzIHJlbWFpbiBtb25vc3BhY2VkIGV2ZW4gd2hl bg0KLXVzZXJzIG9wdCBmb3IgYSBtb2RlIHRoYXQgcmVtYXBzIHR5cGVmYWNlIGZhbWlsaWVzLCBz dWNoIGFzIHRoZSBidWlsdC1pbg0KLXt7e2tiZChNLXggdmFyaWFibGUtcGl0Y2gtbW9kZSl9fX0u ICBPdGhlcndpc2UgdGhlIGxheW91dCB3b3VsZCBhcHBlYXINCi1icm9rZW4sIGR1ZSB0byBob3cg c3BhY2luZyBpcyBkb25lLiAgVG8gZGlzYWJsZSB0aGlzIGJlaGF2aW91ciwgc2V0IHRoZQ0KLW9w dGlvbiB0byB+dH4uDQorVGhpcyBpcyB0byBlbnN1cmUgdGhhdCBjZXJ0YWluIGNvbnN0cnVjdHMg bGlrZSBjb2RlIGJsb2NrcyBhbmQgdGFibGVzDQorcmVtYWluIG1vbm9zcGFjZWQgZXZlbiB3aGVu IHVzZXJzIG9wdCBmb3IgYSBtb2RlIHRoYXQgcmVtYXBzIHR5cGVmYWNlDQorZmFtaWxpZXMsIHN1 Y2ggYXMgdGhlIGJ1aWx0LWluIHt7e2tiZChNLXggdmFyaWFibGUtcGl0Y2gtbW9kZSl9fX0uICBP dGhlcndpc2UNCit0aGUgbGF5b3V0IHdvdWxkIGFwcGVhciBicm9rZW4sIGR1ZSB0byBob3cgc3Bh Y2luZyBpcyBkb25lLg0KIA0KLVVzZXJzIG1heSBwcmVmZXIgdG8gdXNlIGFub3RoZXIgcGFja2Fn ZSBmb3IgaGFuZGxpbmcgbWl4ZWQgdHlwZWZhY2UNCi1jb25maWd1cmF0aW9ucywgcmF0aGVyIHRo YW4gbGV0dGluZyB0aGUgdGhlbWUgZG8gaXQsIHBlcmhhcHMgYmVjYXVzZSBhDQotcHVycG9zZS1z cGVjaWZpYyBwYWNrYWdlIGhhcyBleHRyYSBmdW5jdGlvbmFsaXR5LiAgVHdvIHBvc3NpYmxlIG9w dGlvbnMNCi1hcmUgfm9yZy12YXJpYWJsZS1waXRjaH4gYW5kIH5taXhlZC1waXRjaH4uDQorRm9y IGEgY29uc2lzdGVudCBleHBlcmllbmNlLCB1c2VyIG1heSBuZWVkIHRvIHNwZWNpZnkgdGhlIGZv bnQgZmFtaWx5IG9mDQordGhlIH5maXhlZC1waXRjaH4gZmFjZS4NCiANCiBbWyNoOmRlZmNmNGZj LThmYTgtNGMyOS1iMTJlLTcxMTk1ODJjYzkyOV1bRm9udCBjb25maWd1cmF0aW9ucyBmb3IgT3Jn IGFuZCBvdGhlcnNdXS4NCiANCitGdXJ0aGVybW9yZSwgdXNlcnMgbWF5IHByZWZlciB0byB1c2Ug YW5vdGhlciBwYWNrYWdlIGZvciBoYW5kbGluZyBtaXhlZA0KK3R5cGVmYWNlIGNvbmZpZ3VyYXRp b25zLCByYXRoZXIgdGhhbiBsZXR0aW5nIHRoZSB0aGVtZSBkbyBpdCwgcGVyaGFwcw0KK2JlY2F1 c2UgYSBwdXJwb3NlLXNwZWNpZmljIHBhY2thZ2UgaGFzIGV4dHJhIGZ1bmN0aW9uYWxpdHkuICBU d28NCitwb3NzaWJsZSBvcHRpb25zIGFyZSB+b3JnLXZhcmlhYmxlLXBpdGNofiBhbmQgfm1peGVk LXBpdGNofi4NCisNCiAqKiBPcHRpb24gZm9yIGxpbmtzDQogOnByb3BlcnRpZXM6DQogOmFsdF90 aXRsZTogTGluayBzdHlsZXMNCkBAIC00MzM3LDE4ICs0MzM5LDE4IEBAICogQWNrbm93bGVkZ2Vt ZW50cw0KICAgRWRtb25kc29uLCBEYXZvciBSb3RpbSwgRGl2YW4gU2FudGFuYSwgRWxpcmF6IEtl ZG1pLCBFbWFudWVsZSBNaWNoZWxlDQogICBBbGJlcnRvIE1vbnRlcm9zc28sIEZhcmFzaGEgRXVr ZXIsIEZlbmcgU2h1LCBHYXV0aWVyIFBvbnNpbmV0LCBHZXJyeQ0KICAgQWdib2JhZGEsIEdpYW5s dWNhIFJlY2NoaWEsIEd1c3Rhdm8gQmFycm9zLCBIw7ZybWV0amFuIFlpbHRpeiwgSWxqYQ0KLSAg S29ja2VuLCBJcmlzIEdhcmNpYSwgSmVyZW15IEZyaWVzZW4sIEplcnJ5IFpoYW5nLCBKb2huIEhh bWFuLCBKb3NodWENCi0gIE8nQ29ubm9yLCBLZXZpbiBGbGVtaW5nLCBLw6l2aW4gTGUgR291Z3Vl YywgS29zdGFkaW4gTmluZXYsIExlbiBUcmlnZywNCi0gIE1hbnVlbCBVYmVydGksIE1hcmsgQnVy dG9uLCBNYXJrdXMgQmVwcGxlciwgTWF1cm8gQXJhbmRhLCBNaWNoYWVsDQotICBHb2xkZW5iZXJn LCBNb3JnYW4gU21pdGgsIE11cmlsbyBQZXJlaXJhLCBOaWNreSB2YW4gRm9yZWVzdCwgTmljb2xh cw0KLSAgRGUgSmFlZ2hlcmUsIFBhdWwgUG9sb3Nrb3YsIFBlbmdqaSBaaGFuZywgUGV0ZSBLYXpt aWVyLCBQZXRlciBXdSwNCi0gIFBoaWxpcCBLYWx1ZGVyY2ljLCBQaWVycmUgVMOpY2hvdWV5cmVz LCBSb21hbiBSdWRha292LCBSeWFuIFBoaWxsaXBzLA0KLSAgUnVkb2xmIEFkYW1rb3ZpxI0sIFNh bSBLbGVpbm1hbiwgU2hyZXlhcyBSYWdhdmFuLCBTaW1vbiBQdWduZXQsIFRhc3NpbG8NCi0gIEhv cm4sIFRoaWJhdXQgVmVycm9uLCBUaG9tYXMgSGVhcnRtYW4sIFRyZXkgTWVya2xleSwgVG9nYW4g TXVmdHVvZ2x1LA0KLSAgVG9vbiBDbGFlcywgVXJpIFNoYXJmLCBVdGthcnNoIFNpbmdoLCBWaW5j ZW50IEZvbGV5LiAgQXMgd2VsbCBhcw0KLSAgdXNlcnM6IEJlbiwgQ3NCaWdEYXRhSHViMSwgRW1h Y3MgQ29udHJpYiwgRXVnZW5lLCBGb3VyY2hhdXgsIEZyZWRyaWssDQotICBNb2VzYXNqaSwgTmlj aywgVGhlQmxvYjQyLCBUcmV5LCBiZXBvbHltYXRoZSwgZG9vbGlvLCBmbGVpbWdydWJlciwNCi0g IGlTZWVVLCBqaXhpdWYsIG9rYW1zbiwgcFJvdDB0YTFwLg0KKyAgS29ja2VuLCBJcmlzIEdhcmNp YSwgSmVyZW15IEZyaWVzZW4sIEplcnJ5IFpoYW5nLCBKb2hhbm5lcyBHcsO4ZGVtLA0KKyAgSm9o biBIYW1hbiwgSm9zaHVhIE8nQ29ubm9yLCBLZXZpbiBGbGVtaW5nLCBLw6l2aW4gTGUgR291Z3Vl YywgS29zdGFkaW4NCisgIE5pbmV2LCBMZW4gVHJpZ2csIE1hbnVlbCBVYmVydGksIE1hcmsgQnVy dG9uLCBNYXJrdXMgQmVwcGxlciwgTWF1cm8NCisgIEFyYW5kYSwgTWljaGFlbCBHb2xkZW5iZXJn LCBNb3JnYW4gU21pdGgsIE11cmlsbyBQZXJlaXJhLCBOaWNreSB2YW4NCisgIEZvcmVlc3QsIE5p Y29sYXMgRGUgSmFlZ2hlcmUsIFBhdWwgUG9sb3Nrb3YsIFBlbmdqaSBaaGFuZywgUGV0ZQ0KKyAg S2F6bWllciwgUGV0ZXIgV3UsIFBoaWxpcCBLYWx1ZGVyY2ljLCBQaWVycmUgVMOpY2hvdWV5cmVz LCBSb21hbg0KKyAgUnVkYWtvdiwgUnlhbiBQaGlsbGlwcywgUnVkb2xmIEFkYW1rb3ZpxI0sIFNh bSBLbGVpbm1hbiwgU2hyZXlhcw0KKyAgUmFnYXZhbiwgU2ltb24gUHVnbmV0LCBUYXNzaWxvIEhv cm4sIFRoaWJhdXQgVmVycm9uLCBUaG9tYXMgSGVhcnRtYW4sDQorICBUcmV5IE1lcmtsZXksIFRv Z2FuIE11ZnR1b2dsdSwgVG9vbiBDbGFlcywgVXJpIFNoYXJmLCBVdGthcnNoIFNpbmdoLA0KKyAg VmluY2VudCBGb2xleS4gIEFzIHdlbGwgYXMgdXNlcnM6IEJlbiwgQ3NCaWdEYXRhSHViMSwgRW1h Y3MgQ29udHJpYiwNCisgIEV1Z2VuZSwgRm91cmNoYXV4LCBGcmVkcmlrLCBNb2VzYXNqaSwgTmlj aywgVGhlQmxvYjQyLCBUcmV5LA0KKyAgYmVwb2x5bWF0aGUsIGRvb2xpbywgZmxlaW1ncnViZXIs IGlTZWVVLCBqaXhpdWYsIG9rYW1zbiwgcFJvdDB0YTFwLg0KIA0KICsgUGFja2FnaW5nIDo6IEJh c2lsIEwue3t7c3BhY2UoKX19fSBDb250b3ZvdW5lc2lvcywgRWxpIFphcmV0c2tpaSwgR2xlbm4N CiAgIE1vcnJpcywgTWF1cm8gQXJhbmRhLCBSaWNoYXJkIFN0YWxsbWFuLCBTdGVmYW4gS2FuZ2Fz IChjb3JlIEVtYWNzKSwNCmRpZmYgLS1naXQgYS9ldGMvdGhlbWVzL21vZHVzLXRoZW1lcy5lbCBi L2V0Yy90aGVtZXMvbW9kdXMtdGhlbWVzLmVsDQppbmRleCA3YWI5ODVjMDc3Li5hMDA5OWY0YWVm IDEwMDY0NA0KLS0tIGEvZXRjL3RoZW1lcy9tb2R1cy10aGVtZXMuZWwNCisrKyBiL2V0Yy90aGVt ZXMvbW9kdXMtdGhlbWVzLmVsDQpAQCAtNSw3ICs1LDcgQEAgOzs7IG1vZHVzLXRoZW1lcy5lbCAt LS0gSGlnaGx5IGFjY2Vzc2libGUgdGhlbWVzIChXQ0FHIEFBQSkgLSotIGxleGljYWwtYmluZGlu ZzoNCiA7OyBBdXRob3I6IFByb3Rlc2lsYW9zIFN0YXZyb3UgPGluZm9AcHJvdGVzaWxhb3MuY29t Pg0KIDs7IFVSTDogaHR0cHM6Ly9naXRsYWIuY29tL3Byb3Rlc2lsYW9zL21vZHVzLXRoZW1lcw0K IDs7IFZlcnNpb246IDEuNi4wDQotOzsgTGFzdC1Nb2RpZmllZDogPDIwMjEtMDktMjkgMDg6NDc6 MDMgKzAzMDA+DQorOzsgTGFzdC1Nb2RpZmllZDogPDIwMjEtMTAtMDYgMTY6MjU6MTQgKzAzMDA+ DQogOzsgUGFja2FnZS1SZXF1aXJlczogKChlbWFjcyAiMjcuMSIpKQ0KIDs7IEtleXdvcmRzOiBm YWNlcywgdGhlbWUsIGFjY2Vzc2liaWxpdHkNCiANCkBAIC00MCw3ICs0MCw3IEBAIDs7OyBDb21t ZW50YXJ5Og0KIDs7ICAgICBtb2R1cy10aGVtZXMtYm9sZC1jb25zdHJ1Y3RzICAgICAgICAgICAg ICAgIChib29sZWFuKQ0KIDs7ICAgICBtb2R1cy10aGVtZXMtaW5oaWJpdC1yZWxvYWQgICAgICAg ICAgICAgICAgIChib29sZWFuKQ0KIDs7ICAgICBtb2R1cy10aGVtZXMtaXRhbGljLWNvbnN0cnVj dHMgICAgICAgICAgICAgIChib29sZWFuKQ0KLTs7ICAgICBtb2R1cy10aGVtZXMtbm8tbWl4ZWQt Zm9udHMgICAgICAgICAgICAgICAgIChib29sZWFuKQ0KKzs7ICAgICBtb2R1cy10aGVtZXMtbWl4 ZWQtZm9udHMgICAgICAgICAgICAgICAgICAgIChib29sZWFuKQ0KIDs7ICAgICBtb2R1cy10aGVt ZXMtc2NhbGUtaGVhZGluZ3MgICAgICAgICAgICAgICAgIChib29sZWFuKQ0KIDs7ICAgICBtb2R1 cy10aGVtZXMtc3VidGxlLWxpbmUtbnVtYmVycyAgICAgICAgICAgIChib29sZWFuKQ0KIDs7ICAg ICBtb2R1cy10aGVtZXMtc3VjY2Vzcy1kZXV0ZXJhbm9waWEgICAgICAgICAgIChib29sZWFuKQ0K QEAgLTE0NzUsNyArMTQ3NSw3IEBAIChkZWZmYWNlIG1vZHVzLXRoZW1lcy1zbGFudCBuaWwNCiAN CiAoZGVmZmFjZSBtb2R1cy10aGVtZXMtdmFyaWFibGUtcGl0Y2ggbmlsDQogICAiR2VuZXJpYyBm YWNlIGZvciBhcHBseWluZyBhIGNvbmRpdGlvbmFsIGB2YXJpYWJsZS1waXRjaCcuDQotVGhpcyBi ZWhhdmVzIGluIGFjY29yZGFuY2Ugd2l0aCBgbW9kdXMtdGhlbWVzLW5vLW1peGVkLWZvbnRzJywN CitUaGlzIGJlaGF2ZXMgaW4gYWNjb3JkYW5jZSB3aXRoIGBtb2R1cy10aGVtZXMtbWl4ZWQtZm9u dHMnLA0KIGBtb2R1cy10aGVtZXMtdmFyaWFibGUtcGl0Y2gtaGVhZGluZ3MnIGZvciBhbGwgaGVh ZGluZyBsZXZlbHMsDQogYW5kIGBtb2R1cy10aGVtZXMtdmFyaWFibGUtcGl0Y2gtdWknLg0KIA0K QEAgLTE0ODQsNyArMTQ4NCw3IEBAIChkZWZmYWNlIG1vZHVzLXRoZW1lcy12YXJpYWJsZS1waXRj aCBuaWwNCiANCiAoZGVmZmFjZSBtb2R1cy10aGVtZXMtZml4ZWQtcGl0Y2ggbmlsDQogICAiR2Vu ZXJpYyBmYWNlIGZvciBhcHBseWluZyBhIGNvbmRpdGlvbmFsIGBmaXhlZC1waXRjaCcuDQotVGhp cyBiZWhhdmVzIGluIGFjY29yZGFuY2Ugd2l0aCBgbW9kdXMtdGhlbWVzLW5vLW1peGVkLWZvbnRz Jy4NCitUaGlzIGJlaGF2ZXMgaW4gYWNjb3JkYW5jZSB3aXRoIGBtb2R1cy10aGVtZXMtbWl4ZWQt Zm9udHMnLg0KIA0KIFRoZSBhY3R1YWwgc3R5bGluZyBvZiB0aGUgZmFjZSBpcyBkb25lIGJ5IGBt b2R1cy10aGVtZXMtZmFjZXMnLiINCiAgIDpncm91cCAnbW9kdXMtdGhlbWUtZmFjZXMpDQpAQCAt MTc4MiwyNCArMTc4MiwyNiBAQCAoZGVmY3VzdG9tIG1vZHVzLXRoZW1lcy12YXJpYWJsZS1waXRj aC11aSBuaWwNCiAgIDppbml0aWFsaXplICMnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdA0KICAg OmxpbmsgJyhpbmZvLWxpbmsgIihtb2R1cy10aGVtZXMpIFVJIHR5cGVmYWNlIikpDQogDQotKGRl ZmN1c3RvbSBtb2R1cy10aGVtZXMtbm8tbWl4ZWQtZm9udHMgbmlsDQotICAiRGlzYWJsZSBpbmhl cml0YW5jZSBmcm9tIGBmaXhlZC1waXRjaCcgaW4gc29tZSBmYWNlcy4NCi0NCi1UaGlzIGlzIGRv bmUgYnkgZGVmYXVsdCB0byBhbGxvdyBzcGFjaW5nLXNlbnNpdGl2ZSBjb25zdHJ1Y3RzLA0KLXN1 Y2ggYXMgT3JnIHRhYmxlcyBhbmQgY29kZSBibG9ja3MsIHRvIHJlbWFpbiBtb25vc3BhY2VkIHdo ZW4NCi11c2VycyBvcHQgZm9yIHNvbWV0aGluZyBsaWtlIHRoZSBjb21tYW5kIGB2YXJpYWJsZS1w aXRjaC1tb2RlJy4NCi1UaGUgZG93bnNpZGUgd2l0aCB0aGUgZGVmYXVsdCBpcyB0aGF0IHVzZXJz IG5lZWQgdG8gZXhwbGljaXRseQ0KLWNvbmZpZ3VyZSB0aGUgZm9udCBmYW1pbHkgb2YgYGZpeGVk LXBpdGNoJyBpbiBvcmRlciB0byBnZXQgYQ0KLWNvbnNpc3RlbnQgZXhwZXJpZW5jZS4gIFRoYXQg bWF5IGJlIHNvbWV0aGluZyB0aGV5IGRvIG5vdCB3YW50IHRvDQotZG8uICBIZW5jZSB0aGlzIG9w dGlvbiB0byBkaXNhYmxlIGFueSBraW5kIG9mIHRlY2huaXF1ZSBmb3INCi1taXhpbmcgZm9udHMu Ig0KKyhkZWZpbmUtb2Jzb2xldGUtdmFyaWFibGUtYWxpYXMNCisgICdtb2R1cy10aGVtZXMtbm8t bWl4ZWQtZm9udHMNCisgICdtb2R1cy10aGVtZXMtbWl4ZWQtZm9udHMgIjEuNi4wIChvbiAyMDIx LTEwLTA2KSIpDQorDQorKGRlZmN1c3RvbSBtb2R1cy10aGVtZXMtbWl4ZWQtZm9udHMgbmlsDQor ICAiRW5hYmxlIGluaGVyaXRhbmNlIGZyb20gYGZpeGVkLXBpdGNoJyBpbiBzb21lIGZhY2VzLg0K Kw0KK1RoaXMgaXMgZG9uZSB0byBhbGxvdyBzcGFjaW5nLXNlbnNpdGl2ZSBjb25zdHJ1Y3RzLCBz dWNoIGFzIE9yZw0KK3RhYmxlcyBhbmQgY29kZSBibG9ja3MsIHRvIHJlbWFpbiBtb25vc3BhY2Vk IHdoZW4gdXNlcnMgb3B0IGZvcg0KK3NvbWV0aGluZyBsaWtlIHRoZSBjb21tYW5kIGB2YXJpYWJs ZS1waXRjaC1tb2RlJy4NCisNCitVc2VycyBtYXkgbmVlZCB0byBleHBsaWNpdGx5IGNvbmZpZ3Vy ZSB0aGUgZm9udCBmYW1pbHkgb2YNCitgZml4ZWQtcGl0Y2gnIGluIG9yZGVyIHRvIGdldCBhIGNv bnNpc3RlbnQgZXhwZXJpZW5jZS4iDQogICA6Z3JvdXAgJ21vZHVzLXRoZW1lcw0KLSAgOnBhY2th Z2UtdmVyc2lvbiAnKG1vZHVzLXRoZW1lcyAuICIxLjAuMCIpDQorICA6cGFja2FnZS12ZXJzaW9u ICcobW9kdXMtdGhlbWVzIC4gIjEuNi4wIikNCiAgIDp2ZXJzaW9uICIyOC4xIg0KICAgOnR5cGUg J2Jvb2xlYW4NCiAgIDpzZXQgIydtb2R1cy10aGVtZXMtLXNldC1vcHRpb24NCiAgIDppbml0aWFs aXplICMnY3VzdG9tLWluaXRpYWxpemUtZGVmYXVsdA0KLSAgOmxpbmsgJyhpbmZvLWxpbmsgIiht b2R1cy10aGVtZXMpIE5vIG1peGVkIGZvbnRzIikpDQorICA6bGluayAnKGluZm8tbGluayAiKG1v ZHVzLXRoZW1lcykgTWl4ZWQgZm9udHMiKSkNCiANCiAoZGVmY29uc3QgbW9kdXMtdGhlbWVzLS1o ZWFkaW5ncy1jaG9pY2UNCiAgICcoc2V0IDp0YWcgIlByb3BlcnRpZXMiIDpncmVlZHkgdA0KQEAg LTMwMjQsNyArMzAyNiw3IEBAIChkZWZ1biBtb2R1cy10aGVtZXMtLXNsYW50ICgpDQogDQogKGRl ZnVuIG1vZHVzLXRoZW1lcy0tZml4ZWQtcGl0Y2ggKCkNCiAgICJDb25kaXRpb25hbCBhcHBsaWNh dGlvbiBvZiBgZml4ZWQtcGl0Y2gnIGluaGVyaXRhbmNlLiINCi0gICh1bmxlc3MgbW9kdXMtdGhl bWVzLW5vLW1peGVkLWZvbnRzDQorICAod2hlbiBtb2R1cy10aGVtZXMtbWl4ZWQtZm9udHMNCiAg ICAgKGxpc3QgOmluaGVyaXQgJ2ZpeGVkLXBpdGNoKSkpDQogDQogKGRlZnVuIG1vZHVzLXRoZW1l cy0tdmFyaWFibGUtcGl0Y2ggKCkNCkBAIC02NjQwLDkgKzY2NDIsOSBAQCA7Ozs7OyBvcmcNCiAg ICAgICAgICAgICAgICAgICAgICAgICA6ZXh0ZW5kIHQpKSkNCiAgICAgYChvcmctY29sdW1uICgo LGNsYXNzIDpiYWNrZ3JvdW5kICxiZy1hbHQpKSkNCiAgICAgYChvcmctY29sdW1uLXRpdGxlICgo LGNsYXNzIDppbmhlcml0IGJvbGQgOnVuZGVybGluZSB0IDpiYWNrZ3JvdW5kICxiZy1hbHQpKSkN Ci0gICAgYChvcmctZGF0ZSAoKCxjbGFzcyA6aW5oZXJpdCAsKGlmIG1vZHVzLXRoZW1lcy1uby1t aXhlZC1mb250cw0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2J1dHRv bg0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcoYnV0dG9uIGZpeGVkLXBp dGNoKSkNCisgICAgYChvcmctZGF0ZSAoKCxjbGFzcyA6aW5oZXJpdCAsKGlmIG1vZHVzLXRoZW1l cy1taXhlZC1mb250cw0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyhi dXR0b24gZml4ZWQtcGl0Y2gpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg J2J1dHRvbikNCiAgICAgICAgICAgICAgICAgICAgICAgICAsQChtb2R1cy10aGVtZXMtLWxpbmst Y29sb3INCiAgICAgICAgICAgICAgICAgICAgICAgICAgICBjeWFuIGN5YW4tZmFpbnQpKSkpDQog ICAgIGAob3JnLWRhdGUtc2VsZWN0ZWQgKCgsY2xhc3MgOmluaGVyaXQgYm9sZCA6Zm9yZWdyb3Vu ZCAsYmx1ZS1hbHQgOmludmVyc2UtdmlkZW8gdCkpKQ0KLS0gDQoyLjMzLjANCg0K --=-=-=--