From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SJY+BuDsqGTMFgEASxT56A (envelope-from ) for ; Sat, 08 Jul 2023 06:58:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gCZdBuDsqGTBxAAA9RJhRA (envelope-from ) for ; Sat, 08 Jul 2023 06:58:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8D2D04F4CA for ; Sat, 8 Jul 2023 06:58:07 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688792287; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=8SUhM4aJ1T+DzOXMvC8ot1q0GV6BtaSt0lYnjKhhRsQ=; b=rCRpva7eYjegfoGJCpJSaWpm3LLbLnKxqmpJjWtLghTscs03YKvxFw9XkqVqUYKuWpPFA3 y6j+Nrw5EKJWng020oTvpYcZ+ffvprVYceCzjfwkQiQ1E/SLjYkC6BzY9Z8qGfpYUX9Ayw dwhY7vWDbJezHJOrozcZU+QWstmAL8otK8p/BuPcGam70VgKdssEWU6E/FeAPe/GQucz3O H3c60S74eyWhuvUzvI3mk3WKXM/CMNJ/uqL8xKYkSuJPSMvnhGuUcL54dXrOoEQfU6sGe5 SxEeT0bniCtYbWzQ1IXnXZf7lF1Y0pnbd/GxXIIOaLnYObaKBCE9oQZ+YzlZjg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688792287; a=rsa-sha256; cv=none; b=R5P5nr5MU+cLVHW5Lzhw5KfIAXujpVp4WHM59mduPO2UMCDv1ji27xL92ofYhCKHBj4eLS jUTozJdNNaW2st/gZwvGkhY6c5+W6KprPFkoF9N8KJScumZijA0Y7zf41aAyPdXC1h2G3n 7i3cSzPI0jlNSlgCm3fU8Nzx74neuEvEYMjSD5RJGu0OVO6tZkuQruYcBRzy1z37cJdocD +x3xaf8gVTUfchrQr/hpTR/I77AbpJ/XAP4J85O+6TNr4VekSzArj1dM1M2pK3S4DD3mxG UEGBDFcVKfWI/SLlwtOSKePRclErIRrbYtXNmhV7nBZhbnE2fuTEcMnf0yWtyA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qI00U-0001tx-B8; Sat, 08 Jul 2023 00:57:18 -0400 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 1qI00S-0001td-6a for emacs-orgmode@gnu.org; Sat, 08 Jul 2023 00:57:16 -0400 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qI00O-0005qB-Nx for emacs-orgmode@gnu.org; Sat, 08 Jul 2023 00:57:15 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1qI00K-0002Mk-5K for emacs-orgmode@gnu.org; Sat, 08 Jul 2023 06:57:08 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: [PATCH v2] Fix Emacs-26 compatibility (was: Re: [BUG] org-element loading fails with "regexp" argument not "stringp") Date: Sat, 8 Jul 2023 11:56:59 +0700 Message-ID: References: <2ff109c7-b3ec-27ac-e75d-ae5ddac14746@vallon.homeip.net> <877creabn6.fsf@localhost> <73ee6087-4c89-9d9a-cbc6-197396a023c1@gmail.com> <87ttuh74bl.fsf@localhost> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------IFamhwbDpY4Xzyj50HPnRAKR" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US In-Reply-To: <87ttuh74bl.fsf@localhost> Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 0.13 X-Migadu-Queue-Id: 8D2D04F4CA X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 0.13 X-TUID: wQtvT9t1KLPU This is a multi-part message in MIME format. --------------IFamhwbDpY4Xzyj50HPnRAKR Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 06/07/2023 16:54, Ihor Radchenko wrote: > You are removing `org-protocol-flatten' function, which is a breaking > change. We should leave an obsolete alias. I have added an alias for this function hardly known to anybody else. > Also, you are defining `flatten-tree' function, which is outside Org's > namespace. We should better avoid it and use something like > `org-flatten-tree'. The idea was to minimize conflicts with your branch for the compat package. I hope, it will be merged soon. --------------IFamhwbDpY4Xzyj50HPnRAKR Content-Type: text/x-patch; charset=UTF-8; name="v2-0001-org-element.el-Fix-Emacs-26-compatibility.patch" Content-Disposition: attachment; filename="v2-0001-org-element.el-Fix-Emacs-26-compatibility.patch" Content-Transfer-Encoding: base64 RnJvbSA2MzU3MTAxNTc0NzYyMzkzMTRkN2ZlNTIzMWZiZWMyMTYzY2JlNTJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggTmlrdWxpbiA8bWFuaWt1bGluQGdtYWlsLmNv bT4KRGF0ZTogV2VkLCA1IEp1bCAyMDIzIDIyOjQ0OjMzICswNzAwClN1YmplY3Q6IFtQQVRD SCB2MiAxLzJdIG9yZy1lbGVtZW50LmVsOiBGaXggRW1hY3MtMjYgY29tcGF0aWJpbGl0eQoK KiBvcmctZWxlbWVudC5lbCAob3JnLWVsZW1lbnQtLWN1cnJlbnQtZWxlbWVudC1yZSk6IFVz ZSBgcngtdG8tc3RyaW5nJwppbnN0ZWFkIG9mIGByeCcgdG8gZXhwYW5kIHZhcmlhYmxlcy4K KG9yZy1lbGVtZW50LS1jYWNoZS1zZXR1cC1jaGFuZ2UtZnVuY3Rpb25zKTogQXZvaWQgbXVs dGlwbGUgdmFyaWFibGVzIGluCmBzZXRxLWxvY2FsJy4KClJlcG9ydGVkIGFzOiBKdXN0aW4g dG8gZW1hY3Mtb3JnbW9kZS4gW0JVR10gb3JnLWVsZW1lbnQgbG9hZGluZyBmYWlscwp3aXRo ICJyZWdleHAiIGFyZ3VtZW50IG5vdCAic3RyaW5ncCIgVHVlLCA0IEp1bCAyMDIzIDE5OjUx OjQ0IC0wNDAwLgpodHRwczovL2xpc3Qub3JnbW9kZS5vcmcvMmZmMTA5YzctYjNlYy0yN2Fj LWU3NWQtYWU1ZGRhYzE0NzQ2QHZhbGxvbi5ob21laXAubmV0Ci0tLQogbGlzcC9vcmctZWxl bWVudC5lbCB8IDMyICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvbGlzcC9vcmctZWxlbWVudC5lbCBiL2xpc3Avb3JnLWVsZW1lbnQuZWwKaW5kZXggYmZi MWQyMDZlLi4xYzk3MDc1NzMgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLWVsZW1lbnQuZWwKKysr IGIvbGlzcC9vcmctZWxlbWVudC5lbApAQCAtNDI3OCwyMCArNDI3OCwyMCBAQCA7OzsgUGFy c2luZyBFbGVtZW50IFN0YXJ0aW5nIEF0IFBvaW50CiA7OyBwb2ludC4KIAogKGRlZmNvbnN0 IG9yZy1lbGVtZW50LS1jdXJyZW50LWVsZW1lbnQtcmUKLSAgKHJ4Ci0gICAob3IKLSAgICAo Z3JvdXAtbiAxIChyZWdleHAgb3JnLWVsZW1lbnQtLWxhdGV4LWJlZ2luLWVudmlyb25tZW50 LW5vZ3JvdXApKQotICAgIChncm91cC1uIDIgKHJlZ2V4cCBvcmctZWxlbWVudC1kcmF3ZXIt cmUtbm9ncm91cCkpCi0gICAgKGdyb3VwLW4gMyAocmVnZXhwICJbIFx0XSo6XFwoIFxcfCRc XCkiKSkKLSAgICAoZ3JvdXAtbiA3IChyZWdleHAgb3JnLWVsZW1lbnQtZHluYW1pYy1ibG9j ay1vcGVuLXJlLW5vZ3JvdXApKQotICAgIChzZXEgKGdyb3VwLW4gNCAocmVnZXhwICJbIFx0 XSojXFwrIikpCi0gICAgICAgICAob3IKLSAgICAgICAgICAoc2VxICJCRUdJTl8iIChncm91 cC1uIDUgKDErIChub3Qgc3BhY2UpKSkpCi0gICAgICAgICAgKGdyb3VwLW4gNiAiQ0FMTDoi KQotICAgICAgICAgIChncm91cC1uIDggKDErIChub3Qgc3BhY2UpKSAiOiIpKSkKLSAgICAo Z3JvdXAtbiA5IChyZWdleHAgb3JnLWZvb3Rub3RlLWRlZmluaXRpb24tcmUpKQotICAgIChn cm91cC1uIDEwIChyZWdleHAgIlsgXHRdKi0tLS0tK1sgXHRdKiQiKSkKLSAgICAoZ3JvdXAt biAxMSAiJSUoIikpKQorICAocngtdG8tc3RyaW5nCisgICBgKG9yCisgICAgIChncm91cC1u IDEgKHJlZ2V4cCAsb3JnLWVsZW1lbnQtLWxhdGV4LWJlZ2luLWVudmlyb25tZW50LW5vZ3Jv dXApKQorICAgICAoZ3JvdXAtbiAyIChyZWdleHAgLG9yZy1lbGVtZW50LWRyYXdlci1yZS1u b2dyb3VwKSkKKyAgICAgKGdyb3VwLW4gMyAocmVnZXhwICJbIFx0XSo6XFwoIFxcfCRcXCki KSkKKyAgICAgKGdyb3VwLW4gNyAocmVnZXhwICxvcmctZWxlbWVudC1keW5hbWljLWJsb2Nr LW9wZW4tcmUtbm9ncm91cCkpCisgICAgIChzZXEgKGdyb3VwLW4gNCAocmVnZXhwICJbIFx0 XSojXFwrIikpCisgICAgICAgICAgKG9yCisgICAgICAgICAgIChzZXEgIkJFR0lOXyIgKGdy b3VwLW4gNSAoMSsgKG5vdCBzcGFjZSkpKSkKKyAgICAgICAgICAgKGdyb3VwLW4gNiAiQ0FM TDoiKQorICAgICAgICAgICAoZ3JvdXAtbiA4ICgxKyAobm90IHNwYWNlKSkgIjoiKSkpCisg ICAgIChncm91cC1uIDkgKHJlZ2V4cCAsb3JnLWZvb3Rub3RlLWRlZmluaXRpb24tcmUpKQor ICAgICAoZ3JvdXAtbiAxMCAocmVnZXhwICJbIFx0XSotLS0tLStbIFx0XSokIikpCisgICAg IChncm91cC1uIDExICIlJSgiKSkpCiAgICJCdWxrIHJlZ2V4cCBtYXRjaGluZyBtdWx0aXBs ZSBlbGVtZW50cyBpbiBhIHNpbmdsZSByZWdleHAuCiBUaGlzIGlzIGEgYml0IG1vcmUgZWZm aWNpZW50IGNvbXBhcmVkIHRvIGludm9raW5nIHJlZ2V4cCBzZWFyY2gKIG11bHRpcGxlIHRp bWVzLiIpCkBAIC02OTE2LDggKzY5MTYsOCBAQCAoZGVmdW4gb3JnLWVsZW1lbnQtLWNhY2hl LXNldHVwLWNoYW5nZS1mdW5jdGlvbnMgKCkKICAgICA7OyBDbGVhciBjb3BpZWQgbG9jYWwg Y2FjaGUgdG8gYXZvaWQgZXh0cmEgbWVtb3J5IHVzYWdlLgogICAgIDs7IFdlIG9ubHkgdXNl IGNhY2hlIHN0b3JlZCBpbiB0aGUgYmFzZSBidWZmZXIuCiAgICAgKHdoZW4gKGJ1ZmZlci1i YXNlLWJ1ZmZlcikKLSAgICAgIChzZXRxLWxvY2FsIG9yZy1lbGVtZW50LS1jYWNoZSBuaWwK LSAgICAgICAgICAgICAgICAgIG9yZy1lbGVtZW50LS1oZWFkbGluZS1jYWNoZSBuaWwpKQor ICAgICAgKHNldHEtbG9jYWwgb3JnLWVsZW1lbnQtLWNhY2hlIG5pbCkKKyAgICAgIChzZXRx LWxvY2FsIG9yZy1lbGVtZW50LS1oZWFkbGluZS1jYWNoZSBuaWwpKQogICAgIChhZGQtaG9v ayAnYmVmb3JlLWNoYW5nZS1mdW5jdGlvbnMKIAkgICAgICAjJ29yZy1lbGVtZW50LS1jYWNo ZS1iZWZvcmUtY2hhbmdlIG5pbCB0KQogICAgIDs7IFJ1biBgb3JnLWVsZW1lbnQtLWNhY2hl LWFmdGVyLWNoYW5nZScgZWFybHkgdG8gaGFuZGxlIGNhc2VzCi0tIAoyLjI1LjEKCg== --------------IFamhwbDpY4Xzyj50HPnRAKR Content-Type: text/x-patch; charset=UTF-8; name="v2-0002-org-compat.el-org-flatten-tree-for-Emacs-26-compa.patch" Content-Disposition: attachment; filename*0="v2-0002-org-compat.el-org-flatten-tree-for-Emacs-26-compa.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBlODViMTlkYmE4NmJjM2E1OTM3Mzc2YTAwMDE0NTNkYmUzYTVkYzI0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggTmlrdWxpbiA8bWFuaWt1bGluQGdtYWlsLmNv bT4KRGF0ZTogV2VkLCA1IEp1bCAyMDIzIDIyOjUwOjQ0ICswNzAwClN1YmplY3Q6IFtQQVRD SCB2MiAyLzJdIG9yZy1jb21wYXQuZWw6IGBvcmctLWZsYXR0ZW4tdHJlZScgZm9yIEVtYWNz LTI2CiBjb21wYXRpYmlsaXR5CgoqIGxpc3Avb3JnLWNvbXBhdC5lbCAob3JnLS1mbGF0dGVu LXRyZWUpOiBOZXcgaW50ZXJuYWwgY29tcGF0aWJpbGl0eQphbGlhcyBvciBmdW5jdGlvbiBi YXNlZCBvbiBgZmxhdHRlbi10cmVlJyBhZGRlZCB0byBFbWFjcy0yNy4xLgoqIGxpc3Avb3Jn LXByb3RvY29sLmVsIChvcmctcHJvdG9jb2wtZmxhdHRlbik6IENvbnZlcnQgdG8gYW4gb2Jz b2xldGUKZnVuY3Rpb24gYWxpYXMuCihvcmctcHJvdG9jb2wtZmxhdHRlbi1ncmVlZHkpOiBV c2UgdGhlIGBvcmctLWZsYXR0ZW4tdHJlZScgbmV3CmNvbXBhdGliaWxpdHkgYWxpYXMgb3Ig ZnVuY3Rpb24gaW5zdGVhZCBvZiBgb3JnLXByb3RvY29sLWZsYXR0ZW4nLgoqIGxpc3Avb3Jn LXNyYy5lbCAob3JnLXNyYy0tZ2V0LWtub3duLXNoZWxscyk6IE1ha2UgdGhlIGZ1bmN0aW9u CmNvbXBhdGlibGUgd2l0aCBFbWFjcy0yNiBieSB1c2luZyBgb3JnLS1mbGF0dGVuLXRyZWUn IGluc3RlYWQgb2YKYGZsYXR0ZW4tdHJlZScuCgpSZXBvcnRlZCBhczogSnVzdGluIHRvIGVt YWNzLW9yZ21vZGUuIFtQQVRDSF0gb3JnLXNyYzogZmxhdHRlbi10cmVlIGlzCkVtYWNzIDI3 LjE7IHJlcXVpcmUgY29tcGF0LiBUdWUsIDQgSnVsIDIwMjMgMTk6MjE6MDUgLTA0MDAuCmh0 dHBzOi8vbGlzdC5vcmdtb2RlLm9yZy8wMjg4NTc1Yi1mZGU4LTBlN2QtYWM3NC0xZjBhYzkz Y2U1NmZAdmFsbG9uLmhvbWVpcC5uZXQKLS0tCiBsaXNwL29yZy1jb21wYXQuZWwgICB8IDE5 ICsrKysrKysrKysrKysrKysrKysKIGxpc3Avb3JnLXByb3RvY29sLmVsIHwgMjQgKysrKysr KysrLS0tLS0tLS0tLS0tLS0tCiBsaXNwL29yZy1zcmMuZWwgICAgICB8ICAyICstCiAzIGZp bGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2xpc3Avb3JnLWNvbXBhdC5lbCBiL2xpc3Avb3JnLWNvbXBhdC5lbAppbmRleCBj NWFiNjU1ZDIuLmJiZGEwNGExNSAxMDA2NDQKLS0tIGEvbGlzcC9vcmctY29tcGF0LmVsCisr KyBiL2xpc3Avb3JnLWNvbXBhdC5lbApAQCAtMjExLDYgKzIxMSwyNSBAQCAgICAgKGRlZm1h Y3JvIG9yZy1jb21iaW5lLWNoYW5nZS1jYWxscyAoX2JlZyBfZW5kICZyZXN0IGJvZHkpCiAg ICAgICBgKHByb2duICxAYm9keSkpCiAgIChkZWZhbGlhcyAnb3JnLWNvbWJpbmUtY2hhbmdl LWNhbGxzICdjb21iaW5lLWNoYW5nZS1jYWxscykpCiAKKzs7IGBmbGF0dGVuLXRyZWUnIHdh cyBhZGRlZCBpbiBFbWFjcyAyNy4xLgorKGlmIChmYm91bmRwICdmbGF0dGVuLXRyZWUpCisg ICAgKGRlZmFsaWFzICdvcmctLWZsYXR0ZW4tdHJlZSAjJ2ZsYXR0ZW4tdHJlZSkKKyAgOzsg VGhlIGltcGxlbWVudGF0aW9uIGlzIHRha2VuIGZyb20gRW1hY3Mgc3Vici5lbCA4NjY0YmEx OGM3YzUuCisgIChkZWZ1biBvcmctLWZsYXR0ZW4tdHJlZSAodHJlZSkKKyAgICAiUmV0dXJu IGEgXCJmbGF0dGVuZWRcIiBjb3B5IG9mIFRSRUUuCisKK0EgYGZsYXR0ZW4tdHJlZScgcG9s eWZpbGwgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBFbWFjcyB2ZXJzaW9ucworb2xkZXIgdGhh biAyNy4xIgorICAgIChsZXQgKGVsZW1zKQorICAgICAgKHdoaWxlIChjb25zcCB0cmVlKQor ICAgICAgICAobGV0ICgoZWxlbSAocG9wIHRyZWUpKSkKKyAgICAgICAgICAod2hpbGUgKGNv bnNwIGVsZW0pCisgICAgICAgICAgICAocHVzaCAoY2RyIGVsZW0pIHRyZWUpCisgICAgICAg ICAgICAoc2V0cSBlbGVtIChjYXIgZWxlbSkpKQorICAgICAgICAgIChpZiBlbGVtIChwdXNo IGVsZW0gZWxlbXMpKSkpCisgICAgICAoaWYgdHJlZSAocHVzaCB0cmVlIGVsZW1zKSkKKyAg ICAgIChucmV2ZXJzZSBlbGVtcykpKSkKKwogKGlmICh2ZXJzaW9uPCBlbWFjcy12ZXJzaW9u ICIyNy4xIikKICAgICAoZGVmc3Vic3Qgb3JnLXJlcGxhY2UtYnVmZmVyLWNvbnRlbnRzIChz b3VyY2UgJm9wdGlvbmFsIF9tYXgtc2VjcyBfbWF4LWNvc3RzKQogICAgICAgKHJlcGxhY2Ut YnVmZmVyLWNvbnRlbnRzIHNvdXJjZSkpCmRpZmYgLS1naXQgYS9saXNwL29yZy1wcm90b2Nv bC5lbCBiL2xpc3Avb3JnLXByb3RvY29sLmVsCmluZGV4IDJiMDdhMzc3ZS4uZDZjYzM5YWE5 IDEwMDY0NAotLS0gYS9saXNwL29yZy1wcm90b2NvbC5lbAorKysgYi9saXNwL29yZy1wcm90 b2NvbC5lbApAQCAtMzI4LDcgKzMyOCw3IEBAIChkZWZ1biBvcmctcHJvdG9jb2wtZmxhdHRl bi1ncmVlZHkgKHBhcmFtLWxpc3QgJm9wdGlvbmFsIHN0cmlwLXBhdGggcmVwbGFjZW1lbnQp CiBHcmVlZHkgaGFuZGxlcnMgbWlnaHQgcmVjZWl2ZSBhIGxpc3QgbGlrZSB0aGlzIGZyb20g ZW1hY3NjbGllbnQ6CiBcKChcIi9kaXIvb3JnLXByb3RvY29sOi9ncmVlZHk6L34vcGF0aDFc IiAoMjMgLiAxMikpIChcIi9kaXIvcGFyYW1cIikpCiB3aGVyZSBcIi9kaXIvXCIgaXMgdGhl IGFic29sdXRlIHBhdGggdG8gZW1hY3NjbGllbnQncyB3b3JraW5nIGRpcmVjdG9yeS4gIFRo aXMKLWZ1bmN0aW9uIHRyYW5zZm9ybXMgaXQgaW50byBhIGZsYXQgbGlzdCB1c2luZyBgb3Jn LXByb3RvY29sLWZsYXR0ZW4nIGFuZAorZnVuY3Rpb24gdHJhbnNmb3JtcyBpdCBpbnRvIGEg ZmxhdCBsaXN0IHVzaW5nIGBmbGF0dGVuLXRyZWUnIGFuZAogdHJhbnNmb3JtcyB0aGUgZWxl bWVudHMgb2YgdGhhdCBsaXN0IGFzIGZvbGxvd3M6CiAKIElmIFNUUklQLVBBVEggaXMgbm9u LW5pbCwgcmVtb3ZlIHRoZSBcIi9kaXIvXCIgcHJlZml4IGZyb20gYWxsIG1lbWJlcnMgb2YK QEAgLTM0Myw5ICszNDMsOSBAQCAoZGVmdW4gb3JnLXByb3RvY29sLWZsYXR0ZW4tZ3JlZWR5 IChwYXJhbS1saXN0ICZvcHRpb25hbCBzdHJpcC1wYXRoIHJlcGxhY2VtZW50KQogYG9yZy1w cm90b2NvbC1yZXZlcnNlLWxpc3Qtb2YtZmlsZXMnIHdhcyBzZXQgdG8gdCBhbmQgdGhlIHJl dHVybmVkIGxpc3Qgd2lsbAogcmVmbGVjdCB0aGF0LiAgZW1hY3NjbGllbnQncyBmaXJzdCBw YXJhbWV0ZXIgd2lsbCBiZSB0aGUgZmlyc3Qgb25lIGluIHRoZQogcmV0dXJuZWQgbGlzdC4i Ci0gIChsZXQqICgobCAob3JnLXByb3RvY29sLWZsYXR0ZW4gKGlmIG9yZy1wcm90b2NvbC1y ZXZlcnNlLWxpc3Qtb2YtZmlsZXMKLQkJCQkgICAgICBwYXJhbS1saXN0Ci0JCQkJICAgIChy ZXZlcnNlIHBhcmFtLWxpc3QpKSkpCisgIChsZXQqICgobCAob3JnLS1mbGF0dGVuLXRyZWUg KGlmIG9yZy1wcm90b2NvbC1yZXZlcnNlLWxpc3Qtb2YtZmlsZXMKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHBhcmFtLWxpc3QKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAocmV2ZXJzZSBwYXJhbS1saXN0KSkpKQogCSAodHJpZ2dlciAoY2FyIGwpKQogCSAobGVu IDApCiAJIGRpcgpAQCAtMzY4LDIxICszNjgsMTUgQEAgKGRlZnVuIG9yZy1wcm90b2NvbC1m bGF0dGVuLWdyZWVkeSAocGFyYW0tbGlzdCAmb3B0aW9uYWwgc3RyaXAtcGF0aCByZXBsYWNl bWVudCkKIAkgIHJldCkKICAgICAgIGwpKSkKIAotOzsgYGZsYXR0ZW4tdHJlZScgd2FzIGFk ZGVkIGluIEVtYWNzIDI3LjEuCi0oZGVmYWxpYXMgJ29yZy1wcm90b2NvbC1mbGF0dGVuCi0g IChpZiAoZmJvdW5kcCAnZmxhdHRlbi10cmVlKSAnZmxhdHRlbi10cmVlCi0gICAgKGxhbWJk YSAobGlzdCkKLSAgICAgICJUcmFuc2Zvcm0gTElTVCBpbnRvIGEgZmxhdCBsaXN0LgorKGRl ZmluZS1vYnNvbGV0ZS1mdW5jdGlvbi1hbGlhcyAnb3JnLXByb3RvY29sLWZsYXR0ZW4KKyAg KGlmIChmYm91bmRwICdmbGF0dGVuLXRyZWUpICdmbGF0dGVuLXRyZWUgJ29yZy0tZmxhdHRl bi10cmVlKQorICAiOS43IgorICAiVHJhbnNmb3JtIExJU1QgaW50byBhIGZsYXQgbGlzdC4K IAogR3JlZWR5IGhhbmRsZXJzIG1pZ2h0IHJlY2VpdmUgYSBsaXN0IGxpa2UgdGhpcyBmcm9t IGVtYWNzY2xpZW50OgogXCgoXCIvZGlyL29yZy1wcm90b2NvbDovZ3JlZWR5Oi9+L3BhdGgx XCIgKDIzIC4gMTIpKSAoXCIvZGlyL3BhcmFtXCIpKQogd2hlcmUgXCIvZGlyL1wiIGlzIHRo ZSBhYnNvbHV0ZSBwYXRoIHRvIGVtYWNzY2xpZW50cyB3b3JraW5nIGRpcmVjdG9yeS4KLVRo aXMgZnVuY3Rpb24gdHJhbnNmb3JtcyBpdCBpbnRvIGEgZmxhdCBsaXN0LiIKLSAgICAgIChp ZiBsaXN0Ci0JICAoaWYgKGNvbnNwIGxpc3QpCi0JICAgICAgKGFwcGVuZCAob3JnLXByb3Rv Y29sLWZsYXR0ZW4gKGNhciBsaXN0KSkKLQkJICAgICAgKG9yZy1wcm90b2NvbC1mbGF0dGVu IChjZHIgbGlzdCkpKQotCSAgICAobGlzdCBsaXN0KSkpKSkpCitUaGlzIGZ1bmN0aW9uIHRy YW5zZm9ybXMgaXQgaW50byBhIGZsYXQgbGlzdC4iKQogCiAoZGVmdW4gb3JnLXByb3RvY29s LXBhcnNlLXBhcmFtZXRlcnMgKGluZm8gJm9wdGlvbmFsIG5ldy1zdHlsZSBkZWZhdWx0LW9y ZGVyKQogICAiUmV0dXJuIGEgcHJvcGVydHkgbGlzdCBvZiBwYXJhbWV0ZXJzIGZyb20gSU5G Ty4KZGlmZiAtLWdpdCBhL2xpc3Avb3JnLXNyYy5lbCBiL2xpc3Avb3JnLXNyYy5lbAppbmRl eCBlMWY3ZDUwZGMuLjdlZGJlMDU3MCAxMDA2NDQKLS0tIGEvbGlzcC9vcmctc3JjLmVsCisr KyBiL2xpc3Avb3JnLXNyYy5lbApAQCAtMjA4LDcgKzIwOCw3IEBAIChkZWZ1biBvcmctc3Jj LS1nZXQta25vd24tc2hlbGxzICgpCiBUaGUgc2hlbGxzIGFyZSBhc3NvY2lhdGVkIHdpdGgg YHNoLW1vZGUnLiIKICAgKG1hcGNhcgogICAgKGxhbWJkYSAoc2hlbGwpIChjb25zIChzeW1i b2wtbmFtZSBzaGVsbCkgJ3NoKSkKLSAgIChkZWxldGUtZHVwcyAoZmxhdHRlbi10cmVlIHNo LWFuY2VzdG9yLWFsaXN0KSkpKQorICAgKGRlbGV0ZS1kdXBzIChvcmctLWZsYXR0ZW4tdHJl ZSBzaC1hbmNlc3Rvci1hbGlzdCkpKSkKIAogKGRlZmN1c3RvbSBvcmctc3JjLWxhbmctbW9k ZXMKICAgYCgoIkMiIC4gYykKLS0gCjIuMjUuMQoK --------------IFamhwbDpY4Xzyj50HPnRAKR--