From 26f4b8abb8c80011cf80dad9f6906e954727cd80 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 12 Mar 2010 14:13:38 -0500
Subject: [PATCH] Fix last change to use existing comm Custom group instead of
 `net'.

* cus-edit.el (net): Remove group.
(comm): Promote to top-level group.

* url/url-vars.el (url):
* 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 comm group.
---
 lisp/ChangeLog         |  4 ++--
 lisp/cus-edit.el       | 10 +++-------
 lisp/net/ange-ftp.el   |  2 +-
 lisp/net/browse-url.el |  2 +-
 lisp/net/goto-addr.el  |  2 +-
 lisp/net/tramp.el      |  2 +-
 lisp/net/xesam.el      |  2 +-
 lisp/url/ChangeLog     |  2 +-
 lisp/url/url-vars.el   |  2 +-
 9 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ea3fcfbc8f..c46604ee4b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,13 +2,13 @@
 
 	* cus-edit.el (processes): Remove from development group.
 	(oop, hypermedia): Delete group.
-	(net): New group.
+	(comm): Promote to top-level 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.
+	* net/ange-ftp.el (ange-ftp): Put in comm group.
 
 	* view.el (view): Remove from editing group.
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 47e0e0bdccd..2df9f7c955e 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -192,8 +192,9 @@
   "Interfacing to external utilities."
   :group 'emacs)
 
-(defgroup net nil
-  "Networking support."
+(defgroup comm nil
+  "Communications, networking, and remote access to files."
+  :tag "Communication"
   :group 'emacs)
 
 (defgroup processes nil
@@ -274,11 +275,6 @@
   "Fitting Emacs with its environment."
   :group 'emacs)
 
-(defgroup comm nil
-  "Communications, networking, remote access to files."
-  :tag "Communication"
-  :group 'environment)
-
 (defgroup hardware nil
   "Support for interfacing with miscellaneous hardware."
   :group 'environment)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index ced5f21688f..336ffdadd09 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -676,7 +676,7 @@
   "Accessing remote files and directories using FTP
    made as simple and transparent as possible."
   :group 'files
-  :group 'net
+  :group 'comm
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 77392ded478..261b765eaeb 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -216,7 +216,7 @@
   :prefix "browse-url-"
   :link '(emacs-commentary-link "browse-url")
   :group 'external
-  :group 'net)
+  :group 'comm)
 
 ;;;###autoload
 (defcustom browse-url-browser-function
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 1eb322eb0d0..182758aaffb 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 'net)
+  :group 'comm)
 
 
 ;; I don't expect users to want fontify'ing without highlighting.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 09a3392856f..8a3ec552d4d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -176,7 +176,7 @@
 (defgroup tramp nil
   "Edit remote files with a combination of rsh and rcp or similar programs."
   :group 'files
-  :group 'net
+  :group 'comm
   :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 fb68ded6d70..03c188006d0 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 'net
+  :group 'comm
   :version "23.1")
 
 (defcustom xesam-query-type 'user-query
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 10e94643a7b..7309402a848 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,6 +1,6 @@
 2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
 
-	* url-vars.el (url): Put in net group.
+	* url-vars.el (url): Put in comm group.
 
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 3db54592970..1b9fd7b76cc 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 'net)
+  :group 'comm)
 
 (defgroup url-file nil
   "URL storage."
-- 
2.11.4.GIT