diff options
| author | Stefan Monnier | 2023-02-07 18:03:22 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2023-02-07 18:03:22 -0500 |
| commit | 88d5327fe2ab6ecfde22fee8835c583bfd1f2ce2 (patch) | |
| tree | 22f98ad8019fbc47afe90a2b64d43464004e2059 | |
| parent | a98d0daac473737da720c20f49f6f5abf36b074b (diff) | |
| download | emacs-88d5327fe2ab6ecfde22fee8835c583bfd1f2ce2.tar.gz emacs-88d5327fe2ab6ecfde22fee8835c583bfd1f2ce2.zip | |
(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).
| -rw-r--r-- | lisp/emacs-lisp/cconv.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index e8d639903c1..570c9e66060 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." | |||
| 483 | (bf (if (stringp (car body)) (cdr body) body)) | 483 | (bf (if (stringp (car body)) (cdr body) body)) |
| 484 | (if (when (eq 'interactive (car-safe (car bf))) | 484 | (if (when (eq 'interactive (car-safe (car bf))) |
| 485 | (gethash form cconv--interactive-form-funs))) | 485 | (gethash form cconv--interactive-form-funs))) |
| 486 | (wrapped (pcase if (`#'(lambda (_cconv--dummy) .,_) t) (_ nil))) | 486 | (wrapped (pcase if (`#'(lambda (&rest _cconv--dummy) .,_) t) (_ nil))) |
| 487 | (cif (when if (cconv-convert if env extend))) | 487 | (cif (when if (cconv-convert if env extend))) |
| 488 | (_ (pcase cif | 488 | (_ (pcase cif |
| 489 | ('nil nil) | 489 | ('nil nil) |
| @@ -747,7 +747,7 @@ This function does not return anything but instead fills the | |||
| 747 | (let ((if (cadr (car bf)))) | 747 | (let ((if (cadr (car bf)))) |
| 748 | (unless (macroexp-const-p if) ;Optimize this common case. | 748 | (unless (macroexp-const-p if) ;Optimize this common case. |
| 749 | (let ((f (if (eq 'function (car-safe if)) if | 749 | (let ((f (if (eq 'function (car-safe if)) if |
| 750 | `#'(lambda (_cconv--dummy) ,if)))) | 750 | `#'(lambda (&rest _cconv--dummy) ,if)))) |
| 751 | (setf (gethash form cconv--interactive-form-funs) f) | 751 | (setf (gethash form cconv--interactive-form-funs) f) |
| 752 | (cconv-analyze-form f env)))))) | 752 | (cconv-analyze-form f env)))))) |
| 753 | (cconv--analyze-function vrs body-forms env form)) | 753 | (cconv--analyze-function vrs body-forms env form)) |