branch: externals/compat
commit 12f7a726b8ef2b0a8b437dd69043acebd79bdd92
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Remove compat--internal-func-arity
---
compat-26.el | 7 +++----
compat-29.el | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/compat-26.el b/compat-26.el
index 5aabb89513..6f88888810 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -44,14 +44,13 @@ FUNC must be a function of some kind.
The returned value is a cons cell (MIN . MAX). MIN is the minimum number
of args. MAX is the maximum number, or the symbol `many', for a
function with `&rest' args, or `unevalled' for a special form."
- :realname compat--internal-func-arity
(cond
((or (null func) (and (symbolp func) (not (fboundp func))))
(signal 'void-function func))
((and (symbolp func) (not (null func)))
- (compat--internal-func-arity (symbol-function func)))
+ (func-arity (symbol-function func)))
((eq (car-safe func) 'macro)
- (compat--internal-func-arity (cdr func)))
+ (func-arity (cdr func)))
((subrp func)
(subr-arity func))
((memq (car-safe func) '(closure lambda))
@@ -106,7 +105,7 @@ function with `&rest' args, or `unevalled' for a special
form."
(cons mandatory (if arglist 'many nonrest))))
((autoloadp func)
(autoload-do-load func)
- (compat--internal-func-arity func))
+ (func-arity func))
((signal 'invalid-function func))))
;;;; Defined in fns.c
diff --git a/compat-29.el b/compat-29.el
index abeb924c55..068904f96c 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -296,7 +296,7 @@ CONDITION is either:
((stringp condition)
(string-match-p condition (buffer-name buffer)))
((functionp condition)
- (if (eq 1 (cdr (compat--internal-func-arity condition)))
+ (if (eq 1 (cdr (func-arity condition)))
(funcall condition buffer)
(funcall condition buffer arg)))
((eq (car-safe condition) 'major-mode)
