Merge changes from emacs-23 branch.

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

diff --git a/lisp/vc-svn.el b/lisp/vc/vc-svn.el
similarity index 99%
rename from lisp/vc-svn.el
rename to lisp/vc/vc-svn.el
index 7b95c2a214d60341132aef61283b4304a1d536d2..3e4c299f096b791405355c79f7854070d17f081b 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -5,6 +5,7 @@
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
+;; Package: vc
 
 ;; This file is part of GNU Emacs.
 
@@ -83,9 +84,9 @@ want to force an empty list of arguments, use t."
   :version "22.1"
   :group 'vc)
 
-(defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$"))
+(defcustom vc-svn-header '("\$Id\$")
   "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)
 
@@ -282,7 +283,7 @@ to the SVN command."
   "Return non-nil if FILE could be registered in SVN.
 This is only possible if SVN is responsible for FILE's directory.")
 
-(defun vc-svn-checkin (files rev comment)
+(defun vc-svn-checkin (files rev comment &optional extra-args-ignored)
   "SVN-specific version of `vc-backend-checkin'."
   (if rev (error "Committing to a specific revision is unsupported in SVN"))
   (let ((status (apply