1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 02:20:21 -08:00

Merge branch 'savannah/master' into feature/igc

This commit is contained in:
Pip Cet 2025-06-07 09:41:45 +00:00
commit f90cee6f76
111 changed files with 4372 additions and 2767 deletions

View file

@ -1456,10 +1456,7 @@ when printing the error message."
(let ((fn name))
(while (and (symbolp fn)
(fboundp fn)
(or (symbolp (symbol-function fn))
(consp (symbol-function fn))
(and (not macro-p)
(compiled-function-p (symbol-function fn)))))
(functionp (symbol-function fn)))
(setq fn (symbol-function fn)))
(let ((advertised (get-advertised-calling-convention
(if (and (symbolp fn) (fboundp fn))
@ -1471,7 +1468,7 @@ when printing the error message."
(if macro-p
`(macro lambda ,advertised)
`(lambda ,advertised)))
((and (not macro-p) (compiled-function-p fn)) fn)
((and (not macro-p) (functionp fn)) fn)
((not (consp fn)) nil)
((eq 'macro (car fn)) (cdr fn))
(macro-p nil)