Merge from origin/emacs-24

[gnu-emacs] / lisp / cedet / cedet-cscope.el

diff --git a/lisp/cedet/cedet-cscope.el b/lisp/cedet/cedet-cscope.el
index 90b2277012ada8b7c0e87305c82c4ac0be4a5bfc..94b7b077199cbdc9a165d087b1198ce277933243 100644 (file)
--- a/lisp/cedet/cedet-cscope.el
+++ b/lisp/cedet/cedet-cscope.el
@@ -1,8 +1,9 @@
 ;;; cedet-cscope.el --- CScope support for CEDET
 
-;;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+;;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
+;; Package: cedet
 
 ;; This file is part of GNU Emacs.
 
@@ -27,7 +28,7 @@
 
 (declare-function inversion-check-version "inversion")
 
-(defvar cedet-cscope-min-version "16.0"
+(defvar cedet-cscope-min-version "15.7"
   "Minimum version of CScope required.")
 
 (defcustom cedet-cscope-command "cscope"
@@ -134,8 +135,8 @@ the error code."
 
 (defun cedet-cscope-version-check (&optional noerror)
   "Check the version of the installed CScope command.
-If optional programatic argument NOERROR is non-nil, then
-instead of throwing an error if CScope isn't available, then
+If optional programmatic argument NOERROR is non-nil,
+then instead of throwing an error if CScope isn't available,
 return nil."
   (interactive)
   (require 'inversion)
@@ -172,5 +173,4 @@ there is already a database in DIR."
 
 (provide 'cedet-cscope)
 
-;; arch-tag: 9973f1ad-f13b-4399-bc67-7f488478d78d
 ;;; cedet-cscope.el ends here