summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/edebug.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2017-07-28 11:28:48 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2017-07-28 11:28:48 -0400
commitb2225a374f24f1ee1a881bfd5d3c1f7b57447e47 (patch)
tree7324b2e0af30247b2f7cbaa7b0cfffd31035dbe6 /lisp/emacs-lisp/edebug.el
parentdc9c6a071c0c12be2bd490f85107486bca44623e (diff)
downloademacs-b2225a374f24f1ee1a881bfd5d3c1f7b57447e47.tar.gz
emacs-b2225a374f24f1ee1a881bfd5d3c1f7b57447e47.tar.bz2
emacs-b2225a374f24f1ee1a881bfd5d3c1f7b57447e47.zip
* lisp/subr.el (method-files): Move function to cl-generic.el
* lisp/emacs-lisp/cl-generic.el (cl-generic-p): New function. (cl--generic-method-files): New function, moved from subr.el. * lisp/emacs-lisp/edebug.el (edebug-instrument-function): Use them. * test/lisp/emacs-lisp/cl-generic-tests.el: * test/lisp/subr-tests.el: Move and adjust method-files tests accordingly.
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
-rw-r--r--lisp/emacs-lisp/edebug.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 1494ed1d9c3..c6ef8d7a99c 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3213,8 +3213,8 @@ instrument cannot be found, signal an error."
((consp func-marker)
(message "%s is already instrumented." func)
(list func))
- ((get func 'cl--generic)
- (let ((method-defs (method-files func))
+ ((cl-generic-p func)
+ (let ((method-defs (cl--generic-method-files func))
symbols)
(unless method-defs
(error "Could not find any method definitions for %s" func))