Update copyright year to 2015

[gnu-emacs] / lisp / cedet / ede / proj.el

diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 702e35f0b1fe911d9f3e26a185d3bb133dc62e68..1ea165704673a9163b9b00a93ab130007d6d98d1 100644 (file)
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -1,6 +1,6 @@
 ;;; ede/proj.el --- EDE Generic Project file driver
 
-;; Copyright (C) 1998-2003, 2007-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2003, 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: project, make
@@ -104,6 +104,7 @@ distributed, and each should have a corresponding rule to build it.")
             :initform nil
             :type (or null symbol)
             :custom (choice (const :tag "None" nil)
+                            (symbol :tag "Custom Compiler Symbol")
                             :slotofchoices availablecompilers)
             :label "Compiler for building sources"
             :group make
@@ -116,6 +117,7 @@ of these compiler resources, and global customization thereof.")
             :initform nil
             :type (or null symbol)
             :custom (choice (const :tag "None" nil)
+                            (symbol :tag "Custom Linker Symbol")
                             :slotofchoices availablelinkers)
             :label "Linker for combining intermediate object files."
             :group make
@@ -308,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))))
@@ -688,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))