From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YHcgK0SUpWToJwAASxT56A (envelope-from ) for ; Wed, 05 Jul 2023 18:03:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 8JJWK0SUpWRCSQEAauVa8A (envelope-from ) for ; Wed, 05 Jul 2023 18:03:16 +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 164C436DE5 for ; Wed, 5 Jul 2023 18:03:16 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qH4ve-0007N7-OA; Wed, 05 Jul 2023 12:00:30 -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 1qH4vY-0007K7-N8 for emacs-orgmode@gnu.org; Wed, 05 Jul 2023 12:00:26 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qH4vW-0005J9-AY for emacs-orgmode@gnu.org; Wed, 05 Jul 2023 12:00:24 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2b6c5ede714so11529301fa.1 for ; Wed, 05 Jul 2023 09:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688572820; x=1691164820; h=in-reply-to:mail-followup-to:from:references:cc:to:content-language :subject:user-agent:mime-version:date:message-id:sender:from:to:cc :subject:date:message-id:reply-to; bh=w8D/Q7Nov8OXWWX9W3l3x7zmtf3BvY6TF8wQYrXZ/5k=; b=olYuMyKBnGAIG6wDT6Wn0BSwOikNxsqcM3/id8DUc4I8vyzhTrARruOhstK/K0yKbx /FwSDpRJQTKosBit0WJ14ikG1n2fIK5fpArutH4iFEcfqhH3bUHYuxT+BMSid61Hr7vL iriLRPI3a1BQpFCAxn6zuFA329BgJpzOaU+zLVeXO52obEOpTOZh7qbQxEg+fHFxbQ2s S7LgflSnOqL42M6FhGcmDXSfJRXV+C38ooqXUcCwT5+cIRkf2MaDwA2pD55qI45F55u4 rHfY0MAax5BMKtWwofM3sLBQ61g0NBSuWbCD/oNEBs9QPp3ytTzwlbjIEulPLmuC9eo1 9VxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688572820; x=1691164820; h=in-reply-to:mail-followup-to:from:references:cc:to:content-language :subject:user-agent:mime-version:date:message-id:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=w8D/Q7Nov8OXWWX9W3l3x7zmtf3BvY6TF8wQYrXZ/5k=; b=TULfknnNPWV/fjuU++N/RgqVdob67DliVlrPAEqyWbU0LSxAkem48TlpKBASpEKBoC 7rgA57pwaxg18EY2cAxPnzOt9ZChGgTMgZGSHaRFeLg8kcOS/FTBYu37XP1K7V6D6cZR vNuUI8VBaeBOOxx3VZ8Np7Pacvvgsar2HLcFhEzbQnf7EQiRhx0cu+DY7RXs8GDWMpf4 c/GXrh4XDp7nUSImJD6VKVtt5OU7RWhXa+j+ckwe2miW7BpM+FR4+J+6sTPlWI+mPLuF buMkA4PBiWWgO2l7eShJCB85e4pvs8BIOw+fHbv5XqhFf7je69VsCpBxcCwZN5Qtwmir KYPQ== X-Gm-Message-State: ABy/qLYEMG/kCdB2UDZU6QTzSDc9QSDqhncvywQZAkegpViAenK27qha mfMwPrJKDJFjxC7n6WdqMoI= X-Google-Smtp-Source: APBJJlF2zLS6WkCVhrsqDFUXPzzyfKW6MHkU/f7bDO4XmoDeF3JjABTz/m6qKTbxJm7eliHU3t7Spw== X-Received: by 2002:a2e:b043:0:b0:2b6:d03a:5d8d with SMTP id d3-20020a2eb043000000b002b6d03a5d8dmr1125911ljl.6.1688572819506; Wed, 05 Jul 2023 09:00:19 -0700 (PDT) Received: from [192.168.0.101] (nat-0-0.nsk.sibset.net. [5.44.169.188]) by smtp.googlemail.com with ESMTPSA id o6-20020a2e7306000000b002b6e77e87fcsm1971268ljc.68.2023.07.05.09.00.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jul 2023 09:00:18 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------RZ9y9ZktEm0RXWTzDCmsbHtb" Message-ID: <73ee6087-4c89-9d9a-cbc6-197396a023c1@gmail.com> Date: Wed, 5 Jul 2023 23:00:17 +0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: [PATCH] Fix Emacs-26 compatibility (was: Re: [BUG] org-element loading fails with "regexp" argument not "stringp") Content-Language: en-US To: Justin Cc: emacs-orgmode@gnu.org References: <2ff109c7-b3ec-27ac-e75d-ae5ddac14746@vallon.homeip.net> <877creabn6.fsf@localhost> From: Max Nikulin Mail-Followup-To: Justin , emacs-orgmode@gnu.org In-Reply-To: <877creabn6.fsf@localhost> Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=manikulin@gmail.com; helo=mail-lj1-x236.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688572996; h=from:from:sender:sender: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:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=w8D/Q7Nov8OXWWX9W3l3x7zmtf3BvY6TF8wQYrXZ/5k=; b=L1O86jJEofoaooZowrANIekwqVQtIfoXDR442rr0Jgpy0T2aQJkONvRv0m48DzkrsdFx3z lmBRRSRWARHvCk1rXiWCk0SNPrlj2nXC/YsXhmekFM7YLb/8/8cZl/ORrxBRPtGqOsWvrc 6eEf0epmiwn2j8JkKsUk/x0FR/MjIhKOpY0ANKIhL6WmasG8D3QkpFVrxeAmctDgvn9bCJ RxIf0gd70autN0hanXi+2s8yMUPOVFJf5WSn6V9XMfS5aeNC0q8y96BqfHBfmX/uEe3uYK qrkoawloS6zePdqqNI8SZ6TILaqM7gNEtITlyFGdC0dvlghvJpq0TIx4KGJ/CQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=olYuMyKB; dmarc=fail reason="SPF not aligned (relaxed)" 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=1688572996; a=rsa-sha256; cv=none; b=jkGeb5CGI4XELLHHf8p1yprDo8IP6cuXJP2Wng41WulsdOakNE+Tf/DBQcq2B0+blo4K94 SSXtpu7RvU+3KNRJekL9rD/vzsvvttI8dvfpBV5S5i/ys09FPMXTIfwt/cW1FAxt6hMx/S Z9E+VrmaThKJTKPoAYaJ2KzqvGXrXSPeAbmTSVyxA4JXoJCvTmnDmkjXVGwjOV6ZA3brxV kWuJ0+dZVChsJuqSvN9As8Tymlk2yXvryj+4nrw9YluRbKOcAvnwvS2R6u2/IULe4NM4Ev wC0jBDCdiIb4eVgK4bj3+7NLsjKOFvWOVqo2BreBF0KGNe3cWJv7yKQ7EZMAEw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.87 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=olYuMyKB; dmarc=fail reason="SPF not aligned (relaxed)" 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" X-Migadu-Queue-Id: 164C436DE5 X-Spam-Score: -0.87 X-TUID: 4Secj8t2FkTk This is a multi-part message in MIME format. --------------RZ9y9ZktEm0RXWTzDCmsbHtb Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 05/07/2023 17:35, Ihor Radchenko wrote: > However, you will see many more failures with Emacs 26 on the latest > main. With the couple of attached patches the only failing test is Test test-org/delete-indentation backtrace: signal(wrong-number-of-arguments ((0 . 1) 3)) apply(signal (wrong-number-of-arguments ((0 . 1) 3))) (setq value-20142 (apply fn-20140 args-20141)) (unwind-protect (setq value-20142 (apply fn-20140 args-20141)) (setq (if (unwind-protect (setq value-20142 (apply fn-20140 args-20141)) ( (let (form-description-20144) (if (unwind-protect (setq value-20142 (let ((value-20142 (quote ert-form-evaluation-aborted-20143))) (let (let* ((fn-20140 (function equal)) (args-20141 (condition-case err ( (closure (t) nil (let* ((fn-20140 (function equal)) (args-20141 (con ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ert-run-test(#s(ert-test :name test-org/delete-indentation :document ert-run-or-rerun-test(#s(ert--stats :selector "\\(org\\|ob\\|ox\\)" ert-run-tests("\\(org\\|ob\\|ox\\)" #f(compiled-function (event-type ert-run-tests-batch("\\(org\\|ob\\|ox\\)") ert-run-tests-batch-and-exit("\\(org\\|ob\\|ox\\)") (let ((org-id-track-globally t) (org-test-selector (if org-test-sele org-test-run-batch-tests("\\(org\\|ob\\|ox\\)") eval((org-test-run-batch-tests org-test-select-re)) command-line-1(("--eval" "(setq vc-handled-backends nil org-startup- command-line() normal-top-level() Test test-org/delete-indentation condition: (wrong-number-of-arguments (0 . 1) 3) FAILED 935/1069 test-org/delete-indentation --------------RZ9y9ZktEm0RXWTzDCmsbHtb Content-Type: text/x-patch; charset=UTF-8; name="0001-org-element.el-Fix-Emacs-26-compatibility.patch" Content-Disposition: attachment; filename="0001-org-element.el-Fix-Emacs-26-compatibility.patch" Content-Transfer-Encoding: base64 RnJvbSBiMDA3NjkxOWUzZDEzYzVkNzg4YWZkMmQ1YzE1ZTkwZDRmZWZiYWEwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggTmlrdWxpbiA8bWFuaWt1bGluQGdtYWlsLmNv bT4KRGF0ZTogV2VkLCA1IEp1bCAyMDIzIDIyOjQ0OjMzICswNzAwClN1YmplY3Q6IFtQQVRD SCAxLzJdIG9yZy1lbGVtZW50LmVsOiBGaXggRW1hY3MtMjYgY29tcGF0aWJpbGl0eQoKKiBv cmctZWxlbWVudC5lbCAob3JnLWVsZW1lbnQtLWN1cnJlbnQtZWxlbWVudC1yZSk6IFVzZSBg cngtdG8tc3RyaW5nJwppbnN0ZWFkIG9mIGByeCcgdG8gZXhwYW5kIHZhcmlhYmxlcy4KKG9y Zy1lbGVtZW50LS1jYWNoZS1zZXR1cC1jaGFuZ2UtZnVuY3Rpb25zKTogQXZvaWQgbXVsdGlw bGUgdmFyaWFibGVzIGluCmBzZXRxLWxvY2FsJy4KClJlcG9ydGVkIGFzOiBKdXN0aW4gdG8g ZW1hY3Mtb3JnbW9kZS4gW0JVR10gb3JnLWVsZW1lbnQgbG9hZGluZyBmYWlscwp3aXRoICJy ZWdleHAiIGFyZ3VtZW50IG5vdCAic3RyaW5ncCIgVHVlLCA0IEp1bCAyMDIzIDE5OjUxOjQ0 IC0wNDAwLgpodHRwczovL2xpc3Qub3JnbW9kZS5vcmcvMmZmMTA5YzctYjNlYy0yN2FjLWU3 NWQtYWU1ZGRhYzE0NzQ2QHZhbGxvbi5ob21laXAubmV0Ci0tLQogbGlzcC9vcmctZWxlbWVu dC5lbCB8IDMyICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv bGlzcC9vcmctZWxlbWVudC5lbCBiL2xpc3Avb3JnLWVsZW1lbnQuZWwKaW5kZXggYmZiMWQy MDZlLi4xYzk3MDc1NzMgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLWVsZW1lbnQuZWwKKysrIGIv bGlzcC9vcmctZWxlbWVudC5lbApAQCAtNDI3OCwyMCArNDI3OCwyMCBAQCA7OzsgUGFyc2lu ZyBFbGVtZW50IFN0YXJ0aW5nIEF0IFBvaW50CiA7OyBwb2ludC4KIAogKGRlZmNvbnN0IG9y Zy1lbGVtZW50LS1jdXJyZW50LWVsZW1lbnQtcmUKLSAgKHJ4Ci0gICAob3IKLSAgICAoZ3Jv dXAtbiAxIChyZWdleHAgb3JnLWVsZW1lbnQtLWxhdGV4LWJlZ2luLWVudmlyb25tZW50LW5v Z3JvdXApKQotICAgIChncm91cC1uIDIgKHJlZ2V4cCBvcmctZWxlbWVudC1kcmF3ZXItcmUt bm9ncm91cCkpCi0gICAgKGdyb3VwLW4gMyAocmVnZXhwICJbIFx0XSo6XFwoIFxcfCRcXCki KSkKLSAgICAoZ3JvdXAtbiA3IChyZWdleHAgb3JnLWVsZW1lbnQtZHluYW1pYy1ibG9jay1v cGVuLXJlLW5vZ3JvdXApKQotICAgIChzZXEgKGdyb3VwLW4gNCAocmVnZXhwICJbIFx0XSoj XFwrIikpCi0gICAgICAgICAob3IKLSAgICAgICAgICAoc2VxICJCRUdJTl8iIChncm91cC1u IDUgKDErIChub3Qgc3BhY2UpKSkpCi0gICAgICAgICAgKGdyb3VwLW4gNiAiQ0FMTDoiKQot ICAgICAgICAgIChncm91cC1uIDggKDErIChub3Qgc3BhY2UpKSAiOiIpKSkKLSAgICAoZ3Jv dXAtbiA5IChyZWdleHAgb3JnLWZvb3Rub3RlLWRlZmluaXRpb24tcmUpKQotICAgIChncm91 cC1uIDEwIChyZWdleHAgIlsgXHRdKi0tLS0tK1sgXHRdKiQiKSkKLSAgICAoZ3JvdXAtbiAx MSAiJSUoIikpKQorICAocngtdG8tc3RyaW5nCisgICBgKG9yCisgICAgIChncm91cC1uIDEg KHJlZ2V4cCAsb3JnLWVsZW1lbnQtLWxhdGV4LWJlZ2luLWVudmlyb25tZW50LW5vZ3JvdXAp KQorICAgICAoZ3JvdXAtbiAyIChyZWdleHAgLG9yZy1lbGVtZW50LWRyYXdlci1yZS1ub2dy b3VwKSkKKyAgICAgKGdyb3VwLW4gMyAocmVnZXhwICJbIFx0XSo6XFwoIFxcfCRcXCkiKSkK KyAgICAgKGdyb3VwLW4gNyAocmVnZXhwICxvcmctZWxlbWVudC1keW5hbWljLWJsb2NrLW9w ZW4tcmUtbm9ncm91cCkpCisgICAgIChzZXEgKGdyb3VwLW4gNCAocmVnZXhwICJbIFx0XSoj XFwrIikpCisgICAgICAgICAgKG9yCisgICAgICAgICAgIChzZXEgIkJFR0lOXyIgKGdyb3Vw LW4gNSAoMSsgKG5vdCBzcGFjZSkpKSkKKyAgICAgICAgICAgKGdyb3VwLW4gNiAiQ0FMTDoi KQorICAgICAgICAgICAoZ3JvdXAtbiA4ICgxKyAobm90IHNwYWNlKSkgIjoiKSkpCisgICAg IChncm91cC1uIDkgKHJlZ2V4cCAsb3JnLWZvb3Rub3RlLWRlZmluaXRpb24tcmUpKQorICAg ICAoZ3JvdXAtbiAxMCAocmVnZXhwICJbIFx0XSotLS0tLStbIFx0XSokIikpCisgICAgIChn cm91cC1uIDExICIlJSgiKSkpCiAgICJCdWxrIHJlZ2V4cCBtYXRjaGluZyBtdWx0aXBsZSBl bGVtZW50cyBpbiBhIHNpbmdsZSByZWdleHAuCiBUaGlzIGlzIGEgYml0IG1vcmUgZWZmaWNp ZW50IGNvbXBhcmVkIHRvIGludm9raW5nIHJlZ2V4cCBzZWFyY2gKIG11bHRpcGxlIHRpbWVz LiIpCkBAIC02OTE2LDggKzY5MTYsOCBAQCAoZGVmdW4gb3JnLWVsZW1lbnQtLWNhY2hlLXNl dHVwLWNoYW5nZS1mdW5jdGlvbnMgKCkKICAgICA7OyBDbGVhciBjb3BpZWQgbG9jYWwgY2Fj aGUgdG8gYXZvaWQgZXh0cmEgbWVtb3J5IHVzYWdlLgogICAgIDs7IFdlIG9ubHkgdXNlIGNh Y2hlIHN0b3JlZCBpbiB0aGUgYmFzZSBidWZmZXIuCiAgICAgKHdoZW4gKGJ1ZmZlci1iYXNl LWJ1ZmZlcikKLSAgICAgIChzZXRxLWxvY2FsIG9yZy1lbGVtZW50LS1jYWNoZSBuaWwKLSAg ICAgICAgICAgICAgICAgIG9yZy1lbGVtZW50LS1oZWFkbGluZS1jYWNoZSBuaWwpKQorICAg ICAgKHNldHEtbG9jYWwgb3JnLWVsZW1lbnQtLWNhY2hlIG5pbCkKKyAgICAgIChzZXRxLWxv Y2FsIG9yZy1lbGVtZW50LS1oZWFkbGluZS1jYWNoZSBuaWwpKQogICAgIChhZGQtaG9vayAn YmVmb3JlLWNoYW5nZS1mdW5jdGlvbnMKIAkgICAgICAjJ29yZy1lbGVtZW50LS1jYWNoZS1i ZWZvcmUtY2hhbmdlIG5pbCB0KQogICAgIDs7IFJ1biBgb3JnLWVsZW1lbnQtLWNhY2hlLWFm dGVyLWNoYW5nZScgZWFybHkgdG8gaGFuZGxlIGNhc2VzCi0tIAoyLjI1LjEKCg== --------------RZ9y9ZktEm0RXWTzDCmsbHtb Content-Type: text/x-patch; charset=UTF-8; name="0002-org-compat.el-Define-flatten-tree-for-Emacs-26-compa.patch" Content-Disposition: attachment; filename*0="0002-org-compat.el-Define-flatten-tree-for-Emacs-26-compa.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyZjJkMzMwZTkwYjEwYTg2YWE2YjNiOWZmMjc5YmMwMTJiMzM5Mzk2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggTmlrdWxpbiA8bWFuaWt1bGluQGdtYWlsLmNv bT4KRGF0ZTogV2VkLCA1IEp1bCAyMDIzIDIyOjUwOjQ0ICswNzAwClN1YmplY3Q6IFtQQVRD SCAyLzJdIG9yZy1jb21wYXQuZWw6IERlZmluZSBgZmxhdHRlbi10cmVlJyBmb3IgRW1hY3Mt MjYKIGNvbXBhdGliaWxpdHkKCiogbGlzcC9vcmctY29tcGF0LmVsIChmbGF0dGVuLXRyZWUp OiBOZXcgY29tcGF0aWJpbGl0eSBmdW5jdGlvbgplYXJsaWVyIHVzZWQgYXMgYG9yZy1wcm90 b2NvbC1mbGF0dGVuJy4KKiBsaXNwL29yZy1wcm90b2NvbC5lbCAob3JnLXByb3RvY29sLWZs YXR0ZW4pOiBSZW1vdmUgdGhlIGRlZmluaXRpb24Kb2YgdGhlIGZ1bmN0aW9uLgoob3JnLXBy b3RvY29sLWZsYXR0ZW4tZ3JlZWR5KTogVXNlIGBmbGF0dGVuLXRyZWUnIGluc3RlYWQgb2YK YG9yZy1wcm90b2NvbC1mbGF0dGVuJy4KClJlcG9ydGVkIGFzOiBKdXN0aW4gdG8gZW1hY3Mt b3JnbW9kZS4gW1BBVENIXSBvcmctc3JjOiBmbGF0dGVuLXRyZWUgaXMKRW1hY3MgMjcuMTsg cmVxdWlyZSBjb21wYXQuIFR1ZSwgNCBKdWwgMjAyMyAxOToyMTowNSAtMDQwMC4KaHR0cHM6 Ly9saXN0Lm9yZ21vZGUub3JnLzAyODg1NzViLWZkZTgtMGU3ZC1hYzc0LTFmMGFjOTNjZTU2 ZkB2YWxsb24uaG9tZWlwLm5ldAotLS0KIGxpc3Avb3JnLWNvbXBhdC5lbCAgIHwgMTUgKysr KysrKysrKysrKysrCiBsaXNwL29yZy1wcm90b2NvbC5lbCB8IDI0ICsrKystLS0tLS0tLS0t LS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAyMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy1jb21wYXQuZWwgYi9saXNwL29yZy1j b21wYXQuZWwKaW5kZXggYzVhYjY1NWQyLi43MDE3YTU4NTkgMTAwNjQ0Ci0tLSBhL2xpc3Av b3JnLWNvbXBhdC5lbAorKysgYi9saXNwL29yZy1jb21wYXQuZWwKQEAgLTIwMyw2ICsyMDMs MjEgQEAgICAoZGVmdW4gb3JnLWZvcm1hdC1wcm9tcHQgKHByb21wdCBkZWZhdWx0ICZyZXN0 IGZvcm1hdC1hcmdzKQogDAogOzs7IEVtYWNzIDwgMjcuMSBjb21wYXRpYmlsaXR5CiAKKzs7 IGBmbGF0dGVuLXRyZWUnIHdhcyBhZGRlZCBpbiBFbWFjcyAyNy4xLgorKHVubGVzcyAoZmJv dW5kcCAnZmxhdHRlbi10cmVlKQorICAoZGVmdW4gZmxhdHRlbi10cmVlIChsaXN0KQorICAg ICJUcmFuc2Zvcm0gTElTVCBpbnRvIGEgZmxhdCBsaXN0LgorCitHcmVlZHkgaGFuZGxlcnMg bWlnaHQgcmVjZWl2ZSBhIGxpc3QgbGlrZSB0aGlzIGZyb20gZW1hY3NjbGllbnQ6CitcKChc Ii9kaXIvb3JnLXByb3RvY29sOi9ncmVlZHk6L34vcGF0aDFcIiAoMjMgLiAxMikpIChcIi9k aXIvcGFyYW1cIikpCit3aGVyZSBcIi9kaXIvXCIgaXMgdGhlIGFic29sdXRlIHBhdGggdG8g ZW1hY3NjbGllbnRzIHdvcmtpbmcgZGlyZWN0b3J5LgorVGhpcyBmdW5jdGlvbiB0cmFuc2Zv cm1zIGl0IGludG8gYSBmbGF0IGxpc3QuIgorICAgIChpZiBsaXN0CisgICAgICAgIChpZiAo Y29uc3AgbGlzdCkKKyAgICAgICAgICAgIChhcHBlbmQgKGZsYXR0ZW4tdHJlZSAoY2FyIGxp c3QpKQorICAgICAgICAgICAgICAgICAgICAoZmxhdHRlbi10cmVlIChjZHIgbGlzdCkpKQor ICAgICAgICAgIChsaXN0IGxpc3QpKSkpKQorCiAoaWYgKHZlcnNpb248IGVtYWNzLXZlcnNp b24gIjI5IikKICAgICA7OyBBIHN0dWIgd2hlbiBgY29tYmluZS1jaGFuZ2UtY2FsbHMnIHdh cyBub3QgeWV0IHRoZXJlIG9yIGhhZAogICAgIDs7IGNyaXRpY2FsIGJ1Z3MgKHNlZSBFbWFj cyBidWcjNjA0NjcpLgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmctcHJvdG9jb2wuZWwgYi9saXNw L29yZy1wcm90b2NvbC5lbAppbmRleCAyYjA3YTM3N2UuLmEwZDAwMzM2MyAxMDA2NDQKLS0t IGEvbGlzcC9vcmctcHJvdG9jb2wuZWwKKysrIGIvbGlzcC9vcmctcHJvdG9jb2wuZWwKQEAg LTMyOCw3ICszMjgsNyBAQCAoZGVmdW4gb3JnLXByb3RvY29sLWZsYXR0ZW4tZ3JlZWR5IChw YXJhbS1saXN0ICZvcHRpb25hbCBzdHJpcC1wYXRoIHJlcGxhY2VtZW50KQogR3JlZWR5IGhh bmRsZXJzIG1pZ2h0IHJlY2VpdmUgYSBsaXN0IGxpa2UgdGhpcyBmcm9tIGVtYWNzY2xpZW50 OgogXCgoXCIvZGlyL29yZy1wcm90b2NvbDovZ3JlZWR5Oi9+L3BhdGgxXCIgKDIzIC4gMTIp KSAoXCIvZGlyL3BhcmFtXCIpKQogd2hlcmUgXCIvZGlyL1wiIGlzIHRoZSBhYnNvbHV0ZSBw YXRoIHRvIGVtYWNzY2xpZW50J3Mgd29ya2luZyBkaXJlY3RvcnkuICBUaGlzCi1mdW5jdGlv biB0cmFuc2Zvcm1zIGl0IGludG8gYSBmbGF0IGxpc3QgdXNpbmcgYG9yZy1wcm90b2NvbC1m bGF0dGVuJyBhbmQKK2Z1bmN0aW9uIHRyYW5zZm9ybXMgaXQgaW50byBhIGZsYXQgbGlzdCB1 c2luZyBgZmxhdHRlbi10cmVlJyBhbmQKIHRyYW5zZm9ybXMgdGhlIGVsZW1lbnRzIG9mIHRo YXQgbGlzdCBhcyBmb2xsb3dzOgogCiBJZiBTVFJJUC1QQVRIIGlzIG5vbi1uaWwsIHJlbW92 ZSB0aGUgXCIvZGlyL1wiIHByZWZpeCBmcm9tIGFsbCBtZW1iZXJzIG9mCkBAIC0zNDMsOSAr MzQzLDkgQEAgKGRlZnVuIG9yZy1wcm90b2NvbC1mbGF0dGVuLWdyZWVkeSAocGFyYW0tbGlz dCAmb3B0aW9uYWwgc3RyaXAtcGF0aCByZXBsYWNlbWVudCkKIGBvcmctcHJvdG9jb2wtcmV2 ZXJzZS1saXN0LW9mLWZpbGVzJyB3YXMgc2V0IHRvIHQgYW5kIHRoZSByZXR1cm5lZCBsaXN0 IHdpbGwKIHJlZmxlY3QgdGhhdC4gIGVtYWNzY2xpZW50J3MgZmlyc3QgcGFyYW1ldGVyIHdp bGwgYmUgdGhlIGZpcnN0IG9uZSBpbiB0aGUKIHJldHVybmVkIGxpc3QuIgotICAobGV0KiAo KGwgKG9yZy1wcm90b2NvbC1mbGF0dGVuIChpZiBvcmctcHJvdG9jb2wtcmV2ZXJzZS1saXN0 LW9mLWZpbGVzCi0JCQkJICAgICAgcGFyYW0tbGlzdAotCQkJCSAgICAocmV2ZXJzZSBwYXJh bS1saXN0KSkpKQorICAobGV0KiAoKGwgKGZsYXR0ZW4tdHJlZSAoaWYgb3JnLXByb3RvY29s LXJldmVyc2UtbGlzdC1vZi1maWxlcworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGFyYW0tbGlzdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChyZXZlcnNlIHBhcmFt LWxpc3QpKSkpCiAJICh0cmlnZ2VyIChjYXIgbCkpCiAJIChsZW4gMCkKIAkgZGlyCkBAIC0z NjgsMjIgKzM2OCw2IEBAIChkZWZ1biBvcmctcHJvdG9jb2wtZmxhdHRlbi1ncmVlZHkgKHBh cmFtLWxpc3QgJm9wdGlvbmFsIHN0cmlwLXBhdGggcmVwbGFjZW1lbnQpCiAJICByZXQpCiAg ICAgICBsKSkpCiAKLTs7IGBmbGF0dGVuLXRyZWUnIHdhcyBhZGRlZCBpbiBFbWFjcyAyNy4x LgotKGRlZmFsaWFzICdvcmctcHJvdG9jb2wtZmxhdHRlbgotICAoaWYgKGZib3VuZHAgJ2Zs YXR0ZW4tdHJlZSkgJ2ZsYXR0ZW4tdHJlZQotICAgIChsYW1iZGEgKGxpc3QpCi0gICAgICAi VHJhbnNmb3JtIExJU1QgaW50byBhIGZsYXQgbGlzdC4KLQotR3JlZWR5IGhhbmRsZXJzIG1p Z2h0IHJlY2VpdmUgYSBsaXN0IGxpa2UgdGhpcyBmcm9tIGVtYWNzY2xpZW50OgotXCgoXCIv ZGlyL29yZy1wcm90b2NvbDovZ3JlZWR5Oi9+L3BhdGgxXCIgKDIzIC4gMTIpKSAoXCIvZGly L3BhcmFtXCIpKQotd2hlcmUgXCIvZGlyL1wiIGlzIHRoZSBhYnNvbHV0ZSBwYXRoIHRvIGVt YWNzY2xpZW50cyB3b3JraW5nIGRpcmVjdG9yeS4KLVRoaXMgZnVuY3Rpb24gdHJhbnNmb3Jt cyBpdCBpbnRvIGEgZmxhdCBsaXN0LiIKLSAgICAgIChpZiBsaXN0Ci0JICAoaWYgKGNvbnNw IGxpc3QpCi0JICAgICAgKGFwcGVuZCAob3JnLXByb3RvY29sLWZsYXR0ZW4gKGNhciBsaXN0 KSkKLQkJICAgICAgKG9yZy1wcm90b2NvbC1mbGF0dGVuIChjZHIgbGlzdCkpKQotCSAgICAo bGlzdCBsaXN0KSkpKSkpCi0KIChkZWZ1biBvcmctcHJvdG9jb2wtcGFyc2UtcGFyYW1ldGVy cyAoaW5mbyAmb3B0aW9uYWwgbmV3LXN0eWxlIGRlZmF1bHQtb3JkZXIpCiAgICJSZXR1cm4g YSBwcm9wZXJ0eSBsaXN0IG9mIHBhcmFtZXRlcnMgZnJvbSBJTkZPLgogSWYgTkVXLVNUWUxF IGlzIG5vbi1uaWwsIHRyZWF0IElORk8gYXMgYSBxdWVyeSBzdHJpbmcgKGV4OgotLSAKMi4y NS4xCgo= --------------RZ9y9ZktEm0RXWTzDCmsbHtb--