diff options
| author | Gemini Lasswell <gazally@runbox.com> | 2017-05-02 10:19:12 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-05-02 10:19:12 +0300 |
| commit | d895f6c12f474476321322ed08e7c768be006287 (patch) | |
| tree | 160833a5a2fb0479389112a998e7a7471e7eb8b3 /lisp/emacs-lisp | |
| parent | b7c5af2bbda9f972b659389b061ef4c09bfba796 (diff) | |
| download | emacs-d895f6c12f474476321322ed08e7c768be006287.tar.gz emacs-d895f6c12f474476321322ed08e7c768be006287.tar.bz2 emacs-d895f6c12f474476321322ed08e7c768be006287.zip | |
Fix Edebug specs for 'cl-defmethod' and 'defmethod'
* lisp/emacs-lisp/cl-generic.el (cl-defmethod): Change Edebug spec
to make Edebug generate a new symbol for each method (Bug#24753) and
to support a string following :extra (Bug#23995).
* lisp/emacs-lisp/eieio-compat.el (defmethod): Change Edebug spec to
make Edebug generate a new symbol for each method (Bug#24753).
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 7 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio-compat.el | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index e15c94242fb..107d520b1e9 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -413,10 +413,11 @@ The set of acceptable TYPEs (also called \"specializers\") is defined (declare (doc-string 3) (indent 2) (debug (&define ; this means we are defining something - [&or name ("setf" :name setf name)] + [&or symbolp ("setf" symbolp)] ;; ^^ This is the methods symbol - [ &optional keywordp ] ; this is key :before etc - list ; arguments + [ &optional keywordp ; this is key :before etc + &optional stringp ] ; :extra can be followed by a string + listp ; arguments [ &optional stringp ] ; documentation string def-body))) ; part to be debugged (let ((qualifiers nil)) diff --git a/lisp/emacs-lisp/eieio-compat.el b/lisp/emacs-lisp/eieio-compat.el index d6eb0b416f8..fe65ae02623 100644 --- a/lisp/emacs-lisp/eieio-compat.el +++ b/lisp/emacs-lisp/eieio-compat.el @@ -105,10 +105,10 @@ Summary: (declare (doc-string 3) (obsolete cl-defmethod "25.1") (debug (&define ; this means we are defining something - [&or name ("setf" :name setf name)] + [&or symbolp ("setf" symbolp)] ;; ^^ This is the methods symbol [ &optional symbolp ] ; this is key :before etc - list ; arguments + listp ; arguments [ &optional stringp ] ; documentation string def-body ; part to be debugged ))) |