Merge from origin/emacs-25

[gnu-emacs] / lisp / erc / erc-networks.el

diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index c859a48a79a69f8411b6af65a1b67c2f35e776ec..f911d6438be0bcf315cfe91ce84f4c00f1a8f940 100644 (file)
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -443,7 +443,15 @@ NET is a symbol indicating to which network from `erc-networks-alist' this
 HOST is the servers hostname and
 PORTS is either a number, a list of numbers, or a list of port ranges."
   :group 'erc-networks
-  :type 'sexp)
+  :type '(alist :key-type (string :tag "Name")
+               :value-type
+               (group symbol (string :tag "Hostname")
+                      (choice :tag "Ports"
+                              (integer :tag "Port number")
+                              (repeat :tag "List of ports or ranges"
+                                      (choice (integer :tag "Port number")
+                                              (list :tag "Port range"
+                                                    integer integer)))))))
 
 (defcustom erc-networks-alist
   '((4-irc "4-irc.com")