Move EIEIO autoloads to the common loaddefs.el

* lisp/emacs-lisp/eieio-core.el:
* lisp/emacs-lisp/eieio-custom.el:
* lisp/emacs-lisp/eieio-opt.el:
* lisp/obsolete/eieio-compat.el: Remove generated-autoload-file
setting and don't require eieio-loaddefs.el.

diff --git a/lisp/emacs-lisp/eieio-core.el b/lisp/emacs-lisp/eieio-core.el
index 25f2dd40980882ba735d0bb9a0f60a346310de81..5e7b5cbfb2fe3b118eb020ed699cf3105b35f77d 100644 (file)
--- a/lisp/emacs-lisp/eieio-core.el
+++ b/lisp/emacs-lisp/eieio-core.el
@@ -32,7 +32,6 @@
 ;;; Code:
 
 (require 'cl-lib)
-(require 'eieio-loaddefs nil t)
 
 ;;;
 ;; A few functions that are better in the official EIEIO src, but

diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 4b8b4275f1acadf2afaacf61e055ae9d51247b93..0bec3bb0d59ddc0f29bd8fadb80d002aa03f3e77 100644 (file)
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -467,8 +467,4 @@ Return the symbol for the group, or nil."
 
 (provide 'eieio-custom)
 
-;; Local variables:
-;; generated-autoload-file: "eieio-loaddefs.el"
-;; End:
-
 ;;; eieio-custom.el ends here

diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 72108f807f9270242f7238b611fff7f70671de56..5f67263f177f7d04906d34e482810e40393aeb4d 100644 (file)
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -348,8 +348,4 @@ INDENT is the current indentation level."
 
 (provide 'eieio-opt)
 
-;; Local variables:
-;; generated-autoload-file: "eieio-loaddefs.el"
-;; End:
-
 ;;; eieio-opt.el ends here

diff --git a/lisp/obsolete/eieio-compat.el b/lisp/obsolete/eieio-compat.el
index 2ac75293fcc4c2fe10f8f74e0dd932d6845d5294..ead9352695c9575918d4ab37d7acbeeb0ef039c0 100644 (file)
--- a/lisp/obsolete/eieio-compat.el
+++ b/lisp/obsolete/eieio-compat.el
@@ -253,11 +253,6 @@ Summary:
   (declare (obsolete eieio-defclass-internal "25.1"))
   (eval `(defclass ,cname ,superclasses ,slots ,@options)))
 
-
-;; Local Variables:
-;; generated-autoload-file: "eieio-loaddefs.el"
-;; End:
-
 (provide 'eieio-compat)
 
 ;;; eieio-compat.el ends here