From ed8be7ff74614e2514275f18e166905814963fdd Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 15 May 2013 19:55:41 -0400
Subject: [PATCH] Misc custom group fixes

* cus-start.el (show-trailing-whitespace): Move to editing basics.
* faces.el (trailing-whitespace): Don't use whitespace-faces group.
* obsolete/old-whitespace.el (whitespace-faces): Remove group.
(whitespace-highlight): Move to whitespace group.

* comint.el (comint-source):
* pcmpl-linux.el (pcmpl-linux):
* shell.el (shell-faces):
* eshell/esh-opt.el (eshell-opt):
* international/ccl.el (ccl): Remove empty custom groups.

* completion.el (dynamic-completion-mode):
* jit-lock.el (jit-lock-debug-mode):
* minibuffer.el (completion-in-region-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* emulation/tpu-edt.el (tpu-edt-mode):
* progmodes/subword.el (global-subword-mode, global-superword-mode):
* progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode):
* term/vt100.el (vt100-wide-mode): Specify explicit :group.

* term/xterm.el (xterm): Change parent group to terminals.

* master.el (master): Remove empty custom group.
(master-mode): Remove unused :group argument.
* textmodes/refill.el (refill): Remove empty custom group.
(refill-mode): Remove unused :group argument.

* textmodes/rst.el (rst-compile-toolsets): Use rst-compile group.

* cedet/semantic/symref/list.el (semantic-symref-auto-expand-results)
(semantic-symref-results-mode-hook)
(semantic-symref-results-summary-function): Fix :group.

* erc/erc-list.el (erc-list):
* erc/erc-menu.el (erc-menu):
* erc/erc-ring.el (erc-ring): Define custom groups, for define-erc-module.

* gnus/shr-color.el (shr-color-visible-luminance-min)
(shr-color-visible-distance-min): Use shr-color group.

* url/url-news.el (url-news): Remove empty custom group.
---
 lisp/ChangeLog                     | 30 ++++++++++++++++++++++++++++++
 lisp/cedet/ChangeLog               |  6 ++++++
 lisp/cedet/semantic/symref/list.el |  6 +++---
 lisp/comint.el                     |  9 +++++----
 lisp/completion.el                 |  1 +
 lisp/cus-start.el                  |  3 ++-
 lisp/emulation/tpu-edt.el          |  2 +-
 lisp/erc/ChangeLog                 |  8 ++++++++
 lisp/erc/erc-list.el               |  6 ++++++
 lisp/erc/erc-menu.el               |  4 ++++
 lisp/erc/erc-ring.el               |  4 ++++
 lisp/eshell/esh-opt.el             | 11 ++++++-----
 lisp/faces.el                      |  1 -
 lisp/gnus/ChangeLog                |  5 +++++
 lisp/gnus/shr-color.el             |  4 ++--
 lisp/international/ccl.el          |  9 +++++----
 lisp/jit-lock.el                   |  2 +-
 lisp/master.el                     | 12 +++++++-----
 lisp/minibuffer.el                 |  1 +
 lisp/obsolete/old-whitespace.el    |  8 +-------
 lisp/org/org-pcomplete.el          |  1 +
 lisp/pcmpl-linux.el                |  7 ++++---
 lisp/progmodes/subword.el          |  2 ++
 lisp/progmodes/vhdl-mode.el        |  4 ++--
 lisp/shell.el                      |  7 ++++---
 lisp/term/vt100.el                 |  1 +
 lisp/term/xterm.el                 |  2 +-
 lisp/textmodes/refill.el           | 10 ++++++----
 lisp/textmodes/rst.el              |  2 +-
 lisp/type-break.el                 |  4 ++--
 lisp/url/ChangeLog                 |  4 ++++
 lisp/url/url-news.el               |  7 ++++---
 32 files changed, 130 insertions(+), 53 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 048b9586923..c579642642e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,35 @@
 2013-05-15  Glenn Morris  <rgm@gnu.org>
 
