Add custom groups for VC backends, for consistency with vc-bzr.

Callers changed. * vc/vc-arch.el (vc-arch): * vc/vc-cvs.el (vc-cvs): * vc/vc-git.el (vc-git): * vc/vc-hg.el (vc-hg): * vc/vc-mtn.el (vc-mtn): * vc/vc-rcs.el (vc-rcs): * vc/vc-sccs.el (vc-sccs): * vc/vc-svn.el (vc-svn): New customization group. Fixes: debbugs:10871
2025-01-01 11:14:55 +00:00 · 2012-02-25 12:29:09 +08:00 · 2012-02-25 12:29:09 +08:00 · 67b0de1147
commit 67b0de1147
parent 4963495d7e
10 changed files with 91 additions and 37 deletions
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@ -1,3 +1,17 @@
+2012-02-25  Chong Yidong  <cyd@gnu.org>
+
+	Add custom groups for VC backends, for consistency with vc-bzr.
+
+	* vc/vc-arch.el (vc-arch):
+	* vc/vc-cvs.el (vc-cvs):
+	* vc/vc-git.el (vc-git):
+	* vc/vc-hg.el (vc-hg):
+	* vc/vc-mtn.el (vc-mtn):
+	* vc/vc-rcs.el (vc-rcs):
+	* vc/vc-sccs.el (vc-sccs):
+	* vc/vc-svn.el (vc-svn): New customization group (Bug#10871).
+	All relevant defcustoms reassigned.
+
 2012-02-25  Chong Yidong  <cyd@gnu.org>

 	* newcomment.el (comment-styles): Add autoload (Bug#10868).
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@ -65,6 +65,11 @@
 ;;; Customization options
 ;;;

+(defgroup vc-arch nil
+  "VC Arch backend."
+  :version "24.1"
+  :group 'vc)
+
 ;; It seems Arch diff does not accept many options, so this is not
 ;; very useful.  It exists mainly so that the VC backends are all
 ;; consistent with regards to their treatment of diff switches.
@ -76,7 +81,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "23.1"
-  :group 'vc)
+  :group 'vc-arch)

 (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1")

@ -87,7 +92,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
    (or (car candidates) "tla"))
  "Name of the Arch executable."
  :type 'string
-  :group 'vc)
+  :group 'vc-arch)

 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@ -377,7 +382,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
  '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]"))
  "Rewrite rules to shorten Arch's revision names on the mode-line."
  :type '(repeat (cons regexp string))
-  :group 'vc)
+  :group 'vc-arch)

 (defun vc-arch-mode-line-string (file)
  "Return string for placement in modeline by `vc-mode-line' for FILE."
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@ -56,7 +56,7 @@
 (put 'Bzr 'vc-functions nil)

 (defgroup vc-bzr nil
-  "VC bzr backend."
+  "VC Bazaar (bzr) backend."
  :version "22.2"
  :group 'vc)

--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@ -59,6 +59,11 @@
 ;;; Customization options
 ;;;

+(defgroup vc-cvs nil
+  "VC CVS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-cvs-global-switches nil
  "Global switches to pass to any CVS command."
  :type '(choice (const :tag "None" nil)
@ -67,7 +72,7 @@
 			 :value ("")
 			 string))
  :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-register-switches nil
  "Switches for registering a file into CVS.
@ -79,7 +84,7 @@ If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-diff-switches nil
  "String or list of strings specifying switches for CVS diff under VC.
@ -89,13 +94,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-header '("\$Id\$")
  "Header keywords to be inserted by `vc-insert-headers'."
  :version "24.1"     ; no longer consult the obsolete vc-header-alist
  :type '(repeat string)
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-use-edit t
  "Non-nil means to use `cvs edit' to \"check out\" a file.
@ -103,7 +108,7 @@ This is only meaningful if you don't use the implicit checkout model
 \(i.e. if you have $CVSREAD set)."
  :type 'boolean
  :version "21.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-stay-local 'only-file
  "Non-nil means use local operations when possible for remote repositories.
@ -131,7 +136,7 @@ by these regular expressions."
                               :tag "if it matches")
                       (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
  :version "23.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-sticky-date-format-string "%c"
  "Format string for mode-line display of sticky date.
@ -139,7 +144,7 @@ Format is according to `format-time-string'.  Only used if
 `vc-cvs-sticky-tag-display' is t."
  :type '(string)
  :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)

 (defcustom vc-cvs-sticky-tag-display t
  "Specify the mode-line display of sticky tags.
@ -178,7 +183,7 @@ displayed.  Date and time is displayed for sticky dates.
 See also variable `vc-cvs-sticky-date-format-string'."
  :type '(choice boolean function)
  :version "22.1"
-  :group 'vc)
+  :group 'vc-cvs)

 ;;;
 ;;; Internal variables
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@ -109,6 +109,11 @@
  (require 'vc-dir)
  (require 'grep))

+(defgroup vc-git nil
+  "VC Git backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-git-diff-switches t
  "String or list of strings specifying switches for Git diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@ -117,13 +122,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "23.1"
-  :group 'vc)
+  :group 'vc-git)

 (defcustom vc-git-program "git"
  "Name of the Git executable (excluding any arguments)."
  :version "24.1"
  :type 'string
-  :group 'vc)
+  :group 'vc-git)

 (defcustom vc-git-root-log-format
  '("%d%h..: %an %ad %s"
@ -143,7 +148,7 @@ format string (which is passed to \"git log\" via the argument
 matching the resulting Git log output, and KEYWORDS is a list of
 `font-lock-keywords' for highlighting the Log View buffer."
  :type '(list string string (repeat sexp))
-  :group 'vc
+  :group 'vc-git
  :version "24.1")

 (defvar vc-git-commits-coding-system 'utf-8
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@ -116,13 +116,18 @@

 ;;; Customization options

+(defgroup vc-hg nil
+  "VC Mercurial (hg) backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-hg-global-switches nil
  "Global switches to pass to any Hg command."
  :type '(choice (const :tag "None" nil)
         (string :tag "Argument String")
         (repeat :tag "Argument List" :value ("") string))
  :version "22.2"
-  :group 'vc)
+  :group 'vc-hg)

 (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
  "String or list of strings specifying switches for Hg diff under VC.
@ -132,12 +137,12 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                 (string :tag "Argument String")
                 (repeat :tag "Argument List" :value ("") string))
  :version "23.1"
-  :group 'vc)
+  :group 'vc-hg)

 (defcustom vc-hg-program "hg"
  "Name of the Mercurial executable (excluding any arguments)."
  :type 'string
-  :group 'vc)
+  :group 'vc-hg)

 (defcustom vc-hg-root-log-format
  '("{rev}:{tags}: {author|person} {date|shortdate} {desc|firstline}\\n"
@ -153,7 +158,7 @@ REGEXP is a regular expression matching the resulting Mercurial
 output, and KEYWORDS is a list of `font-lock-keywords' for
 highlighting the Log View buffer."
  :type '(list string string (repeat sexp))
-  :group 'vc
+  :group 'vc-hg
  :version "24.1")


--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@ -34,6 +34,11 @@

 (eval-when-compile (require 'cl) (require 'vc))

+(defgroup vc-mtn nil
+  "VC Monotone (mtn) backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-mtn-diff-switches t
  "String or list of strings specifying switches for monotone diff under VC.
 If nil, use the value of `vc-diff-switches'.  If t, use no switches."
@ -42,13 +47,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "23.1"
-  :group 'vc)
+  :group 'vc-mtn)

 (define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1")
 (defcustom vc-mtn-program "mtn"
  "Name of the monotone executable."
  :type 'string
-  :group 'vc)
+  :group 'vc-mtn)

 ;; Clear up the cache to force vc-call to check again and discover
 ;; new functions when we reload this file.
@ -153,7 +158,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
  "Rewrite rules to shorten Mtn's revision names on the mode-line."
  :type '(repeat (cons regexp string))
  :version "22.2"
-  :group 'vc)
+  :group 'vc-mtn)

 (defun vc-mtn-mode-line-string (file)
  "Return string for placement in modeline by `vc-mode-line' for FILE."
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@ -41,13 +41,18 @@
  (require 'cl)
  (require 'vc))

+(defgroup vc-rcs nil
+  "VC RCS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-rcs-release nil
  "The release number of your RCS installation, as a string.
 If nil, VC itself computes this value when it is first needed."
  :type '(choice (const :tag "Auto" nil)
 		 (string :tag "Specified")
 		 (const :tag "Unknown" unknown))
-  :group 'vc)
+  :group 'vc-rcs)

 (defcustom vc-rcs-register-switches nil
  "Switches for registering a file in RCS.
@ -59,7 +64,7 @@ If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)

 (defcustom vc-rcs-diff-switches nil
  "String or list of strings specifying switches for RCS diff under VC.
@ -69,20 +74,20 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)

 (defcustom vc-rcs-header '("\$Id\$")
  "Header keywords to be inserted by `vc-insert-headers'."
  :type '(repeat string)
  :version "24.1"     ; no longer consult the obsolete vc-header-alist
-  :group 'vc)
+  :group 'vc-rcs)

 (defcustom vc-rcsdiff-knows-brief nil
  "Indicates whether rcsdiff understands the --brief option.
 The value is either `yes', `no', or nil.  If it is nil, VC tries
 to use --brief and sets this variable to remember whether it worked."
  :type '(choice (const :tag "Work out" nil) (const yes) (const no))
-  :group 'vc)
+  :group 'vc-rcs)

 ;;;###autoload
 (defcustom vc-rcs-master-templates
@ -95,7 +100,7 @@ For a description of possible values, see `vc-check-master-templates'."
 			 (choice string
 				 function)))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-rcs)


 ;;; Properties of the backend
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@ -47,6 +47,11 @@
 ;;   :type '(repeat directory)
 ;;   :group 'vc)

+(defgroup vc-sccs nil
+  "VC SCCS backend."
+  :version "24.1"
+  :group 'vc)
+
 (defcustom vc-sccs-register-switches nil
  "Switches for registering a file in SCCS.
 A string or list of strings passed to the checkin program by
@ -57,7 +62,7 @@ If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)

 (defcustom vc-sccs-diff-switches nil
  "String or list of strings specifying switches for SCCS diff under VC.
@ -67,13 +72,13 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)

 (defcustom vc-sccs-header '("%W%")
  "Header keywords to be inserted by `vc-insert-headers'."
  :type '(repeat string)
  :version "24.1"     ; no longer consult the obsolete vc-header-alist
-  :group 'vc)
+  :group 'vc-sccs)

 ;;;###autoload
 (defcustom vc-sccs-master-templates
@ -86,7 +91,7 @@ For a description of possible values, see `vc-check-master-templates'."
 			 (choice string
 				 function)))
  :version "21.1"
-  :group 'vc)
+  :group 'vc-sccs)


 ;;;
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@ -39,11 +39,16 @@
 ;;; Customization options
 ;;;

+(defgroup vc-svn nil
+  "VC Subversion (svn) backend."
+  :version "24.1"
+  :group 'vc)
+
 ;; FIXME there is also svnadmin.
 (defcustom vc-svn-program "svn"
  "Name of the SVN executable."
  :type 'string
-  :group 'vc)
+  :group 'vc-svn)

 (defcustom vc-svn-global-switches nil
  "Global switches to pass to any SVN command."
@ -53,7 +58,7 @@
 			 :value ("")
 			 string))
  :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)

 (defcustom vc-svn-register-switches nil
  "Switches for registering a file into SVN.
@ -65,7 +70,7 @@ If t, use no switches."
 		 (string :tag "Argument String")
 		 (repeat :tag "Argument List" :value ("") string))
  :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)

 (defcustom vc-svn-diff-switches
  t			   ;`svn' doesn't support common args like -c or -b.
@ -81,13 +86,13 @@ If you want to force an empty list of arguments, use t."
 			 :value ("")
 			 string))
  :version "22.1"
-  :group 'vc)
+  :group 'vc-svn)

 (defcustom vc-svn-header '("\$Id\$")
  "Header keywords to be inserted by `vc-insert-headers'."
  :version "24.1"     ; no longer consult the obsolete vc-header-alist
  :type '(repeat string)
-  :group 'vc)
+  :group 'vc-svn)

 ;; We want to autoload it for use by the autoloaded version of
 ;; vc-svn-registered, but we want the value to be compiled at startup, not