Merge with CEDET upstream (rev. 8499).

[gnu-emacs] / lisp / cedet / semantic / db-find.el

diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 77fd10fc7aa87c385b9e5293f53ac595d2d88dee..2e4ca319a9da498b0a8b388954d5816f52eca26e 100644 (file)
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -244,7 +244,7 @@ This class will cache data derived during various searches.")
           (let ((tab-idx (semanticdb-get-table-index tab)))
             ;; Not a full reset?
             (when (oref tab-idx type-cache)
-              (require 'db-typecache)
+              (require 'semantic/db-typecache)
               (semanticdb-typecache-notify-reset
                (oref tab-idx type-cache)))
             )))
@@ -919,7 +919,7 @@ but should be good enough for debugging assertions."
   (if (< (length result) 2)
       (concat "#<FIND RESULT "
              (mapconcat (lambda (a)
-                          (concat "(" (object-name (car a) ) " . "
+                          (concat "(" (eieio-object-name (car a) ) " . "
                                   "#<TAG LIST " (number-to-string (length (cdr a))) ">)"))
                         result
                         " ")
@@ -1285,7 +1285,7 @@ associated with that tag should be loaded into a buffer."
   (semanticdb-find-tags-collector
    (lambda (table tags)
      (semanticdb-find-tags-external-children-of-type-method table type tags))
-   path find-file-match))
+   path find-file-match t))
 
 (defun semanticdb-find-tags-subclasses-of-type
   (type &optional path find-file-match)