aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJonathan Marchand2010-05-31 16:26:56 -0400
committerStefan Monnier2010-05-31 16:26:56 -0400
commit9b937f37617a8fa41bf0a4b30fe7237a9ff9e221 (patch)
treea22295ab8ac90e6cd13c3cd317b3042bf12451a7 /lisp
parent1ab8293c369c39375d17e50b0664b2d20f7b7871 (diff)
downloademacs-9b937f37617a8fa41bf0a4b30fe7237a9ff9e221.tar.gz
emacs-9b937f37617a8fa41bf0a4b30fe7237a9ff9e221.zip
* lisp/cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name.
Fixes: debbugs:6231
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 @@
12010-05-31 Jonathan Marchand <jonathlela@gmail.com>
2
3 * cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name
4 (bug#6231).
5
12010-05-31 Stefan Monnier <monnier@iro.umontreal.ca> 62010-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * man.el (Man-completion-table): Let the user type "-k " (bug#6319). 8 * 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."
467 "Set variables local to PROJECT in BUFFER. 467 "Set variables local to PROJECT in BUFFER.
468Also set up the lexical preprocessor map." 468Also set up the lexical preprocessor map."
469 (call-next-method) 469 (call-next-method)
470 (when (and (featurep 'semantic/c) (featurep 'semantic/lex-spp)) 470 (when (and (featurep 'semantic/bovine/c) (featurep 'semantic/lex-spp))
471 (setq semantic-lex-spp-project-macro-symbol-obarray 471 (setq semantic-lex-spp-project-macro-symbol-obarray
472 (semantic-lex-make-spp-table (oref project spp-table))) 472 (semantic-lex-make-spp-table (oref project spp-table)))
473 )) 473 ))