diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-09-21 02:14:58 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-09-21 02:14:58 +0000 |
| commit | b82525f29a46897b1583919818d174d6f778e2bd (patch) | |
| tree | 5511f4ab7485018d22b9953c91735bc006c8f6e5 /lisp/cedet/ede | |
| parent | 826608a5fd403acf8a9ae40884fac604b31b0843 (diff) | |
| download | emacs-b82525f29a46897b1583919818d174d6f778e2bd.tar.gz | |
* menu-bar.el: Remove ediff-misc from Tools menu.
* cedet/semantic.el (semantic-init-hook)
(semantic-init-mode-hook, semantic-init-db-hook): Rename
from *-hooks, to follow hook naming conventions.
(semantic-submode-list, semantic-default-submodes): New vars.
(semantic-mode): New mode.
(semantic-parser-working-message): Add ellipses to parse message.
* cedet/semantic/bovine/c.el:
* cedet/semantic/bovine/make.el:
* cedet/semantic/bovine/scm.el:
* cedet/semantic/wisent/java-tags.el:
* cedet/semantic/wisent/javascript.el: Don't set hooks directly.
This is now done in semantic-mode.
* cedet/semantic/decorate/mode.el (global-semantic-decoration-mode):
Autoload.
* cedet/srecode/compile.el:
* cedet/srecode/insert.el:
* cedet/srecode/mode.el: Fix require statements.
Diffstat (limited to 'lisp/cedet/ede')
| -rw-r--r-- | lisp/cedet/ede/cpp-root.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/pmake.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index 02f86d2c856..a922cc15782 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -467,7 +467,7 @@ This is for project include paths and spp source files." "Set variables local to PROJECT in BUFFER. Also set up the lexical preprocessor map." (call-next-method) - (when (and (featurep 'semantic-c) (featurep 'semantic-lex-spp)) + (when (and (featurep 'semantic/c) (featurep 'semantic/lex-spp)) (setq semantic-lex-spp-project-macro-symbol-obarray (semantic-lex-make-spp-table (oref project spp-table))) )) diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el index 302de420543..348bc3e302b 100644 --- a/lisp/cedet/ede/pmake.el +++ b/lisp/cedet/ede/pmake.el @@ -204,7 +204,7 @@ MFILENAME is the makefile to generate." ((eq (oref this makefile-type) 'Makefile.in) (error "Makefile.in is not supported")) ((eq (oref this makefile-type) 'Makefile.am) - (require 'ede-pconf) + (require 'ede/pconf) ;; Distribution variables (let ((targ (if isdist (oref this targets) mt))) (ede-compiler-begin-unique |