aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2010-03-23 20:19:15 -0700
committerGlenn Morris <[email protected]>2010-03-23 20:19:15 -0700
commit1d94ebb00c022b55edc14fffce7e000643ea00a3 (patch)
tree40687449647df8b0da7d643e62490816bd4803ac
parentf4087766ce0aebb7c205ccd7ec28dfceb808d567 (diff)
* cedet/semantic/bovine/c.el (semantic-c-describe-environment):
Consistently check ede-object is bound throughout.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/cedet/semantic/bovine/c.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6eb3260f44..0b845dd120 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24 Glenn Morris <[email protected]>
+
+ * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
+ Consistently check ede-object is bound throughout.
+
2010-03-23 Sam Steingold <[email protected]>
Fix bug#5620: recalculate all markers on compilation buffer
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 1f8b96afe0..aab87f7eb2 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1761,8 +1761,9 @@ DO NOT return the list of tags encompassing point."
(when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
(princ "\n Project symbol map:\n")
- (princ " Your project symbol map is derived from the EDE object:\n ")
- (princ (object-print ede-object))
+ (when (and (boundp 'ede-object) ede-object)
+ (princ " Your project symbol map is derived from the EDE object:\n ")
+ (princ (object-print ede-object)))
(princ "\n\n")
(let ((macros nil))
(mapatoms