Commit 565c0ca5 authored by Chong Yidong's avatar Chong Yidong

Merge changes from emacs-23 branch.

parents a952d5f3 b93e37e5
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> 2010-09-25 Juanma Barranquero <lekktu@gmail.com>
* semantic/lex.el (semantic-ignore-comments): Doc fix. * semantic/lex.el (semantic-ignore-comments): Doc fix.
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
;; (add-to-list 'ede-project-class-files ;; (add-to-list 'ede-project-class-files
;; (ede-project-autoload "cpp-root" ;; (ede-project-autoload "cpp-root"
;; :name "CPP ROOT" ;; :name "CPP ROOT"
;; :file 'ede-cpp-root ;; :file 'ede/cpp-root
;; :proj-file 'MY-FILE-FOR-DIR ;; :proj-file 'MY-FILE-FOR-DIR
;; :proj-root 'MY-ROOT-FCN ;; :proj-root 'MY-ROOT-FCN
;; :load-type 'MY-LOAD ;; :load-type 'MY-LOAD
...@@ -241,7 +241,7 @@ ROOTPROJ is nil, since there is only one project." ...@@ -241,7 +241,7 @@ ROOTPROJ is nil, since there is only one project."
(add-to-list 'ede-project-class-files (add-to-list 'ede-project-class-files
(ede-project-autoload "cpp-root" (ede-project-autoload "cpp-root"
:name "CPP ROOT" :name "CPP ROOT"
:file 'ede-cpp-root :file 'ede/cpp-root
:proj-file 'ede-cpp-root-project-file-for-dir :proj-file 'ede-cpp-root-project-file-for-dir
:proj-root 'ede-cpp-root-project-root :proj-root 'ede-cpp-root-project-root
:load-type 'ede-cpp-root-load :load-type 'ede-cpp-root-load
......
...@@ -137,7 +137,7 @@ ROOTPROJ is nil, since there is only one project." ...@@ -137,7 +137,7 @@ ROOTPROJ is nil, since there is only one project."
(add-to-list 'ede-project-class-files (add-to-list 'ede-project-class-files
(ede-project-autoload "emacs" (ede-project-autoload "emacs"
:name "EMACS ROOT" :name "EMACS ROOT"
:file 'ede-emacs :file 'ede/emacs
:proj-file "src/emacs.c" :proj-file "src/emacs.c"
:proj-root 'ede-emacs-project-root :proj-root 'ede-emacs-project-root
:load-type 'ede-emacs-load :load-type 'ede-emacs-load
......
...@@ -368,7 +368,7 @@ the class `ede-generic-project' project." ...@@ -368,7 +368,7 @@ the class `ede-generic-project' project."
(add-to-list 'ede-project-class-files (add-to-list 'ede-project-class-files
(ede-project-autoload internal-name (ede-project-autoload internal-name
:name external-name :name external-name
:file 'ede-generic :file 'ede/generic
:proj-file projectfile :proj-file projectfile
:load-type 'ede-generic-load :load-type 'ede-generic-load
:class-sym class :class-sym class
......
...@@ -116,7 +116,7 @@ ROOTPROJ is nil, since there is only one project." ...@@ -116,7 +116,7 @@ ROOTPROJ is nil, since there is only one project."
(add-to-list 'ede-project-class-files (add-to-list 'ede-project-class-files
(ede-project-autoload "linux" (ede-project-autoload "linux"
:name "LINUX ROOT" :name "LINUX ROOT"
:file 'ede-linux :file 'ede/linux
:proj-file "scripts/ver_linux" :proj-file "scripts/ver_linux"
:proj-root 'ede-linux-project-root :proj-root 'ede-linux-project-root
:load-type 'ede-linux-load :load-type 'ede-linux-load
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
(add-to-list 'ede-project-class-files (add-to-list 'ede-project-class-files
(ede-project-autoload "simple-overlay" (ede-project-autoload "simple-overlay"
:name "Simple" :file 'ede-simple :name "Simple" :file 'ede/simple
:proj-file 'ede-simple-projectfile-for-dir :proj-file 'ede-simple-projectfile-for-dir
:load-type 'ede-simple-load :load-type 'ede-simple-load
:class-sym 'ede-simple-project) :class-sym 'ede-simple-project)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment