Update copyright year to 2015

[gnu-emacs] / lisp / cedet / semantic / dep.el

diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index d4b17744d06e270c73d810f4dd5434311b98bbdb..e5e7da1dd79a0d4cf72e3d6139150bb3e91b67fa 100644 (file)
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -1,6 +1,6 @@
 ;;; semantic/dep.el --- Methods for tracking dependencies (include files)
 
-;;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax
@@ -30,7 +30,7 @@
 ;; EDE or even ECB can control our project dependencies, and help us
 ;; find file within the setting of a given project.  For system
 ;; dependencies, we need to depend on user supplied lists, which can
-;; manifest themselves in the form of system datatabases (from
+;; manifest themselves in the form of system databases (from
 ;; semanticdb.)
 ;;
 ;; Provide ways to track these different files here.
@@ -47,7 +47,7 @@ to the file being included.
 If `semantic-dependency-tag-file' is overridden for a given
 language, this path is most likely ignored.
 
-The above function, reguardless of being overriden, caches the
+The above function, regardless of being overridden, caches the
 located dependency file location in the tag property
 `dependency-file'.  If you override this function, you do not
 need to implement your own cache.  Each time the buffer is fully
@@ -208,7 +208,8 @@ provided mode, not from the current major mode."
               mode 'semantic-dependency-system-include-path))
        (edesys (when (and (featurep 'ede) ede-minor-mode
                           ede-object)
-                 (ede-system-include-path ede-object)))
+                 (ede-system-include-path
+                  (if (listp ede-object) (car ede-object) ede-object))))
        (locp (mode-local-value
               mode 'semantic-dependency-include-path))
        (found nil))
@@ -227,7 +228,6 @@ provided mode, not from the current major mode."
 
 ;; Local variables:
 ;; generated-autoload-file: "loaddefs.el"
-;; generated-autoload-feature: semantic/loaddefs
 ;; generated-autoload-load-name: "semantic/dep"
 ;; End: