ede autoload tweak

* lisp/cedet/ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
(generated-autoload-file, generated-autoload-load-name):
Set file-local values.

* lisp/cedet/ede.el: Load ede/loaddefs at compile time too.
(ede-dired-minor-mode): Remove hand-written autoload.

3 files changed, 17 insertions, 5 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index fbe32ff610b..14a2a4270f6 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-29  Glenn Morris  <rgm@gnu.org>
+
+        * ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
+        (generated-autoload-file, generated-autoload-load-name):
+        Set file-local values.
+        * ede.el: Load ede/loaddefs at compile time too.
+        (ede-dired-minor-mode): Remove hand-written autoload.
+
 2014-03-04  Glenn Morris  <rgm@gnu.org>
 
         * semantic/util.el (semantic-complete-symbol):
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 70bac9aae3e..998df78735a 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -46,7 +46,8 @@
 (require 'ede/base)
 (require 'ede/auto)
 
-(load "ede/loaddefs" nil 'nomessage)
+(eval-and-compile
+  (load "ede/loaddefs" nil 'nomessage))
 
 (declare-function ede-commit-project "ede/custom")
 (declare-function ede-convert-path "ede/files")
@@ -450,8 +451,6 @@ If optional argument CURRENT is non-nil, return sub-menu code."
 
 ;;; Mode Declarations
 ;;
-(eval-and-compile
-  (autoload 'ede-dired-minor-mode "ede/dired" "EDE commands for dired" t))
 
 (defun ede-apply-target-options ()
   "Apply options to the current buffer for the active project/target."
diff --git a/lisp/cedet/ede/dired.el b/lisp/cedet/ede/dired.el
index 1bfa6f79f6b..f3b2774a520 100644
--- a/lisp/cedet/ede/dired.el
+++ b/lisp/cedet/ede/dired.el
@@ -1,7 +1,6 @@
 ;;; ede/dired.el --- EDE extensions to dired.
 
-;; Copyright (C) 1998-2000, 2003, 2009-2014 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1998-2000, 2003, 2009-2014 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.4
@@ -56,6 +55,7 @@
     map)
   "Keymap used for ede dired minor mode.")
 
+;;;###autoload
 (define-minor-mode ede-dired-minor-mode
   "A minor mode that should only be activated in DIRED buffers.
 If ARG is nil or a positive number, force on, if
@@ -84,4 +84,9 @@ negative, force off."
 
 (provide 'ede/dired)
 
+;; Local variables:
+;; generated-autoload-file: "loaddefs.el"
+;; generated-autoload-load-name: "ede/dired"
+;; End:
+
 ;;; ede/dired.el ends here