From: Eric Ludlam <zappo@gnu.org>
Date: Wed, 4 Jun 2014 01:51:39 +0000 (-0400)
Subject: Fix how the target file name is created
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=702d44db8f913d626aae65777eff03aa37689970;p=emacs.git

Fix how the target file name is created

* test/manual/cedet/cedet/ede/detect-dirtest.el (ede-dirmatch-load):
 Fix how target file name was created. (project-rescan): New.
---

diff --git a/test/manual/cedet/cedet/ede/detect-dirtest.el b/test/manual/cedet/cedet/ede/detect-dirtest.el
index 483435aa4d4..2825369da67 100644
--- a/test/manual/cedet/cedet/ede/detect-dirtest.el
+++ b/test/manual/cedet/cedet/ede/detect-dirtest.el
@@ -37,23 +37,15 @@
 Return nil if there isn't one.
 Argument DIR is the directory it is created for.
 ROOTPROJ is nil, sinc there is only one project for a directory tree."
-  (let* ((proj (ede-directory-get-open-project dir)))
-    (if proj
-	proj
-
-      ;; Create a new project here.
-      (let* ((name (file-name-nondirectory (directory-file-name dir)))
-	     (cpp (expand-file-name (concat name ".cpp") dir)))
-	(setq proj (ede-detect-test-dirmatch-project
-		    name
-		    :name name
-		    :directory (file-name-as-directory dir)
-		    :file cpp
-		    :targets nil))
-	;;(message "Create dirtest project type!")
-	proj
-	)
-      )))
+  ;; Create a new project here.
+  (let* ((name (file-name-nondirectory (directory-file-name dir)))
+	 (cpp (expand-file-name (concat name ".cpp") dir)))
+    (ede-detect-test-dirmatch-project
+     name
+     :name name
+     :directory (file-name-as-directory dir)
+     :file cpp
+     :targets nil)))
 
 (defmethod ede-project-root ((this ede-detect-test-dirmatch-project))
   "Return my root."
@@ -81,6 +73,12 @@ ROOTPROJ is nil, sinc there is only one project for a directory tree."
   "Return PROJ, for handling all subdirs below DIR."
   proj)
 
+(defmethod project-rescan ((this ede-detect-test-dirmatch-project))
+  "Don't rescan this project from the sources."
+  ;;(message "Rescan for dirmatch test project run.")
+  nil)
+
+
 ;;(message "Loaded detect-dirtest.el")
 
 (provide 'cedet/ede/detect-dirtest)