28 files changed, 81 insertions, 42 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b46aeb4d43..4ea3fcfbc8f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,46 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+	* cus-edit.el (processes): Remove from development group.
+	(oop, hypermedia): Delete group.
+	(net): New group.
+
+	* net/browse-url.el (browse-url):
+	* net/xesam.el (xesam):
+	* net/tramp.el (tramp):
+	* net/goto-addr.el (goto-address):
+	* net/ange-ftp.el (ange-ftp): Put in net group.
+
+	* view.el (view): Remove from editing group.
+
+	* uniquify.el (uniquify): Put in files group.
+
+	* net/browse-url.el (browse-url):
+	* ps-print.el (postscript): Put in external group.
+
+	* cus-edit.el (outlines):
+	* textmodes/text-mode.el (text-mode-hook):
+	* textmodes/table.el (table):
+	* textmodes/picture.el (picture):
+	* outline.el (outlines): Put in wp group.
+
+	* nxml/nxml-mode.el (nxml): Remove from wp group.
+
+	* net/tramp-imap.el (tramp-imap): Put in tramp group.
+
+	* mail/metamail.el (metamail): Remove from hypermedia group.
+
+	* cus-edit.el (abbrev):
+	* whitespace.el (whitespace):
+	* vcursor.el (vcursor):
+	* reveal.el (reveal):
+	* hl-line.el (hl-line): Put in convenience group.
+
+	* epg-config.el (epg): Put in data group.
+
+	* emulation/pc-select.el (pc-select): Put in emulations group.
+
+	* calculator.el (calculator): Put in applications group.
+
 2010-03-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Add .dir-locals.el support for file-less buffers.
diff --git a/lisp/calculator.el b/lisp/calculator.el
index d1b9b517e5f..a20efdbc122 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -54,7 +54,7 @@
   :prefix "calculator"
   :version "21.1"
   :group 'tools
