diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-18 22:14:58 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-18 22:14:58 -0400 |
| commit | 265331858f3cd63f3ab593461ca4f2931780ba5e (patch) | |
| tree | d986abdbecbfac11c5747f1a047c9ff7d5eccb02 /lisp/emacs-lisp/eieio-opt.el | |
| parent | 4e94689452f3a895a52e67787b795596c2390462 (diff) | |
| download | emacs-265331858f3cd63f3ab593461ca4f2931780ba5e.tar.gz | |
* lisp/emacs-lisp/eieio: A bit more cleanup, removing compat code.
* lisp/emacs-lisp/eieio-core.el (eieio-compiled-function-arglist): Remove.
(eieio--with-scoped-class): Use `declare'.
(eieio-defclass): Remove compatibility code.
(no-method-definition, no-next-method, inconsistent-class-hierarchy)
(invalid-slot-type, unbound-slot, invalid-slot-name): Use define-error.
* lisp/emacs-lisp/eieio-opt.el (eieio-lambda-arglist): Remove.
Use help-function-arglist instead.
Diffstat (limited to 'lisp/emacs-lisp/eieio-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index ca9b91bed58..6f1d01c211f 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -356,7 +356,7 @@ are not abstract." (insert "' " (aref prefix i) " ") ;; argument list (let* ((func (cdr (car gm))) - (arglst (eieio-lambda-arglist func))) + (arglst (help-function-arglist func))) (prin1 arglst (current-buffer))) (insert "\n" (or (documentation (cdr (car gm))) @@ -374,13 +374,6 @@ are not abstract." (insert "\n"))) (setq i (1+ i))))))) -(defun eieio-lambda-arglist (func) - "Return the argument list of FUNC, a function body." - (if (symbolp func) (setq func (symbol-function func))) - (if (byte-code-function-p func) - (eieio-compiled-function-arglist func) - (car (cdr func)))) - (defun eieio-all-generic-functions (&optional class) "Return a list of all generic functions. Optional CLASS argument returns only those functions that contain @@ -419,15 +412,15 @@ function has no documentation, then return nil." (fboundp after))) nil (list (if (fboundp before) - (cons (eieio-lambda-arglist before) + (cons (help-function-arglist before) (documentation before)) nil) (if (fboundp primary) - (cons (eieio-lambda-arglist primary) + (cons (help-function-arglist primary) (documentation primary)) nil) (if (fboundp after) - (cons (eieio-lambda-arglist after) + (cons (help-function-arglist after) (documentation after)) nil)))))) |