aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-03-23 20:19:15 -0700
committerGlenn Morris2010-03-23 20:19:15 -0700
commit1d94ebb00c022b55edc14fffce7e000643ea00a3 (patch)
tree40687449647df8b0da7d643e62490816bd4803ac
parentf4087766ce0aebb7c205ccd7ec28dfceb808d567 (diff)
downloademacs-1d94ebb00c022b55edc14fffce7e000643ea00a3.tar.gz
emacs-1d94ebb00c022b55edc14fffce7e000643ea00a3.zip
* 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 6eb3260f445..0b845dd1205 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-03-24 Glenn Morris <rgm@gnu.org>
2
3 * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
4 Consistently check ede-object is bound throughout.
5
12010-03-23 Sam Steingold <sds@gnu.org> 62010-03-23 Sam Steingold <sds@gnu.org>
2 7
3 Fix bug#5620: recalculate all markers on compilation buffer 8 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."
1761 1761
1762 (when (arrayp semantic-lex-spp-project-macro-symbol-obarray) 1762 (when (arrayp semantic-lex-spp-project-macro-symbol-obarray)
1763 (princ "\n Project symbol map:\n") 1763 (princ "\n Project symbol map:\n")
1764 (princ " Your project symbol map is derived from the EDE object:\n ") 1764 (when (and (boundp 'ede-object) ede-object)
1765 (princ (object-print ede-object)) 1765 (princ " Your project symbol map is derived from the EDE object:\n ")
1766 (princ (object-print ede-object)))
1766 (princ "\n\n") 1767 (princ "\n\n")
1767 (let ((macros nil)) 1768 (let ((macros nil))
1768 (mapatoms 1769 (mapatoms