* cedet/srecode/srt-mode.el (srecode-template-mode): Doc fix.

* files.el (auto-mode-alist): Add .srt and Project.ede.

* cedet/semantic.el (semantic-mode): Handle
srecode-template-mode-hook as well.

* cedet/srecode/template.el: Remove hook variable.

* cedet/ede/proj-comp.el: Require ede/pmake when compiling.

* cedet/ede.el (ede-target-forms-menu): Don't enable if no
projects exist.

* cedet/srecode/map.el (srecode-map-base-template-dir): Look for
templates in data-directory.

* cedet/ede/srecode.el (ede-srecode-setup): Use default templates
directory.

* cedet/semantic/util-modes.el (semantic-highlight-func-mode): Doc
fix.

* cedet/ede/proj-comp.el (ede-proj-makefile-insert-variables):
Only insert each variable once.

* cedet/ede/pmake.el (ede-pmake-insert-variable-once): New macro.
(ede-pmake-insert-variable-shared): Use it.

* cedet/ede/cpp-root.el (ede-preprocessor-map): Do not deref table
for lexical table iff table is nil.

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index e1e348ac947..c30df8dbb0d 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -491,8 +491,8 @@ Also set up the lexical preprocessor map."
 	 (when (not table)
 	   (message "Cannot find file %s in project." F))
 	 (when (and table (semanticdb-needs-refresh-p table))
-	   (semanticdb-refresh-table table))
-	 (setq spp (append spp (oref table lexical-table)))))
+	   (semanticdb-refresh-table table)
+	   (setq spp (append spp (oref table lexical-table))))))
      (oref this spp-files))
     spp))