Publicize cl--generic-all-functions

[gnu-emacs] / lisp / cedet / semantic / db-el.el

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index b20a756f6b7af9a3e3493728487f8d3a888658c2..a85b9024eb0322233a944be01bac01cd85029a7f 100644 (file)
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -1,6 +1,6 @@
 ;;; semantic/db-el.el --- Semantic database extensions for Emacs Lisp
 
-;;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
+;;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: tags
@@ -223,11 +223,11 @@ TOKTYPE is a hint to the type of tag desired."
            (symbol-name sym)
            "class"
            (semantic-elisp-desymbolify
-             (let ((class (find-class sym)))
-               (if (fboundp 'eieio-slot-descriptor-name)
-                   (mapcar #'eieio-slot-descriptor-name
-                           (eieio-class-slots class))
-                 (eieio--class-public-a class))))
+            (let ((class (find-class sym)))
+              (if (fboundp 'eieio--class-public-a) ; Emacs < 25.1
+                  (eieio--class-public-a class)
+                (mapcar #'eieio-slot-descriptor-name
+                        (eieio-class-slots class)))))
            (semantic-elisp-desymbolify (eieio-class-parents sym)) ;; parents
            ))
          ((not toktype)
@@ -336,7 +336,7 @@ Return a list of tags."
                             (mapcar 'semanticdb-elisp-sym->tag
                                     ;; Fancy eieio function that knows all about
                                     ;; built in methods belonging to CLASS.
-                                    (eieio-all-generic-functions class)))))
+                                    (cl-generic-all-functions class)))))
             )
        taglst))))