* semantic/db-find.el

  (semanticdb-find-translate-path-brutish-default): If we don't yet
  have a proper table for PATH, use `semanticdb-current-database'
  instead (bug #10343).

2 files changed, 11 insertions, 2 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index ec7fdcecca0..f185c457ee2 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-12  David Engster  <deng@randomsample.de>
+
+        * semantic/db-find.el
+        (semanticdb-find-translate-path-brutish-default): If we don't yet
+        have a proper table for PATH, use `semanticdb-current-database'
+        instead (bug #10343).
+
 2012-03-11  David Engster  <deng@randomsample.de>
 
         * semantic/wisent/javascript.el (js-mode): Define `js-mode' as
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index ca6a8fbf5ca..15ef3b09238 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -325,8 +325,10 @@ Default action as described in `semanticdb-find-translate-path'."
          (cond ((null path) semanticdb-current-database)
                ((semanticdb-table-p path) (oref path parent-db))
                (t (let ((tt (semantic-something-to-tag-table path)))
-                    ;; @todo - What does this DO ??!?!
-                    (with-current-buffer (semantic-tag-buffer (car tt))
+                    (if tt
+                        ;; @todo - What does this DO ??!?!
+                        (with-current-buffer (semantic-tag-buffer (car tt))
+                          semanticdb-current-database)
                       semanticdb-current-database))))))
     (apply
      #'nconc