Merge from emacs-23

[gnu-emacs] / lisp / vc / vc-cvs.el

diff --git a/lisp/vc-cvs.el b/lisp/vc/vc-cvs.el
similarity index 99%
rename from lisp/vc-cvs.el
rename to lisp/vc/vc-cvs.el
index 4c9d62a087cdea1d374cded42ec33425ffdc9f31..3b5766bda62ec6150cd135b54c31fbe78ea659e7 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -5,6 +5,7 @@
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
 
 ;; This file is part of GNU Emacs.
 
@@ -91,9 +92,9 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "21.1"
   :group 'vc)
 
-(defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$"))
+(defcustom vc-cvs-header '("\$Id\$")
   "Header keywords to be inserted by `vc-insert-headers'."
-  :version "21.1"
+  :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :type '(repeat string)
   :group 'vc)