+	* cus-start.el (show-trailing-whitespace): Move to editing basics.
+	* faces.el (trailing-whitespace): Don't use whitespace-faces group.
+	* obsolete/old-whitespace.el (whitespace-faces): Remove group.
+	(whitespace-highlight): Move to whitespace group.
+
+	* comint.el (comint-source):
+	* pcmpl-linux.el (pcmpl-linux):
+	* shell.el (shell-faces):
+	* eshell/esh-opt.el (eshell-opt):
+	* international/ccl.el (ccl): Remove empty custom groups.
+
+	* completion.el (dynamic-completion-mode):
+	* jit-lock.el (jit-lock-debug-mode):
+	* minibuffer.el (completion-in-region-mode):
+	* type-break.el (type-break-mode-line-message-mode)
+	(type-break-query-mode):
+	* emulation/tpu-edt.el (tpu-edt-mode):
+	* progmodes/subword.el (global-subword-mode, global-superword-mode):
+	* progmodes/vhdl-mode.el (vhdl-electric-mode, vhdl-stutter-mode):
+	* term/vt100.el (vt100-wide-mode): Specify explicit :group.
+
+	* term/xterm.el (xterm): Change parent group to terminals.
+
+	* master.el (master): Remove empty custom group.
+	(master-mode): Remove unused :group argument.
+	* textmodes/refill.el (refill): Remove empty custom group.
+	(refill-mode): Remove unused :group argument.
+
+	* textmodes/rst.el (rst-compile-toolsets): Use rst-compile group.
+
 	* cus-dep.el: Provide a feature.
 	(custom-make-dependencies): Ignore dotfiles (dir-locals).
 	Don't mistakenly ignore files whose basenames match a basename
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 6d62e92bb76..0474559fe9e 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-15  Glenn Morris  <rgm@gnu.org>
+
+	* semantic/symref/list.el (semantic-symref-auto-expand-results)
+	(semantic-symref-results-mode-hook)
+	(semantic-symref-results-summary-function): Fix :group.
+
 2013-05-14  Glenn Morris  <rgm@gnu.org>
 
 	* ede/simple.el, semantic/java.el: Set generated-autoload-load-name.
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 2391e59e1f4..c1f0a092afc 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -178,12 +178,12 @@ Display the references in`semantic-symref-results-mode'."
 
 (defcustom semantic-symref-auto-expand-results nil
   "Non-nil to expand symref results on buffer creation."
-  :group 'semantic-symref
+  :group 'semantic-symref-results-mode
   :type 'boolean)
 
 (defcustom semantic-symref-results-mode-hook nil
   "Hook run when `semantic-symref-results-mode' starts."
