* cedet/semantic/bovine/c.el (semantic-c-describe-environment):

Consistently check ede-object is bound throughout.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6eb3260f44569a6d0978d85c859d057a5b4362e1..0b845dd120513aadcc8ce92425282a21886ec59f 100644 (file)
--- 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 1f8b96afe0d514ed691ae5e69121e0906fb9f628..aab87f7eb250a10c3bdc3de7c4245720e01a22aa 100644 (file)
--- 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