* 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.

3 files changed, 10 insertions, 9 deletions

diff --git a/lisp/cedet/srecode/map.el b/lisp/cedet/srecode/map.el
index 32723128325..dfe031c41ae 100644
--- a/lisp/cedet/srecode/map.el
+++ b/lisp/cedet/srecode/map.el
@@ -36,10 +36,7 @@
 
 (defun srecode-map-base-template-dir ()
   "Find the base template directory for SRecode."
-  (let* ((lib (locate-library "srecode.el"))
-         (dir (file-name-directory lib)))
-    (expand-file-name "templates/" dir)
-    ))
+  (expand-file-name "srecode" data-directory))
 
 ;;; Current MAP
 ;;
@@ -399,7 +396,7 @@ Return non-nil if the map changed."
   (list (srecode-map-base-template-dir)
         (expand-file-name "~/.srecode/")
         )
-  "*Global load path for SRecode template files."
+  "Global load path for SRecode template files."
   :group 'srecode
   :type '(repeat file)
   :set 'srecode-map-load-path-set)
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 7b5322aa1fa..e10c163b8db 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -184,7 +184,7 @@ we can tell font lock about them.")
 
 ;;;###autoload
 (defun srecode-template-mode ()
-  "Major-mode for writing srecode macros."
+  "Major-mode for writing SRecode macros."
   (interactive)
   (kill-all-local-variables)
   (setq major-mode 'srecode-template-mode
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index e20afd0c1c4..b4f372c1370 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -39,6 +39,7 @@
       ans)
     ))
 
+;;;###autoload
 (defun srecode-template-setup-parser ()
   "Setup buffer for parse."
   (srecode-template-wy--install-parser)
@@ -61,10 +62,13 @@
    senator-step-at-tag-classes '(function variable)
    ))
 
-;;;;###autoload
-(add-hook 'srecode-template-mode-hook 'srecode-template-setup-parser)
-
 (provide 'srecode/template)
 
+;; Local variables:
+;; generated-autoload-file: "loaddefs.el"
+;; generated-autoload-feature: srecode/loaddefs
+;; generated-autoload-load-name: "srecode/template"
+;; End:
+
 ;; arch-tag: 037fbca7-e846-4521-b801-3463f50c3080
 ;;; srecode/template.el ends here