[Emacs-diffs] scratch/project 9273961: Move project-try-ede to lisp/cedet/ede.el

[Dmitry Gutov]

branch: scratch/project
commit 92739614381949a711273b0f093849558a1e1911
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Move project-try-ede to lisp/cedet/ede.el
---
 lisp/cedet/ede.el         |   16 ++++++++++++++++
 lisp/progmodes/project.el |   17 -----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 43660a8..9e92fc7 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -1517,6 +1517,22 @@ It does not apply the value to buffers."
   "Commit change to local variables in PROJ."
   nil)
 
+;;; Integration with project.el
+
+(defun project-try-ede (dir)
+  (let ((project-dir
+         (locate-dominating-file
+          dir
+          (lambda (dir)
+            (ede-directory-get-open-project dir 'ROOT)))))
+    (when project-dir
+      (ede-directory-get-open-project project-dir 'ROOT))))
+
+(cl-defmethod project-root ((project ede-project))
+  (ede-project-root-directory project))
+
+(add-hook 'project-find-functions #'project-try-ede)
+
 (provide 'ede)
 
 ;; Include this last because it depends on ede.
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 77f28e5..26b5e0c 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -28,7 +28,6 @@
 (require 'cl-generic)
 
 (defvar project-find-functions (list #'project-try-vc
-                                     #'project-try-ede
                                      #'project-ask-user)
   "Special hook to find the project containing a given directory.
 Each functions on this hook is called in turn with one
@@ -68,22 +67,6 @@ be edited together).  The directory names should be 
absolute."
 (cl-defmethod project-root ((project (head vc)))
   (cdr project))
 
-(declare-function ede-directory-get-open-project "ede")
-
-(defun project-try-ede (dir)
-  (when (featurep 'ede)
-    (let ((project-dir
-           (locate-dominating-file
-            dir
-            (lambda (dir)
-              (ede-directory-get-open-project dir 'ROOT)))))
-      (when project-dir
-        (cons 'ede
-              (ede-directory-get-open-project project-dir 'ROOT))))))
-
-(cl-defmethod project-root ((project (head ede)))
-  (ede-project-root-directory (cdr project)))
-
 (defun project-ask-user (dir)
   (cons 'user (read-directory-name "Project root: " dir nil t)))