Merge from emacs-23

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

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