Fix some custom groups

* lisp/vc/vc-hooks.el (vc-faces): Rename from vc-state-faces.
* lisp/vc/cvs-status.el (cvs-status): Unused, remove.

diff --git a/lisp/eshell/em-tramp.el b/lisp/eshell/em-tramp.el
index e322cea1e2196a10fdd42bf5f3688838a475bde5..e2da3468abad1508073b89998320669c3647b9fd 100644 (file)
--- a/lisp/eshell/em-tramp.el
+++ b/lisp/eshell/em-tramp.el
@@ -32,6 +32,8 @@
   (require 'eshell)
   (require 'tramp))
 
+;; There are no items in this custom group, but eshell modules (ab)use
+;; custom groups.
 ;;;###autoload
 (progn
  (defgroup eshell-tramp nil

diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 7b80f64d6296c1f225d5e6397635908dad77a21d..89814467d1fd32313c79f13721df95c726a0b106 100644 (file)
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -29,6 +29,8 @@
   (require 'pcomplete))
 (require 'compile)
 
+;; There are no items in this custom group, but eshell modules (ab)use
+;; custom groups.
 ;;;###autoload
 (progn
 (defgroup eshell-xtra nil

diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index 770791a3c0999c5f4ce1f9e8117c296e9f10090d..3124a61422b8d38cc59a235a05b8d3ebe65f97f4 100644 (file)
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -33,11 +33,6 @@
 
 ;;;
 
-(defgroup cvs-status nil
-  "Major mode for browsing `cvs status' output."
-  :group 'pcl-cvs
-  :prefix "cvs-status-")
-
 (easy-mmode-defmap cvs-status-mode-map
   '(("n"       . next-line)
     ("p"       . previous-line)

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 99c8211ad5ff8ca41fea476c89a983eb94cddc26..394b86c024b115f4e735ec2a54b74205961b4be7 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -34,9 +34,9 @@
 
 ;; Faces
 
-(defgroup vc-state-faces nil
+(defgroup vc-faces nil
   "Faces used in the mode line by the VC state indicator."
-  :group 'vc-faces
+  :group 'vc
   :group 'mode-line
   :version "25.1")