diff options
| author | K. Handa <handa@gnu.org> | 2017-10-08 11:56:06 +0900 |
|---|---|---|
| committer | K. Handa <handa@gnu.org> | 2017-10-08 11:56:06 +0900 |
| commit | a9b72976deec9b266950865581a626ec8f7b74f4 (patch) | |
| tree | 7b5fb778bad612133b54ea3a39aa8356b6bdbaf7 /lisp/emacs-lisp/cl-generic.el | |
| parent | 64baaff8c5f70b7d637ac37304c4377e955b3f09 (diff) | |
| parent | c194fb61c638490e3510864fe2750814af8c3719 (diff) | |
| download | emacs-a9b72976deec9b266950865581a626ec8f7b74f4.tar.gz emacs-a9b72976deec9b266950865581a626ec8f7b74f4.tar.bz2 emacs-a9b72976deec9b266950865581a626ec8f7b74f4.zip | |
Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/emacs-lisp/cl-generic.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index b2f76abd88e..62befd4742a 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -204,7 +204,16 @@ OPTIONS-AND-METHODS currently understands: DEFAULT-BODY, if present, is used as the body of a default method. \(fn NAME ARGS [DOC-STRING] [OPTIONS-AND-METHODS...] &rest DEFAULT-BODY)" - (declare (indent 2) (doc-string 3)) + (declare (indent 2) (doc-string 3) + (debug + (&define name cl-lambda-list lambda-doc + [&rest [&or + ("declare" &rest sexp) + (":argument-precedence-order" &rest sexp) + (&define ":method" [&rest atom] + cl-generic-method-args lambda-doc + def-body)]] + def-body))) (let* ((doc (if (stringp (car-safe options-and-methods)) (pop options-and-methods))) (declarations nil) @@ -422,7 +431,7 @@ The set of acceptable TYPEs (also called \"specializers\") is defined ; Like in CLOS spec, we support ; any non-list values. cl-generic-method-args ; arguments - [ &optional stringp ] ; documentation string + lambda-doc ; documentation string def-body))) ; part to be debugged (let ((qualifiers nil)) (while (not (listp args)) |