summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/cedet/ede/cpp-root.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b27b3e342c..23039243c14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31 Jonathan Marchand <jonathlela@gmail.com>
+
+ * cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name
+ (bug#6231).
+
2010-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
* man.el (Man-completion-table): Let the user type "-k " (bug#6319).
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 1592c3c2f5d..cae4d090a39 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/bovine/c) (featurep 'semantic/lex-spp))
(setq semantic-lex-spp-project-macro-symbol-obarray
(semantic-lex-make-spp-table (oref project spp-table)))
))