[Emacs-diffs] /srv/bzr/emacs/trunk r101616: Merge changes from emacs-23 branch.

[Chong Yidong]

------------------------------------------------------------
revno: 101616 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-09-25 15:19:41 -0400
message:
  Merge changes from emacs-23 branch.
modified:
  lisp/cedet/ChangeLog
  lisp/cedet/ede/cpp-root.el
  lisp/cedet/ede/emacs.el
  lisp/cedet/ede/generic.el
  lisp/cedet/ede/linux.el
  lisp/cedet/ede/simple.el

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2010-09-25 12:04:35 +0000
+++ b/lisp/cedet/ChangeLog      2010-09-25 18:55:16 +0000
@@ -1,3 +1,11 @@
+2010-09-25  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * semantic/lex.el (semantic-ignore-comments): Doc fix.

=== modified file 'lisp/cedet/ede/cpp-root.el'
--- a/lisp/cedet/ede/cpp-root.el        2010-09-21 02:42:53 +0000
+++ b/lisp/cedet/ede/cpp-root.el        2010-09-25 18:49:43 +0000
@@ -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

=== modified file 'lisp/cedet/ede/emacs.el'
--- a/lisp/cedet/ede/emacs.el   2010-09-21 02:42:53 +0000
+++ b/lisp/cedet/ede/emacs.el   2010-09-25 18:49:43 +0000
@@ -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

=== modified file 'lisp/cedet/ede/generic.el'
--- a/lisp/cedet/ede/generic.el 2010-09-21 02:42:53 +0000
+++ b/lisp/cedet/ede/generic.el 2010-09-25 18:49:43 +0000
@@ -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

=== modified file 'lisp/cedet/ede/linux.el'
--- a/lisp/cedet/ede/linux.el   2010-09-21 02:42:53 +0000
+++ b/lisp/cedet/ede/linux.el   2010-09-25 18:49:43 +0000
@@ -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

=== modified file 'lisp/cedet/ede/simple.el'
--- a/lisp/cedet/ede/simple.el  2010-09-21 02:42:53 +0000
+++ b/lisp/cedet/ede/simple.el  2010-09-25 18:49:43 +0000
@@ -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)