From ff90f4b003b3de7b053ad9ab4e16cc8cf81917c0 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 16 Feb 2010 09:35:45 -0500
Subject: [PATCH] Minor tweaks to custom groups.

* cus-edit.el (hardware): Doc fix.

* man.el (man): Add to external custom group.

* delim-col.el (columns): Move to wp custom group.

* doc-view.el (doc-view): Add to data custom group.

* cedet/data-debug.el (data-debug): Move to extensions group.

* cedet/ede.el (ede):
* cedet/srecode.el (srecode):
* cedet/semantic.el (semantic): Put in tools and extensions group.

* nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces group.
---
 lisp/ChangeLog           | 17 +++++++++++++++++
 lisp/cedet/data-debug.el |  2 +-
 lisp/cedet/ede.el        |  5 ++---
 lisp/cedet/semantic.el   |  2 +-
 lisp/cedet/srecode.el    |  1 +
 lisp/cus-edit.el         |  2 +-
 lisp/delim-col.el        |  2 +-
 lisp/doc-view.el         |  1 +
 lisp/man.el              |  2 +-
 lisp/nxml/nxml-mode.el   |  3 +--
 10 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92ae206d104..33d844512de 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,22 @@
 2010-02-16  Chong Yidong  <cyd@stupidchicken.com>
 
+	* cus-edit.el (hardware): Doc fix.
+
+	* man.el (man): Add to external custom group.
+
+	* delim-col.el (columns): Move to wp custom group.
+
+	* doc-view.el (doc-view): Add to data custom group.
+
+	* cedet/data-debug.el (data-debug): Move to extensions group.
+
+	* cedet/ede.el (ede):
+	* cedet/srecode.el (srecode):
+	* cedet/semantic.el (semantic): Put in tools and extensions group.
+
+	* nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces
+	group.
+
 	* textmodes/flyspell.el (flyspell-word): Obey the offset specified
 	by ispell-parse-output (Bug#5575).
 
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 5fa32ecca3e..ed8441d2df0 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -842,7 +842,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing."
 ;;
 (defgroup data-debug nil
   "data-debug group."
-  :group 'languages)
+  :group 'extensions)
 
 (defvar data-debug-mode-syntax-table
   (let ((table (make-syntax-table (standard-syntax-table))))
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 096ed04ea80..46fcdb000f8 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -69,10 +69,9 @@
   (interactive) (message "EDE %s" ede-version))
 
 (defgroup ede nil
-  "Emacs Development Environment gloss."
+  "Emacs Development Environment."
   :group 'tools
-  :group 'convenience
-  )
+  :group 'extensions)
 
 (defcustom ede-auto-add-method 'ask
   "Whether a new source file should be automatically added to a target.
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index b7d5f700d78..14b196bbe22 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -63,7 +63,7 @@ introduced."
 
 (defgroup semantic nil
   "Parser Generator and parser framework."
-  :group 'lisp)
+  :group 'tools)
 
 (defgroup semantic-faces nil
   "Faces used for Semantic enabled tools."
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 5f19327f59e..a903ffd0af1 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -46,6 +46,7 @@
 ;;; Code:
 (defgroup srecode nil
   "Semantic Recoder."
+  :group 'extensions
   :group 'tools)
 
 (provide 'srecode)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6353894d6e8..b815e31f31c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -281,7 +281,7 @@
   :group 'environment)
 
 (defgroup hardware nil
-  "Support for interfacing with exotic hardware."
+  "Support for interfacing with miscellaneous hardware."
   :group 'environment)
 
 (defgroup terminals nil
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 945231246c3..d0c1223c558 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -126,7 +126,7 @@
   "Prettify columns."
   :link '(emacs-library-link :tag "Source Lisp File" "delim-col.el")
   :prefix "delimit-columns-"
-  :group 'internal)
+  :group 'wp)
 
 (defcustom delimit-columns-str-before ""
   "Specify a string to be inserted before all columns."
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 77a075b716f..528d5979ce1 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -144,6 +144,7 @@
   :link '(function-link doc-view)
   :version "22.2"
   :group 'applications
+  :group 'data
   :group 'multimedia
   :prefix "doc-view-")
 
diff --git a/lisp/man.el b/lisp/man.el
index a92caf49ec1..d64846a2d4d 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -98,9 +98,9 @@
 (defgroup man nil
   "Browse UNIX manual pages."
   :prefix "Man-"
+  :group 'external
   :group 'help)
 
-
 (defvar Man-notify)
 (defcustom Man-filter-list nil
   "Manpage cleaning filter command phrases.
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8bcde7a3a22..8919d920c9d 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -50,8 +50,7 @@
 
 (defgroup nxml-faces nil
   "Faces for XML syntax highlighting."
-  :group 'nxml
-  :group 'font-lock-faces)
+  :group 'nxml)
 
 (defcustom nxml-char-ref-display-glyph-flag t
   "*Non-nil means display glyph following character reference.