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...

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)

lisp/emacs-lisp/cl-generic.el

@@ -937,7 +937,7 @@ MET-NAME is a cons (SYMBOL . SPECIALIZERS)."
            (setq applies t)))
     applies))
 
-(defun cl--generic-all-functions (&optional type)
+(defun cl-generic-all-functions (&optional type)
   "Return a list of all generic functions.
 Optional TYPE argument returns only those functions that contain
 methods for TYPE."

lisp/emacs-lisp/eieio-opt.el

@@ -162,7 +162,7 @@ are not abstract."
 (defun eieio-display-method-list ()
   "Display a list of all the methods and what features are used."
   (interactive)
-  (let* ((meth1 (cl--generic-all-functions))
+  (let* ((meth1 (cl-generic-all-functions))
 	 (meth (sort meth1 (lambda (a b)
 			     (string< (symbol-name a)
 				      (symbol-name b)))))