(vc-rcs-register): Fix handling of vc-[rcs-]register-switches.

(vc-rcs-checkin-switches, vc-rcs-checkout-switches): Removed, since
they weren't used yet.

diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index dfa33cc371ce17f7bacd96280762c04e5a0a2ddf..58e34bf5abdba84460e6d5934c0f9cecd669a512 100644 (file)
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc-rcs.el,v 1.22 2002/01/05 17:21:06 spiegel Exp $
+;; $Id: vc-rcs.el,v 1.23 2002/02/25 22:04:29 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -58,28 +58,6 @@ by \\[vc-rcs-register]."
   :version "21.1"
   :group 'vc)
 
-(defcustom vc-rcs-checkin-switches nil
-  "*A string or list of strings specifying extra switches for RCS checkin.
-These are passed to the checkin program by \\[vc-rcs-checkin]."
-  :type '(choice (const :tag "None" nil)
-                (string :tag "Argument String")
-                (repeat :tag "Argument List"
-                        :value ("")
-                        string))
-  :version "21.1"
-  :group 'vc)
-
-(defcustom vc-rcs-checkout-switches nil
-  "*A string or list of strings specifying extra switches for RCS checkout.
-These are passed to the checkout program by \\[vc-rcs-checkout]."
-  :type '(choice (const :tag "None" nil)
-                (string :tag "Argument String")
-                (repeat :tag "Argument List"
-                        :value ("")
-                        string))
-  :version "21.1"
-  :group 'vc)
-
 (defcustom vc-rcs-diff-switches nil
   "*A string or list of strings specifying extra switches for rcsdiff under VC."
   :type '(choice (const :tag "None" nil)
@@ -254,7 +232,7 @@ the RCS command (in that order).
 Automatically retrieve a read-only version of the file with keywords
 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
     (let ((subdir (expand-file-name "RCS" (file-name-directory file)))
-         (switches (list
+         (switches (append
                     (if (stringp vc-register-switches)
                         (list vc-register-switches)
                       vc-register-switches)