diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-10-03 19:28:05 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-10-03 19:28:05 +0000 |
| commit | e6e267fcba9251bbb7eeb66ca55c08e47c635ab8 (patch) | |
| tree | 91cf36bb9e07372ef8df6bf3d52ec9da8119e05b /lisp/cedet/ede/srecode.el | |
| parent | ed6b01957ea6cc8a51a38e6094c202219b23e86d (diff) | |
| download | emacs-e6e267fcba9251bbb7eeb66ca55c08e47c635ab8.tar.gz emacs-e6e267fcba9251bbb7eeb66ca55c08e47c635ab8.tar.bz2 emacs-e6e267fcba9251bbb7eeb66ca55c08e47c635ab8.zip | |
* 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.
Diffstat (limited to 'lisp/cedet/ede/srecode.el')
| -rw-r--r-- | lisp/cedet/ede/srecode.el | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/lisp/cedet/ede/srecode.el b/lisp/cedet/ede/srecode.el index 5f64ed3c7d0..0870517a46e 100644 --- a/lisp/cedet/ede/srecode.el +++ b/lisp/cedet/ede/srecode.el @@ -37,27 +37,13 @@ ;;; Code: (defun ede-srecode-setup () - "Update various paths to get SRecode to identify our macros." - (let* ((lib (locate-library "ede.el" t)) - (ededir (file-name-directory lib)) - (tmpdir (file-name-as-directory - (expand-file-name "templates" ededir)))) - (when (not tmpdir) - (error "Unable to location EDE Templates directory")) - - ;; Rig up the map. - (require 'srecode/map) - (require 'srecode/find) - (add-to-list 'srecode-map-load-path tmpdir) - (srecode-map-update-map t) - - ;; We don't call this unless we need it. Load in the templates. - (srecode-load-tables-for-mode 'makefile-mode) - (srecode-load-tables-for-mode 'makefile-mode 'ede) - - ;; @todo - autoconf files. - - )) + "Initialize Srecode for EDE." + (require 'srecode/map) + (require 'srecode/find) + (srecode-map-update-map t) + ;; We don't call this unless we need it. Load in the templates. + (srecode-load-tables-for-mode 'makefile-mode) + (srecode-load-tables-for-mode 'makefile-mode 'ede)) (defmacro ede-srecode-insert-with-dictionary (template &rest forms) "Insert TEMPLATE after executing FORMS with a dictionary. |