Merge from trunk.

[gnu-emacs] / lisp / obsolete / vc-mcvs.el

diff --git a/lisp/obsolete/vc-mcvs.el b/lisp/obsolete/vc-mcvs.el
index fe1d23eb1cf745c9953d8b8002133717e0549d7b..980cdbfd71b2e32268d09a68eade6eae96e4fcdc 100644 (file)
--- a/lisp/obsolete/vc-mcvs.el
+++ b/lisp/obsolete/vc-mcvs.el
@@ -1,10 +1,10 @@
 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2003-2011  Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  None
+;; Obsolete-since: 23.1
 
 ;; This file is part of GNU Emacs.
 
@@ -31,9 +31,6 @@
 ;;
 ;; ********** READ THIS! **********
 
-;; This file has been obsolete and unsupported since Emacs 23.1.
-
-
 ;; The home page of the Meta-CVS version control system is at
 ;;
 ;;      http://users.footprints.net/~kaz/mcvs.html
@@ -102,10 +99,9 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "22.1"
   :group 'vc)
 
-(defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
-                             vc-cvs-header)
+(defcustom vc-mcvs-header vc-cvs-header
   "Header keywords to be inserted by `vc-insert-headers'."
-  :version "22.1"
+  :version "24.1"     ; no longer consult the obsolete vc-header-alist
   :type '(repeat string)
   :group 'vc)
 
@@ -200,7 +196,7 @@ COMMENT can be used to provide an initial description of FILE.
 Passes either `vc-mcvs-register-switches' or `vc-register-switches'
 to the Meta-CVS command."
   ;; FIXME: multiple-file case should be made to work.
-  (if (> (length files) 1) (error "Registering filesets is not yet supported."))
+  (if (> (length files) 1) (error "Registering filesets is not yet supported"))
   (let* ((file (car files))
         (filename (file-name-nondirectory file))
         (extpos (string-match "\\." filename))
@@ -586,5 +582,4 @@ and that it passes `vc-mcvs-global-switches' to it before FLAGS."
 ;;
 ;; ********** READ THIS! **********
 
-;; arch-tag: a39c7c1c-5247-429d-88df-dd7187d2e704
 ;;; vc-mcvs.el ends here