# HG changeset patch
# User Eli Zaretskii <eliz@is.elta.co.il>
# Date 1072704026 0
# Node ID 29c86aab2fa27d3f41a79a22ed34068a8fb3a557
# Parent  0ff1e2f3d2a95f673a61a30e063fff43044d900f
(ange-ftp-name-format): Allow USER to contain
"@", as required by some ISP hosting service.  Fix defcustom
argument syntax errors that prevented use of customization.

diff -r 0ff1e2f3d2a9 -r 29c86aab2fa2 lisp/net/ange-ftp.el
--- a/lisp/net/ange-ftp.el	Mon Dec 29 13:09:14 2003 +0000
+++ b/lisp/net/ange-ftp.el	Mon Dec 29 13:20:26 2003 +0000
@@ -686,7 +686,7 @@
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
-  '("^/\\(\\([^@/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
+  '("^/\\(\\([^/:]*\\)@\\)?\\([^@/:]*[^@/:.]\\):\\(.*\\)" . (3 2 4))
   "*Format of a fully expanded remote file name.
 
 This is a list of the form \(REGEXP HOST USER NAME\),
@@ -694,7 +694,7 @@
 the full remote name, and HOST, USER, and NAME are the numbers of
 parenthesized expressions in REGEXP for the components (in that order)."
   :group 'ange-ftp
-  :type '(list regexp
+  :type '(list (regexp  :tag "Name regexp")
 	       (integer :tag "Host group")
 	       (integer :tag "User group")
 	       (integer :tag "Name group")))