diff options
author | Michael R. Mauger <michael@mauger.com> | 2017-08-06 20:58:08 -0400 |
---|---|---|
committer | Michael R. Mauger <michael@mauger.com> | 2017-08-06 20:58:08 -0400 |
commit | 6e2c0929bac8d3896d0472222cd3e6b77cb24c35 (patch) | |
tree | 62668da72d88140958ed22273a6ed6557bc61a4a /lisp/emacs-lisp/edebug.el | |
parent | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (diff) | |
parent | c2f1830d69f5a5e20dac6fcbf3af4d51afba92bd (diff) | |
download | emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.tar.gz emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.tar.bz2 emacs-6e2c0929bac8d3896d0472222cd3e6b77cb24c35.zip |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp/edebug.el')
-rw-r--r-- | lisp/emacs-lisp/edebug.el | 4 |
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)) |