From 7041c32ec2cd985f1c324c75ecea8038f998a792 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Wed, 7 Oct 2020 20:43:00 +0200 Subject: [PATCH] * Fix some nits in comp.el * lisp/emacs-lisp/comp.el (comp-spill-lap-function): Use `cl-defmethod' where correct in place of `cl-defgeneric'. (comp-tampoline-compile): Add missing #. --- lisp/emacs-lisp/comp.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 01ffd4d40ec..763d44a23e1 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -661,7 +661,7 @@ clashes." (cl-defgeneric comp-spill-lap-function (input) "Byte compile INPUT and spill lap for further stages.") -(cl-defgeneric comp-spill-lap-function ((function-name symbol)) +(cl-defmethod comp-spill-lap-function ((function-name symbol)) "Byte compile FUNCTION-NAME spilling data from the byte compiler." (let* ((f (symbol-function function-name)) (c-name (comp-c-func-name function-name "F")) @@ -736,7 +736,7 @@ clashes." (comp-log (format "Function %s:\n" name) 1) (comp-log lap 1)))) -(cl-defgeneric comp-spill-lap-function ((filename string)) +(cl-defmethod comp-spill-lap-function ((filename string)) "Byte compile FILENAME spilling data from the byte compiler." (byte-compile-file filename) (unless byte-to-native-top-level-forms @@ -2594,7 +2594,7 @@ Return the its filename if found or nil otherwise." (defalias trampoline-sym `(closure nil ,lambda-list (let ((f #',subr-name)) - (,(if (memq '&rest lambda-list) 'apply 'funcall) + (,(if (memq '&rest lambda-list) #'apply 'funcall) f ,@(cl-loop for arg in lambda-list -- 2.39.5