summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-extra.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-10 07:44:28 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-05-10 07:44:28 -0700
commit6d0703a01df1ece3fd9ba2a927913d1bcf10d549 (patch)
treee3492449c92c0895ac77853d0a8ea07c0ecfe24f /lisp/emacs-lisp/cl-extra.el
parent433d366dc7b053048abf710d790ff62421dd1570 (diff)
parentd0d9f55b632717fccb605e0a204ebdd5ffe8608f (diff)
downloademacs-6d0703a01df1ece3fd9ba2a927913d1bcf10d549.tar.gz
emacs-6d0703a01df1ece3fd9ba2a927913d1bcf10d549.tar.bz2
emacs-6d0703a01df1ece3fd9ba2a927913d1bcf10d549.zip
Merge from origin/emacs-25
d0d9f55 Allow newlines inside cl function arglists 963541a Publicize cl--generic-all-functions 3c581d5 ; Fix typo e58f900 Add some "safe-local-variable" declarations for compatibility...
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
-rw-r--r--lisp/emacs-lisp/cl-extra.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index b5dfe487d07..8bf0675f54b 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -822,7 +822,7 @@ including `cl-block' and `cl-eval-when'."
(cl--describe-class-slots class)
;; Describe all the methods specific to this class.
- (let ((generics (cl--generic-all-functions type)))
+ (let ((generics (cl-generic-all-functions type)))
(when generics
(insert (propertize "Specialized Methods:\n\n" 'face 'bold))
(dolist (generic generics)