&allow-other-keys + &rest body in cl-defmacro (was: Permanently fix org versioning breakage during builds?)

[Ihor Radchenko <yantar92@posteo.net>]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

João Távora <joaotavora@gmail.com> writes:

>> Hmm... It actually looks like a problem with `cl-defmacro' rather than
>> with macro definition itself.
>
> No, Common Lisp's DEFMACRO works exactly like this. You need to understand
> how &rest works with &key and &allow-other-keys. It _also_ keeps the keys.
> That's just how it works.

Now I feel a bit like RMS when he complained about CL-lib introducing
alien concepts to Elisp :)

What about non-breaking change like the attached?


[-- Attachment #2: 0001-org-element-with-buffer-copy-org-export-with-buffer-.patch --]
[-- Type: text/x-patch, Size: 2253 bytes --]

From 3ebf5565196e2dfa3548564cf5a266e51e35cd9d Mon Sep 17 00:00:00 2001
Message-ID: <3ebf5565196e2dfa3548564cf5a266e51e35cd9d.1703503500.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Mon, 25 Dec 2023 12:20:10 +0100
Subject: [PATCH] org-element-with-buffer-copy, org-export-with-buffer-copy:
 Fix expansion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* lisp/org-element.el (org-element-with-buffer-copy):
* lisp/ox.el (org-export-with-buffer-copy): Make sure that keyword
arguments in the macro are not duplicated into BODY, which happens for
&rest body + &allow-other-keys in `cl-defmacro'.

Reported-by: João Távora <joaotavora@gmail.com>
Link: https://yhetil.org/emacs-devel/CALDnm53p7nXdnbA2PuH-VHL7EeGQUXYy3x_87hp3oj2pkyWS9Q@mail.gmail.com/
---
 lisp/org-element.el | 3 +++
 lisp/ox.el          | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 0924c56fe..842cf8857 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -669,6 +669,9 @@ (cl-defmacro org-element-with-buffer-copy ( &rest body
 copy.  TO-BUFFER, DROP-VISIBILITY, DROP-NARROWING, DROP-CONTENTS, and
 DROP-LOCALS are passed as arguments to `org-element-copy-buffer'."
   (declare (debug t))
+  ;; Drop keyword arguments from BODY.
+  (while (memq (car body) '(:to-buffer :drop-visibility :drop-narrowing :drop-contents :drop-locals))
+    (pop body) (pop body))
   (org-with-gensyms (buf-copy)
     `(let ((,buf-copy (org-element-copy-buffer
                        :to-buffer ,to-buffer
diff --git a/lisp/ox.el b/lisp/ox.el
index b661b59c3..a54b3d809 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -2599,6 +2599,9 @@ (cl-defmacro org-export-with-buffer-copy ( &rest body
 In addition, buffer-local variables are set according to #+BIND:
 keywords."
   (declare (debug t))
+  ;; Drop keyword arguments from BODY.
+  (while (memq (car body) '(:to-buffer :drop-visibility :drop-narrowing :drop-contents :drop-locals))
+    (pop body) (pop body))
   (org-with-gensyms (bind-variables)
     `(let ((,bind-variables (org-export--list-bound-variables)))
        (org-element-with-buffer-copy
-- 
2.42.0


[-- Attachment #3: Type: text/plain, Size: 224 bytes --]


-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>