[Emacs-diffs] scratch/project 97b4004 3/5: project-try-ede: Make it work

[Dmitry Gutov]

branch: scratch/project
commit 97b40045fe2fa804f68de1f081e9def19a342701
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    project-try-ede: Make it work
---
 lisp/progmodes/project.el |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index cfb7926..ad9b72b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -73,13 +73,20 @@ be edited together).  The directory names should be 
absolute."
 
 (defun project-try-ede (dir)
   (when (featurep 'ede)
-    (cons 'ede (ede-directory-get-open-project dir 'ROOT))))
+    (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))))))
 
 (defun project-ask-user (dir)
   (cons 'user (read-directory-name "Project root: " dir nil t)))
 
 (cl-defmethod project-root ((project (head ede)))
-  (ede-project-root (cdr project)))
+  (ede-project-root-directory (cdr project)))
 
 (provide 'project)
 ;;; project.el ends here