Mercurial > emacs
changeset 110570:e78f439a4955
Fix require names in CEDET 1.0 merge.
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 25 Sep 2010 14:49:43 -0400 |
| parents | 7060c3b16693 |
| children | 6a4262ac6a5d cb4b54af7023 |
| files | 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 |
| diffstat | 6 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/cedet/ChangeLog Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ChangeLog Sat Sep 25 14:49:43 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-21 Eric Ludlam <zappo@gnu.org> Synch SRecode to CEDET 1.0.
--- a/lisp/cedet/ede/cpp-root.el Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ede/cpp-root.el Sat Sep 25 14:49:43 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
--- a/lisp/cedet/ede/emacs.el Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ede/emacs.el Sat Sep 25 14:49:43 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
--- a/lisp/cedet/ede/generic.el Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ede/generic.el Sat Sep 25 14:49:43 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
--- a/lisp/cedet/ede/linux.el Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ede/linux.el Sat Sep 25 14:49:43 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
--- a/lisp/cedet/ede/simple.el Thu Sep 23 00:05:22 2010 -0700 +++ b/lisp/cedet/ede/simple.el Sat Sep 25 14:49:43 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)