From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id KFJYMnpS1mQekwAASxT56A (envelope-from ) for ; Fri, 11 Aug 2023 17:23:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aFliMXpS1mTHWwAAG6o9tA (envelope-from ) for ; Fri, 11 Aug 2023 17:23:38 +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 6C4CB4004A for ; Fri, 11 Aug 2023 17:23:38 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691767418; a=rsa-sha256; cv=none; b=WF951xuUM1RC3DzBQXpxHjtSuybP47HuN4PdD0+svLV8Q6h2hQBP9RPkCYr0CPlZkCcgRL hH66H1lP51JmyfLWyy85RD5dkhnuV0JzbLAI20h/bEjVqQmVbY/WS/fSeSYzDSY3uw4UjB eoLBY40domrhrdk4/FkMM9CpIU5M9jzLSJNwEBpKc7a/PUJ3FhVAPua8PHX1FSk1O5KM26 Q0Nhg2PU/Qv0EaosxmjzXsrSS+igqVxCgSu+5M49wESYaUdTaOysDul2DMOC38upLZyZ5C OB60kjNXx7h9GWjgfxUEbPq78jaYkcno21cBM00aowqs6Hgil7ZBL9YUF29ghQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691767418; 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:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=pq6Ko2d5+Dz3tDzV/oApDprlo46DDQWAlTyAYuE7q8s=; b=Z2Mo72TsP3SPjIVXvEiXTjL63Fo8uu2rnyEAESJ1Zui+0jvj9VzO9P3rzsRAf0GjFEuKIN gNyXooyIelOdhyxRGvUO+mlt1ZtXDcWtFUCO7e9y2Pjy5RGmO6PZCJsK2UyCEv4s+RYlU3 5ntlEsjQcFLZCrCt/RlpUmUShSoQliZj4PV2qlJF/zHYUty9sfMBqlnNhtd0Buj1QzlYR0 Src/28ULlEunq/9WkGD7H8zJILM+XbONVITYB7HTkFgOuewZLbloMRXa/lWyZ2NmhNHflX CDpaD2dXPmMzQ147gF23aQO16iCAVGib1iZgMc3ON0ogtFf//O19isI/Y9D8jg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUTti-0007yA-By; Fri, 11 Aug 2023 11:17:54 -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 1qUTtg-0007xm-OK for emacs-orgmode@gnu.org; Fri, 11 Aug 2023 11:17:52 -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 1qUTtf-0007uX-EF for emacs-orgmode@gnu.org; Fri, 11 Aug 2023 11:17:52 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1qUTtd-0006x9-3U for emacs-orgmode@gnu.org; Fri, 11 Aug 2023 17:17:49 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: [PATCH] org-macs.el: Fix Emacs-26 compatibility Date: Fri, 11 Aug 2023 22:17:43 +0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------fIklmTT05BmI3vMmVus0fUQp" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US, ru-RU 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 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.48 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: 6C4CB4004A X-Spam-Score: -4.48 X-TUID: mQ4s18MNguc7 This is a multi-part message in MIME format. --------------fIklmTT05BmI3vMmVus0fUQp Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Current state of the main branch is not compatible with Emacs-26. Loading /home/ubuntu/src/org-mode/lisp/org-compat.el (source)... Eager macro-expansion failure: (wrong-number-of-arguments (2 . 2) 6) It is again `setq-local' call with multiple variables. See the attached patch that splits it into several parts. --------------fIklmTT05BmI3vMmVus0fUQp Content-Type: text/x-patch; charset=UTF-8; name="0001-org-macs.el-Fix-Emacs-26-compatibility.patch" Content-Disposition: attachment; filename="0001-org-macs.el-Fix-Emacs-26-compatibility.patch" Content-Transfer-Encoding: base64 RnJvbSA5YmIyMWZlMjM1NDIwNmQzZWRmMGNjN2UxNDVmOWQ0YzVhN2JkMmVjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXggTmlrdWxpbiA8bWFuaWt1bGluQGdtYWlsLmNv bT4KRGF0ZTogRnJpLCAxMSBBdWcgMjAyMyAyMjoxMzoxNyArMDcwMApTdWJqZWN0OiBbUEFU Q0hdIG9yZy1tYWNzLmVsOiBGaXggRW1hY3MtMjYgY29tcGF0aWJpbGl0eQoKbGlzcC9vcmct bWFjcy5lbCAob3JnLXN0cmluZy13aWR0aCk6IEF2b2lkIG11bHRpcGxlIHZhcmlhYmxlcyBp bgpgc2V0cS1sb2NhbCcgc2luY2UgaXQgaXMgbm90IHN1cHBvcnRlZCBieSBFbWFjcy0yNi4K ClRoZSBjb2RlIGNhdXNlZCB0aGUgaXNzdWUgd2FzIGFkZGVkIGluIDBjMjlmNTNhYjg3MjMu Ci0tLQogbGlzcC9vcmctbWFjcy5lbCB8IDYgKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLW1h Y3MuZWwgYi9saXNwL29yZy1tYWNzLmVsCmluZGV4IDk1MzNkN2IwNy4uNDQyYzYwN2Q3IDEw MDY0NAotLS0gYS9saXNwL29yZy1tYWNzLmVsCisrKyBiL2xpc3Avb3JnLW1hY3MuZWwKQEAg LTExMTcsOSArMTExNyw5IEBAIChkZWZ1biBvcmctc3RyaW5nLXdpZHRoIChzdHJpbmcgJm9w dGlvbmFsIHBpeGVscykKICAgICAgICAgICAgICAgICAgcmVzdWx0KSkpCiAgICAgICAgICAg KGN1cnJlbnQtY2hhci1wcm9wZXJ0eS1hbGlhcy1hbGlzdCBjaGFyLXByb3BlcnR5LWFsaWFz LWFsaXN0KSkKICAgICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIChnZXQtYnVmZmVyLWNyZWF0 ZSAiICpPcmcgc3RyaW5nIHdpZHRoKiIpCi0gICAgICAgIChzZXRxLWxvY2FsIGRpc3BsYXkt bGluZS1udW1iZXJzIG5pbAotICAgICAgICAgICAgICAgICAgICBsaW5lLXByZWZpeCBuaWwK LSAgICAgICAgICAgICAgICAgICAgd3JhcC1wcmVmaXggbmlsKQorICAgICAgICAoc2V0cS1s b2NhbCBkaXNwbGF5LWxpbmUtbnVtYmVycyBuaWwpCisgICAgICAgIChzZXRxLWxvY2FsIGxp bmUtcHJlZml4IG5pbCkKKyAgICAgICAgKHNldHEtbG9jYWwgd3JhcC1wcmVmaXggbmlsKQog ICAgICAgICAoc2V0cS1sb2NhbCBidWZmZXItaW52aXNpYmlsaXR5LXNwZWMKICAgICAgICAg ICAgICAgICAgICAgKGlmIChsaXN0cCBjdXJyZW50LWludmlzaWJpbGl0eS1zcGVjKQogICAg ICAgICAgICAgICAgICAgICAgICAgKG1hcGNhciAobGFtYmRhIChlbCkKLS0gCjIuMjUuMQoK --------------fIklmTT05BmI3vMmVus0fUQp--