cedet/semantic/chart.el: Don't require semantic/find.

cedet/semantic/complete.el: Don't require semantic/find.

cedet/semantic/decorate.el: Require semantic/tag-file.
(semantic-set-tag-folded-isearch): Require semantic/find.

cedet/semantic/dep.el: Change semantic--dependency-find-file-on-path
into a macro, to avoid compiler warning.
Defvar ede-minor-mode and ede-object.
Declare ede-system-include-path.

cedet/semantic/doc.el: Require semantic/tag-file and semantic/find.

cedet/semantic/edit.el: Require semantic/find and semantic/format.

cedet/semantic/find.el: Defvar semantic-case-fold.
Require semantic.
(semantic-find-tags-external-children-of-type): Require semantic/sort.
(semantic-find-tags-by-scope-protection-default): Require semantic/tag-ls.

cedet/semantic/format.el: Require semantic/tag-ls.
eval-when-compile semantic/find.
(semantic-format-tag-name): Move up to avoid compiler error.
(semantic-format-tag-prototype): Move up to avoid compiler error.
(semantic--format-tag-parent-tree): Require semantic/tag-file.
(semantic-format-tag-short-doc-default): Require semantic/doc.

1 files changed, 17 insertions, 21 deletions

diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index 4c67c6674f2..aa860c13764 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -1,4 +1,4 @@
-;;; dep.el --- Methods for tracking dependencies (include files)
+;;; semantic/dep.el --- Methods for tracking dependencies (include files)
 
 ;;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
@@ -178,25 +178,21 @@ macro `defcustom-mode-local-semantic-dependency-system-include-path'."
 ;;; PATH SEARCH
 ;;
 ;; methods for finding files on a provided path.
-(if (fboundp 'locate-file)
-    (defsubst semantic--dependency-find-file-on-path (file path)
-      "Return an expanded file name for FILE on PATH."
-      (locate-file file path))
-
-  ;; Else, older version of Emacs.
-
-  (defsubst semantic--dependency-find-file-on-path (file path)
-    "Return an expanded file name for FILE on PATH."
-    (let ((p path)
-	  (found nil))
-      (while (and p (not found))
-        (let ((f (expand-file-name file (car p))))
-	  (if (file-exists-p f)
-	      (setq found f)))
-        (setq p (cdr p)))
-      found))
-
-  )
+(defmacro semantic--dependency-find-file-on-path (file path)
+  (if (fboundp 'locate-file)
+      `(locate-file ,file ,path)
+    `(let ((p ,path)
+	   (found nil))
+       (while (and p (not found))
+	 (let ((f (expand-file-name ,file (car p))))
+	   (if (file-exists-p f)
+	       (setq found f)))
+	 (setq p (cdr p)))
+       found)))
+
+(defvar ede-minor-mode)
+(defvar ede-object)
+(declare-function ede-system-include-path "ede")
 
 (defun semantic-dependency-find-file-on-path (file systemp &optional mode)
   "Return an expanded file name for FILE on available paths.
@@ -225,4 +221,4 @@ provided mode, not from the current major mode."
 
 (provide 'semantic/dep)
 
-;;; semantic-dep.el ends here
+;;; semantic/dep.el ends here