procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/obsolete/cl.el (labels): Don't quote lambda

Browse source 
(flet): Don't need `fboundp` any more before calling `symbol-function`.
This commit is contained in:
Stefan Monnier 2021-08-11 18:20:35 -04:00
parent 2f90fa19b8
commit bd6c3a014a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/obsolete/cl.el
View file

@ -431,8 +431,7 @@ definitions, or lack thereof).
(obsolete "use either `cl-flet' or `cl-letf'." "24.3"))
`(letf ,(mapcar
(lambda (x)
(if (or (and (fboundp (car x))
(eq (car-safe (symbol-function (car x))) 'macro))
(if (or (eq (car-safe (symbol-function (car x))) 'macro)
(cdr (assq (car x) macroexpand-all-environment)))
(error "Use `labels', not `flet', to rebind macro names"))
(let ((func `(cl-function
@ -466,10 +465,10 @@ rather than relying on `lexical-binding'."
(push `(cl-function (lambda . ,(cdr binding))) sets)
(push var sets)
(push (cons (car binding)
`(lambda (&rest cl-labels-args)
(if (eq (car cl-labels-args) cl--labels-magic)
(list cl--labels-magic ',var)
(cl-list* 'funcall ',var cl-labels-args))))
(lambda (&rest cl-labels-args)
(if (eq (car cl-labels-args) cl--labels-magic)
(list cl--labels-magic var)
(cl-list* 'funcall var cl-labels-args))))
newenv)))
;; `lexical-let' adds `cl--function-convert' (which calls
;; `cl--labels-convert') as a macroexpander for `function'.