aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Spiegel2002-03-18 17:17:38 +0000
committerAndré Spiegel2002-03-18 17:17:38 +0000
commitc9a1f2af3d237e0ae14eb9133bfe01baf370e2f0 (patch)
treeee37baf14f0dfd2ce862f7af34b95abec00feb66
parent194c8d989a246930f9f672521ff0cd1c449e65da (diff)
downloademacs-c9a1f2af3d237e0ae14eb9133bfe01baf370e2f0.tar.gz
emacs-c9a1f2af3d237e0ae14eb9133bfe01baf370e2f0.zip
(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.
-rw-r--r--lisp/vc-rcs.el26
1 files changed, 2 insertions, 24 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index dfa33cc371c..58e34bf5abd 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -5,7 +5,7 @@
5;; Author: FSF (see vc.el for full credits) 5;; Author: FSF (see vc.el for full credits)
6;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7 7
8;; $Id: vc-rcs.el,v 1.22 2002/01/05 17:21:06 spiegel Exp $ 8;; $Id: vc-rcs.el,v 1.23 2002/02/25 22:04:29 spiegel Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -58,28 +58,6 @@ by \\[vc-rcs-register]."
58 :version "21.1" 58 :version "21.1"
59 :group 'vc) 59 :group 'vc)
60 60
61(defcustom vc-rcs-checkin-switches nil
62 "*A string or list of strings specifying extra switches for RCS checkin.
63These are passed to the checkin program by \\[vc-rcs-checkin]."
64 :type '(choice (const :tag "None" nil)
65 (string :tag "Argument String")
66 (repeat :tag "Argument List"
67 :value ("")
68 string))
69 :version "21.1"
70 :group 'vc)
71
72(defcustom vc-rcs-checkout-switches nil
73 "*A string or list of strings specifying extra switches for RCS checkout.
74These are passed to the checkout program by \\[vc-rcs-checkout]."
75 :type '(choice (const :tag "None" nil)
76 (string :tag "Argument String")
77 (repeat :tag "Argument List"
78 :value ("")
79 string))
80 :version "21.1"
81 :group 'vc)
82
83(defcustom vc-rcs-diff-switches nil 61(defcustom vc-rcs-diff-switches nil
84 "*A string or list of strings specifying extra switches for rcsdiff under VC." 62 "*A string or list of strings specifying extra switches for rcsdiff under VC."
85 :type '(choice (const :tag "None" nil) 63 :type '(choice (const :tag "None" nil)
@@ -254,7 +232,7 @@ the RCS command (in that order).
254Automatically retrieve a read-only version of the file with keywords 232Automatically retrieve a read-only version of the file with keywords
255expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." 233expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
256 (let ((subdir (expand-file-name "RCS" (file-name-directory file))) 234 (let ((subdir (expand-file-name "RCS" (file-name-directory file)))
257 (switches (list 235 (switches (append
258 (if (stringp vc-register-switches) 236 (if (stringp vc-register-switches)
259 (list vc-register-switches) 237 (list vc-register-switches)
260 vc-register-switches) 238 vc-register-switches)