Update copyright year to 2015

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

diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index 283f9dccac795d9af36530079c9b7619a6b4a619..9f4fa45ff3ac8e972d37250a28198f42f955d82a 100644 (file)
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -1,6 +1,6 @@
 ;;; ede/base.el --- Baseclasses for EDE.
 
-;; Copyright (C) 2010-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -605,7 +605,7 @@ Display the results as a debug list."
   "Return the ede project which is the root of the current project.
 Optional argument SUBPROJ indicates a subproject to start from
 instead of the current project."
-  (or ede-object-root-project
+  (or (when (not subproj) ede-object-root-project)
       (let* ((cp (or subproj (ede-current-project))))
        (or (and cp (ede-project-root cp))
            (progn