# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1285442381 14400
# Node ID bc67a5497dda9e5c58d2d80a08f71433aa45e212
# Parent  72166a5a538c432054dcbae11aff0f0c9c0facc3# Parent  6a4262ac6a5dd5a796069fae6e685abce60e212f
Merge changes from emacs-23 branch.

diff -r 72166a5a538c -r bc67a5497dda lisp/cedet/ChangeLog
--- a/lisp/cedet/ChangeLog	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ChangeLog	Sat Sep 25 15:19:41 2010 -0400
@@ -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 -r 72166a5a538c -r bc67a5497dda lisp/cedet/ede/cpp-root.el
--- a/lisp/cedet/ede/cpp-root.el	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ede/cpp-root.el	Sat Sep 25 15:19:41 2010 -0400
@@ -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 @@
 (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 -r 72166a5a538c -r bc67a5497dda lisp/cedet/ede/emacs.el
--- a/lisp/cedet/ede/emacs.el	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ede/emacs.el	Sat Sep 25 15:19:41 2010 -0400
@@ -137,7 +137,7 @@
 (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 -r 72166a5a538c -r bc67a5497dda lisp/cedet/ede/generic.el
--- a/lisp/cedet/ede/generic.el	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ede/generic.el	Sat Sep 25 15:19:41 2010 -0400
@@ -368,7 +368,7 @@
   (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 -r 72166a5a538c -r bc67a5497dda lisp/cedet/ede/linux.el
--- a/lisp/cedet/ede/linux.el	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ede/linux.el	Sat Sep 25 15:19:41 2010 -0400
@@ -116,7 +116,7 @@
 (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 -r 72166a5a538c -r bc67a5497dda lisp/cedet/ede/simple.el
--- a/lisp/cedet/ede/simple.el	Sat Sep 25 18:39:13 2010 +0200
+++ b/lisp/cedet/ede/simple.el	Sat Sep 25 15:19:41 2010 -0400
@@ -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)