-  :group 'semantic-symref
+  :group 'semantic-symref-results-mode
   :type 'hook)
 
 (defvar semantic-symref-current-results nil
@@ -217,7 +217,7 @@ RESULTS is an object of class `semantic-symref-results'."
 (defcustom semantic-symref-results-summary-function 'semantic-format-tag-prototype
   "*Function to use when creating items in Imenu.
 Some useful functions are found in `semantic-format-tag-functions'."
-  :group 'semantic-symref
+  :group 'semantic-symref-results-mode
   :type semantic-format-tag-custom-list)
 
 (defun semantic-symref-results-dump (results)
diff --git a/lisp/comint.el b/lisp/comint.el
index c796f4fda31..956e8f86ccb 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -148,10 +148,11 @@
   "Completion facilities in comint."
   :group 'comint)
 
-(defgroup comint-source nil
-  "Source finding facilities in comint."
-  :prefix "comint-"
-  :group 'comint)
+;; Unused.
+;;; (defgroup comint-source nil
+;;;   "Source finding facilities in comint."
+;;;   :prefix "comint-"
+;;;   :group 'comint)
 
 (defvar comint-prompt-regexp "^"
   "Regexp to recognize prompts in the inferior process.
diff --git a/lisp/completion.el b/lisp/completion.el
index 974d59c9af5..3fbc3c05fb4 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -2342,6 +2342,7 @@ With a prefix argument ARG, enable the mode if ARG is positive,
 and disable it otherwise.  If called from Lisp, enable the mode
 if ARG is omitted or nil."
   :global t
+  :group 'completion
   ;; This is always good, not specific to dynamic-completion-mode.
   (define-key function-key-map [C-return] [?\C-\r])
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 43d71ceec95..cf94b6300dd 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -449,7 +449,8 @@ since it could result in memory overflow and make Emacs crash."
 		       (other :tag "Always (t)" :value t))
 	      "24.3")
 	     ;; xdisp.c
-	     (show-trailing-whitespace whitespace-faces boolean nil
+	     ;; The whitespace group is for whitespace.el.
+	     (show-trailing-whitespace editing-basics boolean nil
 				       :safe booleanp)
 	     (scroll-step windows integer)
 	     (scroll-conservatively windows integer)
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 6ec6ad810a4..1ec0ecc943c 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -983,7 +983,7 @@ and the total number of lines in the buffer."
 With a prefix argument ARG, enable the mode if ARG is positive,
 and disable it otherwise.  If called from Lisp, enable the mode
 if ARG is omitted or nil."
-  :global t
+  :global t :group 'tpu
   (if tpu-edt-mode (tpu-edt-on) (tpu-edt-off)))
 
 (defalias 'TPU-EDT-MODE 'tpu-edt-mode)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f2c1dbe2367..f4293c8f083 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-15  Glenn Morris  <rgm@gnu.org>
+
+	* erc-list.el (erc-list):
+	* erc-menu.el (erc-menu):
+	* erc-ring.el (erc-ring): Define custom groups, for define-erc-module.
+
+	* erc-list.el: Provide a feature.
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
 	* erc-desktop-notifications.el (erc-notifications-icon):
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 3d78c1b7b9f..f11dd98ca37 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -30,6 +30,10 @@
 
 (require 'erc)
 
+(defgroup erc-list nil
+  "Support for the /list command."
+  :group 'erc)
+
 ;; This is implicitly the width of the channel name column.  Pick
 ;; something small enough that the topic has a chance of being
 ;; readable, but long enough that most channel names won't make for
@@ -214,6 +218,8 @@ to RFC and send the LIST header (#321) at start of list transmission."
 					""))))
 (put 'erc-cmd-LIST 'do-not-parse-args t)
 
+(provide 'erc-list)
+
 ;;; erc-list.el ends here
 ;;
 ;; Local Variables:
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index 70c9ae65427..ab11df92063 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -30,6 +30,10 @@
 (require 'erc)
 (require 'easymenu)
 
+(defgroup erc-menu nil
+  "ERC menu support."
+  :group 'erc)
+
 (defvar erc-menu-definition
   (list "ERC"
 	["Connect to server..." erc t]
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index ac5aaf23bc3..b4244eaa4a6 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -38,6 +38,10 @@
 (require 'comint)
 (require 'ring)
 
+(defgroup erc-ring nil
+  "An input ring for ERC."
+  :group 'erc)
+
 ;;;###autoload (autoload 'erc-ring-mode "erc-ring" nil t)
 (define-erc-module ring nil
   "Stores input in a ring so that previous commands and messages can
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index 6044759f8df..6a37f97bf20 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -27,11 +27,12 @@
 
 (eval-when-compile (require 'esh-ext))
 
-(defgroup eshell-opt nil
-  "The options processing code handles command argument parsing for
-Eshell commands implemented in Lisp."
-  :tag "Command options processing"
-  :group 'eshell)
+;; Unused.
+;;; (defgroup eshell-opt nil
+;;;   "The options processing code handles command argument parsing for
+;;; Eshell commands implemented in Lisp."
+;;;   :tag "Command options processing"
+;;;   :group 'eshell)
 
 ;;; User Functions:
 
diff --git a/lisp/faces.el b/lisp/faces.el
index 6b4441e2814..d570140e7e6 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2292,7 +2292,6 @@ terminal type to a different value."
     (t :inverse-video t))
   "Basic face for highlighting trailing whitespace."
   :version "21.1"
-  :group 'whitespace-faces	; like `show-trailing-whitespace'
   :group 'basic-faces)
 
 (defface escape-glyph
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index fba0cd8fea7..1c76a179afd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-15  Glenn Morris  <rgm@gnu.org>
+
+	* shr-color.el (shr-color-visible-luminance-min)
+	(shr-color-visible-distance-min): Use shr-color group.
+
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-vm.el: Make it loadable without VM.
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index 0b320a21ad9..21f1fc4f004 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -36,14 +36,14 @@
 (defcustom shr-color-visible-luminance-min 40
   "Minimum luminance distance between two colors to be considered visible.
 Must be between 0 and 100."
-  :group 'shr
+  :group 'shr-color
   :type 'number)
 
 (defcustom shr-color-visible-distance-min 5
   "Minimum color distance between two colors to be considered visible.
 This value is used to compare result for `ciede2000'.  It's an
 absolute value without any unit."
-  :group 'shr
+  :group 'shr-color
   :type 'integer)
 
 (defconst shr-color-html-colors-alist
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 39f2b79587b..7b79a1dd1f9 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -43,10 +43,11 @@
 
 ;;; Code:
 
-(defgroup ccl nil
-  "CCL (Code Conversion Language) compiler."
-  :prefix "ccl-"
-  :group 'i18n)
+;; Unused.
+;;; (defgroup ccl nil
+;;;   "CCL (Code Conversion Language) compiler."
+;;;   :prefix "ccl-"
+;;;   :group 'i18n)
 
 (defconst ccl-command-table
   [if branch loop break repeat write-repeat write-read-repeat
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 9359a65a1b8..9d700a5ed82 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -258,7 +258,7 @@ the variable `jit-lock-stealth-nice'."
 When this minor mode is enabled, jit-lock runs as little code as possible
 during redisplay and moves the rest to a timer, where things
 like `debug-on-error' and Edebug can be used."
-  :global t
+  :global t :group 'jit-lock
   (when jit-lock-defer-timer
     (cancel-timer jit-lock-defer-timer)
     (setq jit-lock-defer-timer nil))
diff --git a/lisp/master.el b/lisp/master.el
index 368bb0d58d5..4a536ca5cda 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -53,10 +53,11 @@
 
 ;;; Code:
 
-(defgroup master nil
-  "Support for master/slave relationships between buffers."
-  :version "22.1"
-  :group 'convenience)
+;; Unused.
+;;; (defgroup master nil
+;;;   "Support for master/slave relationships between buffers."
+;;;   :version "22.1"
+;;;   :group 'convenience)
 
 ;; Variables that don't need initialization.
 
@@ -84,7 +85,8 @@ using the following commands:
 The slave buffer is stored in the buffer-local variable `master-of'.
 You can set this variable using `master-set-slave'.  You can show
 yourself the value of `master-of' by calling `master-show-slave'."
-  :group 'master
+  ;; Not global, so no effect.
+;;;  :group 'master
   :keymap
   '(("\C-c\C-n" . master-says-scroll-up)
     ("\C-c\C-p" . master-says-scroll-down)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index ef949f7482e..a5d79a415f6 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1856,6 +1856,7 @@ With a prefix argument ARG, enable the modemode if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
 the mode if ARG is omitted or nil."
   :global t
+  :group 'minibuffer
   (setq completion-in-region--data nil)
   ;; (remove-hook 'pre-command-hook #'completion-in-region--prech)
   (remove-hook 'post-command-hook #'completion-in-region--postch)
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index c421836dd84..359c22c50ea 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -288,12 +288,6 @@ To disable timer scans, set this to zero."
   :type 'boolean
   :group 'whitespace)
 
-(defgroup whitespace-faces nil
-  "Faces used in whitespace."
-  :prefix "whitespace-"
-  :group 'whitespace
-  :group 'faces)
-
 (defface whitespace-highlight '((((class color) (background light))
 				 (:background "green1"))
 				(((class color) (background dark))
@@ -305,7 +299,7 @@ To disable timer scans, set this to zero."
 				  (background dark))
 				 (:background "white")))
   "Face used for highlighting the bogus whitespaces that exist in the buffer."
-  :group 'whitespace-faces)
+  :group 'whitespace)
 (define-obsolete-face-alias 'whitespace-highlight-face
   'whitespace-highlight "22.1")
 
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index e2b5dd9fb3b..7ae80b02e2f 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -46,6 +46,7 @@
 
 ;;;; Customization variables
 
+;; Unused.  Cf org-completion.
 (defgroup org-complete nil
   "Outline-based notes management and organizer."
   :tag "Org"
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 7e7bfe28713..a946f0885ac 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -31,9 +31,10 @@
 
 (require 'pcomplete)
 
-(defgroup pcmpl-linux nil
-  "Functions for dealing with GNU/Linux completions."
-  :group 'pcomplete)
+;; Unused.
+;;; (defgroup pcmpl-linux nil
+;;;   "Functions for dealing with GNU/Linux completions."
+;;;   :group 'pcomplete)
 
 ;; Functions:
 
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 6cb4713885e..256695acc9f 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -148,6 +148,7 @@ as words.
 
 ;;;###autoload
 (define-global-minor-mode global-subword-mode subword-mode
+  :group 'convenience
   (lambda () (subword-mode 1)))
 
 (defun subword-forward (&optional arg)
@@ -301,6 +302,7 @@ edit them as words.
 
 ;;;###autoload
 (define-global-minor-mode global-superword-mode superword-mode
+  :group 'convenience
   (lambda () (superword-mode 1)))
 
 
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 1a7ecb5ef87..4bb388d4405 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -8327,14 +8327,14 @@ project is defined."
 With a prefix argument ARG, enable the mode if ARG is positive,
 and disable it otherwise.  If called from Lisp, enable it if ARG
 is omitted or nil."
-  :global t)
+  :global t :group 'vhdl-mode)
 
 (define-minor-mode vhdl-stutter-mode
   "Toggle VHDL stuttering mode.
 With a prefix argument ARG, enable the mode if ARG is positive,
 and disable it otherwise.  If called from Lisp, enable it if ARG
 is omitted or nil."
-  :global t)
+  :global t :group 'vhdl-mode)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Stuttering
diff --git a/lisp/shell.el b/lisp/shell.el
index d09d7aee43f..51a0ffc4fe8 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -111,9 +111,10 @@
   "Directory support in shell mode."
   :group 'shell)
 
-(defgroup shell-faces nil
-  "Faces in shell buffers."
-  :group 'shell)
+;; Unused.
+;;; (defgroup shell-faces nil
+;;;   "Faces in shell buffers."
+;;;   :group 'shell)
 
 ;;;###autoload
 (defcustom shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe")
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 782924086df..2453f479eda 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -46,6 +46,7 @@ With a prefix argument ARG, switch to 132-column mode if ARG is
 positive, and 80-column mode otherwise.  If called from Lisp,
 switch to 132-column mode if ARG is omitted or nil."
   :global t :init-value (= (frame-width) 132)
+  :group 'terminals
   (send-string-to-terminal (if vt100-wide-mode "\e[?3h" "\e[?3l"))
   (set-frame-width terminal-frame (if vt100-wide-mode 132 80)))
 
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index da437c178b6..05a129225ee 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -27,7 +27,7 @@
 (defgroup xterm nil
   "XTerm support."
   :version "24.1"
-  :group 'environment)
+  :group 'terminals)
 
 (defcustom xterm-extra-capabilities 'check
   "Whether Xterm supports some additional, more modern, features.
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index f6a2c7eca05..ebbc6ee0afb 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -83,9 +83,10 @@
 
 ;;; Code:
 
-(defgroup refill nil
-  "Refilling paragraphs on changes."
-  :group 'fill)
+;; Unused.
+;;; (defgroup refill nil
+;;;   "Refilling paragraphs on changes."
+;;;   :group 'fill)
 
 (defvar refill-ignorable-overlay nil
   "Portion of the most recently filled paragraph not needing filling.
@@ -222,7 +223,8 @@ characters only cause refilling if they would cause
 auto-filling.
 
 For true \"word wrap\" behavior, use `visual-line-mode' instead."
-  :group 'refill
+  ;; Not global, so no effect.
+;;;  :group 'refill
   :lighter " Refill"
   :keymap '(("\177" . backward-delete-char-untabify))
   ;; Remove old state if necessary
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index b3503c6c982..01981175e1d 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -3932,7 +3932,7 @@ string)) to be used for converting the document."
                              (choice :tag "Command options"
                                      (const :tag "No options" nil)
                                      (string :tag "Options"))))
-  :group 'rst
+  :group 'rst-compile
   :package-version "1.2.0")
 (rst-testcover-defcustom)
 
diff --git a/lisp/type-break.el b/lisp/type-break.el
index e4fa02f9fe6..b4e4be31955 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -418,7 +418,7 @@ Variables controlling the display of messages in the mode line include:
         `global-mode-string'
         `type-break-mode-line-break-message'
         `type-break-mode-line-warning'"
-  :global t)
+  :global t :group 'type-break)
 
 (define-minor-mode type-break-query-mode
   "Toggle typing break queries.
@@ -428,7 +428,7 @@ enable them if ARG is omitted or nil.
 
 The user may also enable or disable this mode simply by setting
 the variable of the same name."
-  :global t)
+  :global t :group 'type-break)
 
 
 ;;; session file functions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index f8f24de6b68..4c63c548f79 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15  Glenn Morris  <rgm@gnu.org>
+
+	* url-news.el (url-news): Remove empty custom group.
+
 2013-02-16  Glenn Morris  <rgm@gnu.org>
 
 	* url-http.el (url-http-wait-for-headers-change-function):
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 391974d79f8..d4532626183 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -28,9 +28,10 @@
 (autoload 'url-warn "url")
 (autoload 'gnus-group-read-ephemeral-group "gnus-group")
 
-(defgroup url-news nil
-  "News related options."
-  :group 'url)
+;; Unused.
+;;; (defgroup url-news nil
+;;;   "News related options."
+;;;   :group 'url)
 
 (defun url-news-open-host (host port user pass)
   (if (fboundp 'nnheader-init-server-buffer)
-- 
2.39.2