[Emacs-diffs] scratch/last-cedet-merge cc30b46 11/37: EDE: Move ede-global-list-sanity-check to ede/files.el

[David Engster]

branch: scratch/last-cedet-merge
commit cc30b46d98800872e17b55117a2478830af5e640
Author: Eric Ludlam <address@hidden>
Commit: David Engster <address@hidden>

    EDE: Move ede-global-list-sanity-check to ede/files.el
    
    * lisp/cedet/ede.el: Declare `ede-directory-project-cons'.
    * lisp/cedet/ede/files.el (ede-global-list-sanity-check): Moved from
      ede.el.
---
 lisp/cedet/ede.el       |   17 +----------------
 lisp/cedet/ede/files.el |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 87d73b2..d7f625d 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -63,6 +63,7 @@
 (declare-function ede-toplevel-project "ede/files")
 (declare-function ede-up-directory "ede/files")
 (declare-function semantic-lex-make-spp-table "semantic/lex-spp")
+(declare-function ede-directory-project-cons  "ede/files")
 
 (defconst ede-version "2.0"
   "Current version of the Emacs EDE.")
@@ -1096,22 +1097,6 @@ Flush the dead projects from the project cache."
 
 (defvar ede--disable-inode)             ;Defined in ede/files.el.
 
-(defun ede-global-list-sanity-check ()
-  "Perform a sanity check to make sure there are no duplicate projects."
-  (interactive)
-  (let ((scanned nil))
-    (dolist (P ede-projects)
-      (if (member (oref P directory) scanned)
-         (error "Duplicate project (by dir) found in %s!" (oref P directory))
-       (push (oref P directory) scanned)))
-    (unless ede--disable-inode
-      (setq scanned nil)
-      (dolist (P ede-projects)
-       (if (member (ede--project-inode P) scanned)
-         (error "Duplicate project (by inode) found in %s!" 
(ede--project-inode P))
-         (push (ede--project-inode P) scanned))))
-    (message "EDE by directory %sis still sane." (if ede--disable-inode "" "& 
inode "))))
-
 (defun ede-load-project-file (dir &optional detectin rootreturn)
   "Project file independent way to read a project in from DIR.
 Optional DETECTIN is an autoload cons from `ede-detect-directory-for-project'
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index 889cac8..01a536a 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -67,6 +67,22 @@ the current EDE project."
     (when loc
       (ede-locate-flush-hash loc))))
 
+(defun ede-global-list-sanity-check ()
+  "Perform a sanity check to make sure there are no duplicate projects."
+  (interactive)
+  (let ((scanned nil))
+    (dolist (P ede-projects)
+      (if (member (oref P :directory) scanned)
+         (error "Duplicate project (by dir) found in %s!" (oref P :directory))
+       (push (oref P :directory) scanned)))
+    (unless ede--disable-inode
+      (setq scanned nil)
+      (dolist (P ede-projects)
+       (if (member (ede--project-inode P) scanned)
+         (error "Duplicate project (by inode) found in %s!" 
(ede--project-inode P))
+         (push (ede--project-inode P) scanned))))
+    (message "EDE by directory %sis still sane." (if ede--disable-inode "" "& 
inode "))))
+
 ;;; Placeholders for ROOT directory scanning on base objects
 ;;
 (cl-defmethod ede-project-root ((this ede-project-placeholder))