[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 88d5327fe2: (cconv-convert): Fix regression
From: |
Stefan Monnier |
Subject: |
master 88d5327fe2: (cconv-convert): Fix regression |
Date: |
Tue, 7 Feb 2023 18:03:31 -0500 (EST) |
branch: master
commit 88d5327fe2ab6ecfde22fee8835c583bfd1f2ce2
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
(cconv-convert): Fix regression
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyze-form):
Since we can't always remove the wrapper, make sure the wrapper
accepts the expected calling convention (i.e. called with no args).
---
lisp/emacs-lisp/cconv.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index e8d639903c..570c9e6606 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -483,7 +483,7 @@ places where they originally did not directly appear."
(bf (if (stringp (car body)) (cdr body) body))
(if (when (eq 'interactive (car-safe (car bf)))
(gethash form cconv--interactive-form-funs)))
- (wrapped (pcase if (`#'(lambda (_cconv--dummy) .,_) t) (_ nil)))
+ (wrapped (pcase if (`#'(lambda (&rest _cconv--dummy) .,_) t) (_
nil)))
(cif (when if (cconv-convert if env extend)))
(_ (pcase cif
('nil nil)
@@ -747,7 +747,7 @@ This function does not return anything but instead fills the
(let ((if (cadr (car bf))))
(unless (macroexp-const-p if) ;Optimize this common case.
(let ((f (if (eq 'function (car-safe if)) if
- `#'(lambda (_cconv--dummy) ,if))))
+ `#'(lambda (&rest _cconv--dummy) ,if))))
(setf (gethash form cconv--interactive-form-funs) f)
(cconv-analyze-form f env))))))
(cconv--analyze-function vrs body-forms env form))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 88d5327fe2: (cconv-convert): Fix regression,
Stefan Monnier <=