-  :group 'convenience)
+  :group 'applications)
 
 (defcustom calculator-electric-mode nil
   "Run `calculator' electrically, in the echo area.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 851026929a7..47e0e0bdccd 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -169,7 +169,7 @@
 (defgroup abbrev nil
   "Abbreviation handling, typing shortcuts, macros."
   :tag "Abbreviations"
-  :group 'editing)
+  :group 'convenience)
 
 (defgroup matching nil
   "Various sorts of searching and matching."
@@ -186,16 +186,19 @@
 
 (defgroup outlines nil
   "Support for hierarchical outlining."
-  :group 'editing)
+  :group 'wp)
 
 (defgroup external nil
   "Interfacing to external utilities."
   :group 'emacs)
 
+(defgroup net nil
+  "Networking support."
+  :group 'emacs)
+
 (defgroup processes nil
   "Process, subshell, compilation, and job control support."
-  :group 'external
-  :group 'development)
+  :group 'external)
 
 (defgroup convenience nil
   "Convenience features for faster editing."
@@ -225,10 +228,6 @@
   "Programming tools."
   :group 'programming)
 
-(defgroup oop nil
-  "Support for object-oriented programming."
-  :group 'programming)
-
 (defgroup applications nil
   "Applications written in Emacs."
   :group 'emacs)
@@ -327,10 +326,6 @@
   "Support for multiple fonts."
   :group 'emacs)
 
-(defgroup hypermedia nil
-  "Support for links between text or other media types."
-  :group 'emacs)
-
 (defgroup help nil
   "Support for on-line help systems."
   :group 'emacs)
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 45c3840bdd2..175999b6e37 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -82,8 +82,7 @@
 (defgroup pc-select nil
   "Emulate pc bindings."
   :prefix "pc-select"
-  :group 'editing-basics
-  :group 'convenience)
+  :group 'emulations)
 
 (defcustom pc-select-override-scroll-error t
   "*Non-nil means don't generate error on scrolling past edge of buffer.
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 3cdf2ff3ffa..ddbdd3541ad 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -34,7 +34,7 @@
 (defgroup epg ()
   "The EasyPG library."
   :version "23.1"
-  :group 'emacs)
+  :group 'data)
 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1ce4f25af70..755ff696453 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -72,7 +72,7 @@
 (defgroup hl-line nil
   "Highlight the current line."
   :version "21.1"
-  :group 'editing)
+  :group 'convenience)
 
 (defface hl-line
   '((t :inherit highlight))
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 64c7c57f8db..47326b636a1 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -40,7 +40,6 @@
 (defgroup metamail nil
   "Metamail interface for Emacs."
   :group 'mail
-  :group 'hypermedia
   :group 'processes)
 
 (defcustom metamail-program-name "metamail"
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 6e468386749..ced5f21688f 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -676,6 +676,7 @@
   "Accessing remote files and directories using FTP
    made as simple and transparent as possible."
   :group 'files
+  :group 'net
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 3a5fa8c30a6..77392ded478 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -215,7 +215,8 @@
   "Use a web browser to look at a URL."
   :prefix "browse-url-"
   :link '(emacs-commentary-link "browse-url")
-  :group 'hypermedia)
+  :group 'external
+  :group 'net)
 
 ;;;###autoload
 (defcustom browse-url-browser-function
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index fd8c1061bcb..1eb322eb0d0 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -76,7 +76,7 @@
 (defgroup goto-address nil
   "Click to browse URL or to send to e-mail address."
   :group 'mouse
-  :group 'hypermedia)
+  :group 'net)
 
 
 ;; I don't expect users to want fontify'ing without highlighting.
diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el
index d36569b5c23..92dbb4fef3a 100644
--- a/lisp/net/tramp-imap.el
+++ b/lisp/net/tramp-imap.el
@@ -168,7 +168,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
 (defgroup tramp-imap nil
   "Tramp over IMAP configuration."
   :version "23.2"
-  :group 'applications)
+  :group 'tramp)
 
 (defcustom tramp-imap-subject-marker "tramp-imap-subject-marker"
   "The subject marker that Tramp-IMAP will use."
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c029f073724..09a3392856f 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -176,6 +176,7 @@
 (defgroup tramp nil
   "Edit remote files with a combination of rsh and rcp or similar programs."
   :group 'files
+  :group 'net
   :version "22.1")
 
 ;; Maybe we need once a real Tramp mode, with key bindings etc.
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 35df085bc57..fb68ded6d70 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -151,7 +151,7 @@
 (defgroup xesam nil
   "Xesam compatible interface to search engines."
   :group 'extensions
-  :group 'hypermedia
+  :group 'net
   :version "23.1")
 
 (defcustom xesam-query-type 'user-query
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8919d920c9d..5eb9840a4ca 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -45,8 +45,7 @@
 
 (defgroup nxml nil
   "New XML editing mode."
-  :group 'languages
-  :group 'wp)
+  :group 'languages)
 
 (defgroup nxml-faces nil
   "Faces for XML syntax highlighting."
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index a7602555002..b70fb150735 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+	* org.el (org): Remove from hypermedia group.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a404551f3cb..54025f4d83c 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -134,7 +134,6 @@ With prefix arg HERE, insert it at point."
   "Outline-based notes management and organizer."
   :tag "Org"
   :group 'outlines
-  :group 'hypermedia
   :group 'calendar)
 
 (defcustom org-mode-hook nil
diff --git a/lisp/outline.el b/lisp/outline.el
index b5d3d798714..5b10de231f2 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -41,7 +41,7 @@
 (defgroup outlines nil
   "Support for hierarchical outlining."
   :prefix "outline-"
-  :group 'editing)
+  :group 'wp)
 
 (defcustom outline-regexp "[*\^L]+"
   "Regular expression to match the beginning of a heading.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 0efac03f7d5..7c7397a52bc 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1497,7 +1497,7 @@ Please send all bug fixes and enhancements to
   "Support for printing and PostScript."
   :tag "PostScript"
   :version "20"
-  :group 'emacs)
+  :group 'external)
 
 (defgroup ps-print nil
   "PostScript generator for Emacs."
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 9838ade89f1..ff5c8807de5 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -49,7 +49,7 @@
 
 (defgroup reveal nil
   "Reveal hidden text on the fly."
-  :group 'editing)
+  :group 'convenience)
 
 (defcustom reveal-around-mark t
   "Reveal text around the mark, if active."
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 2673ee15457..e4ed2c8a051 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -34,7 +34,7 @@
 (defgroup picture nil
   "Picture mode --- editing using quarter-plane screen model."
   :prefix "picture-"
-  :group 'editing)
+  :group 'wp)
 
 (defcustom picture-rectangle-ctl ?+
   "*Character `picture-draw-rectangle' uses for top left corners."
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 44933bff327..3e092374207 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -640,14 +640,10 @@
 ;;;
 
 (defgroup table nil
-  "Text based table manipulation utilities.
-See `table-insert' for examples about how to use."
+  "Text based table manipulation utilities."
   :tag "Table"
   :prefix "table-"
-  :group 'editing
   :group 'wp
-  :group 'paragraphs
-  :group 'fill
   :version "22.1")
 
 (defgroup table-hooks nil
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 75897a2cf07..51040824b20 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -32,7 +32,7 @@
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill turn-on-flyspell)
-  :group 'data)
+  :group 'wp)
 
 (defvar text-mode-variant nil
   "Non-nil if this buffer's major mode is a variant of Text mode.
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index ddf15e243c4..27093042efe 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -89,7 +89,7 @@
 
 (defgroup uniquify nil
   "Unique buffer names dependent on file name."
-  :group 'applications)
+  :group 'files)
 
 
 (defcustom uniquify-buffer-name-style nil
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index ea44ea54b6b..10e94643a7b 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+	* url-vars.el (url): Put in net group.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 2062f482ede..3db54592970 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -30,7 +30,7 @@
 (defgroup url nil
   "Uniform Resource Locator tool."
   :version "22.1"
-  :group 'hypermedia)
+  :group 'net)
 
 (defgroup url-file nil
   "URL storage."
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 3573a86ad49..9e8fbf431f1 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -325,7 +325,7 @@
 (defgroup vcursor nil
   "Manipulate an alternative (\"virtual\") cursor."
   :prefix "vcursor-"
-  :group 'editing)
+  :group 'convenience)
 
 (defface vcursor
   '((((class color)) (:foreground "blue" :background "cyan" :underline t))
diff --git a/lisp/view.el b/lisp/view.el
index 219af1b6e1e..63db3452a87 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -48,8 +48,7 @@
   "Peruse file or buffer without editing."
   :link '(function-link view-mode)
   :link '(custom-manual "(emacs)Misc File Ops")
-  :group 'wp
-  :group 'editing)
+  :group 'wp)
 
 (defcustom view-highlight-face 'highlight
    "The face used for highlighting the match found by View mode search."
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 183698a28f3..79ce9a330d4 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -378,8 +378,7 @@
   "Visualize blanks (TAB, (HARD) SPACE and NEWLINE)."
   :link '(emacs-library-link :tag "Source Lisp File" "whitespace.el")
   :version "23.1"
-  :group 'wp
-  :group 'data)
+  :group 'convenience)
 
 
 (defcustom whitespace-style