Merge changes from emacs-23 branch.

6 files changed, 14 insertions, 6 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index df02d554004..d99c3fd0d95 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * ede/linux.el (ede-project-class-files):
+        * ede/generic.el (ede-generic-new-autoloader):
+        * ede/emacs.el (ede-project-class-files):
+        * ede/simple.el (ede-project-class-files):
+        * ede/cpp-root.el (ede-project-class-files): Fix require name.
+
 2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
 
         * semantic/lex.el (semantic-ignore-comments): Doc fix.
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 5ef3323cfd5..1c850f7ad95 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -131,7 +131,7 @@
 ;; (add-to-list 'ede-project-class-files
 ;;           (ede-project-autoload "cpp-root"
 ;;            :name "CPP ROOT"
-;;            :file 'ede-cpp-root
+;;            :file 'ede/cpp-root
 ;;            :proj-file 'MY-FILE-FOR-DIR
 ;;            :proj-root 'MY-ROOT-FCN
 ;;            :load-type 'MY-LOAD
@@ -241,7 +241,7 @@ ROOTPROJ is nil, since there is only one project."
 (add-to-list 'ede-project-class-files
              (ede-project-autoload "cpp-root"
               :name "CPP ROOT"
-              :file 'ede-cpp-root
+              :file 'ede/cpp-root
               :proj-file 'ede-cpp-root-project-file-for-dir
               :proj-root 'ede-cpp-root-project-root
               :load-type 'ede-cpp-root-load
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 7038a78f892..fefd8f99415 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -137,7 +137,7 @@ ROOTPROJ is nil, since there is only one project."
 (add-to-list 'ede-project-class-files
              (ede-project-autoload "emacs"
               :name "EMACS ROOT"
-              :file 'ede-emacs
+              :file 'ede/emacs
               :proj-file "src/emacs.c"
               :proj-root 'ede-emacs-project-root
               :load-type 'ede-emacs-load
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 68517f27b6a..c2d31f56a13 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -368,7 +368,7 @@ the class `ede-generic-project' project."
   (add-to-list 'ede-project-class-files
                (ede-project-autoload internal-name
                                      :name external-name
-                                     :file 'ede-generic
+                                     :file 'ede/generic
                                      :proj-file projectfile
                                      :load-type 'ede-generic-load
                                      :class-sym class
diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el
index 456a0e552d9..9ae4c91a2a0 100644
--- a/lisp/cedet/ede/linux.el
+++ b/lisp/cedet/ede/linux.el
@@ -116,7 +116,7 @@ ROOTPROJ is nil, since there is only one project."
 (add-to-list 'ede-project-class-files
              (ede-project-autoload "linux"
               :name "LINUX ROOT"
-              :file 'ede-linux
+              :file 'ede/linux
               :proj-file "scripts/ver_linux"
               :proj-root 'ede-linux-project-root
               :load-type 'ede-linux-load
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index a1ac52c29a1..d42baa45f6a 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -47,7 +47,7 @@
 
 (add-to-list 'ede-project-class-files
              (ede-project-autoload "simple-overlay"
-              :name "Simple" :file 'ede-simple
+              :name "Simple" :file 'ede/simple
               :proj-file 'ede-simple-projectfile-for-dir
               :load-type 'ede-simple-load
               :class-sym 'ede-simple-project)