Update copyright year to 2016

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

diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 2151e9ef53b66182d2d5a386b5c6f0040d9b082b..7824942d96fcaf712f53c32ca2f144e0de12db30 100644 (file)
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -1,6 +1,6 @@
 ;;; semantic/bovine/el.el --- Semantic details for Emacs Lisp
 
-;; Copyright (C) 1999-2005, 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2005, 2007-2016 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -25,6 +25,7 @@
 
 (require 'semantic)
 (require 'semantic/bovine)
+(require 'semantic/db-el)
 (require 'find-func)
 
 (require 'semantic/ctxt)
@@ -474,7 +475,7 @@ Return a bovination list to use."
        ((and name (file-exists-p (concat name ".el.gz")))
        ;; This is the linux distro case.
        (concat name ".el.gz"))
-       ;; source file does not exists
+       ;; Source file does not exist.
        (name
        (message "semantic: cannot find source file %s" (concat name ".el")))
        (t
@@ -497,15 +498,15 @@ used to perform the override."
 Unfortunately, this requires that the tag in question has been loaded
 into Emacs Lisp's memory."
   (let ((obsoletethis (intern-soft (semantic-tag-name tag)))
-       (obsoletor nil))
+       (obsoleter nil))
     ;; This asks if our tag is available in the Emacs name space for querying.
     (when obsoletethis
       (mapatoms (lambda (a)
                  (let ((oi (get a 'byte-obsolete-info)))
                    (if (and oi (eq (car oi) obsoletethis))
-                       (setq obsoletor a)))))
-      (if obsoletor
-         (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag))
+                       (setq obsoleter a)))))
+      (if obsoleter
+         (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag))
        ""))))
 
 (define-mode-local-override semantic-documentation-for-tag
@@ -863,7 +864,7 @@ fields and such to, but that is for some other day."
 In Emacs Lisp, a prototype for something may start (autoload ...).
 This is certainly not expected if this is used to display a summary.
 Make up something else.  When we go to write something that needs
-a real Emacs Lisp protype, we can fix it then."
+a real Emacs Lisp prototype, we can fix it then."
   (let ((class (semantic-tag-class tag))
        (name (semantic-format-tag-name tag parent color))
        )
@@ -940,8 +941,11 @@ ELisp variables can be pretty long, so track this one too.")
 (define-child-mode lisp-mode emacs-lisp-mode
   "Make `lisp-mode' inherit mode local behavior from `emacs-lisp-mode'.")
 
+;;;###autoload
 (defun semantic-default-elisp-setup ()
   "Setup hook function for Emacs Lisp files and Semantic."
+  ;; This is here mostly to get this file loaded when a .el file is
+  ;; loaded into Emacs.
   )
 
 (add-hook 'emacs-lisp-mode-hook 'semantic-default-elisp-setup)
@@ -956,10 +960,16 @@ ELisp variables can be pretty long, so track this one too.")
 ;;
 (add-hook 'lisp-mode-hook 'semantic-default-elisp-setup)
 
-(eval-after-load "semanticdb"
+(eval-after-load "semantic/db"
   '(require 'semantic/db-el)
   )
 
+
 (provide 'semantic/bovine/el)
 
+;; Local variables:
+;; generated-autoload-file: "../loaddefs.el"
+;; generated-autoload-load-name: "semantic/bovine/el"
+;; End:
+
 ;;; semantic/bovine/el.el ends here