2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6eb3260f445..0b845dd1205 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  Glenn Morris  <rgm@gnu.org>
+
+        * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
+        Consistently check ede-object is bound throughout.
+
 2010-03-23  Sam Steingold  <sds@gnu.org>
 
         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 1f8b96afe0d..aab87f7eb25 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