Mercurial > emacs
changeset 44004:68d54bdba97c
(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.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Mon, 18 Mar 2002 17:17:38 +0000 |
parents | afbab80cfab0 |
children | 0d10b436b5d5 |
files | lisp/vc-rcs.el |
diffstat | 1 files changed, 2 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-rcs.el Mon Mar 18 14:56:35 2002 +0000 +++ b/lisp/vc-rcs.el Mon Mar 18 17:17:38 2002 +0000 @@ -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 @@ :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 @@ 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)