summaryrefslogtreecommitdiff
path: root/lisp/cedet/ede/proj.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/cedet/ede/proj.el')
-rw-r--r--lisp/cedet/ede/proj.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index e3c2ea4b914..7f3b186f504 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -310,7 +310,7 @@ the PROJECT being read in is the root project."
(let ((sd (file-name-as-directory
(expand-file-name (car subdirs) project))))
(if (and (file-directory-p sd)
- (ede-directory-project-p sd))
+ (file-exists-p (expand-file-name "Project.ede" sd)))
(oset ret subproj
(cons (ede-proj-load sd (or rootproj ret))
(oref ret subproj))))
@@ -690,7 +690,10 @@ Optional argument FORCE will force items to be regenerated."
"Rescan the EDE proj project THIS."
(let ((root (or (ede-project-root this) this))
)
- (setq ede-projects (delq root ede-projects))
+ ;; @TODO - VERIFY THE BELOW WORKS
+ (ede-project-directory-remove-hash
+ (file-name-directory (ede-project-root-directory root)))
+ (ede-delete-project-from-global-list root)
;; NOTE : parent function double-checks that this dir was
;; already in memory once.
(ede-load-project-file (ede-project-root-directory root))