summaryrefslogtreecommitdiff
path: root/lisp/cedet
diff options
context:
space:
mode:
authorDarren Hoo <darren.hoo@gmail.com>2011-07-04 17:36:38 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-04 17:36:38 +0200
commit60c55439fcdea56b9039ad544a7bf53372440502 (patch)
treece04cb9b1958db34a3600cbec8235f3a08610e93 /lisp/cedet
parent7c301272b49a20b7a1628bdad572264ada9fd790 (diff)
downloademacs-60c55439fcdea56b9039ad544a7bf53372440502.tar.gz
* semantic/db.el (semanticdb-file-table-object): Don't bug out on
unconfigured projects if `global-ede-mode' is on. Fixes: debbugs:8092
Diffstat (limited to 'lisp/cedet')
-rw-r--r--lisp/cedet/ChangeLog5
-rw-r--r--lisp/cedet/semantic/db.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 75948ef8d18..60d7690a3c8 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-04 Darren Hoo <darren.hoo@gmail.com> (tiny change)
+
+ * semantic/db.el (semanticdb-file-table-object): Don't bug out on
+ unconfigured projects if `global-ede-mode' is on (bug#8092).
+
2011-07-01 Paul Eggert <eggert@cs.ucla.edu>
* semantic.el (semantic-elapsed-time): Rewrite using
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index fa8de392b62..dca1b3bafea 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -880,7 +880,7 @@ If file does not have tags available, and DONTLOAD is nil,
then load the tags for FILE, and create a new table object for it.
DONTLOAD does not affect the creation of new database objects."
;; (message "Object Translate: %s" file)
- (when (file-exists-p file)
+ (when (and file (file-exists-p file))
(let* ((default-directory (file-name-directory file))
(tab (semanticdb-file-table-object-from-hash file))
(fullfile nil))