2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fbc051c4573..7487e4b4376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-29  Michael R. Wolf  <MichaelRWolf@att.net>  (tiny change)
+
+        * net/ange-ftp.el (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.
+
 2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
 
         * xml.el (xml-get-attribute-or-nil): Doc fix.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index b96e7f1a298..dc3b5a62da9 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -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 @@ where REGEXP is a regular expression matching
 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")))