2 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edeafa6aa94..9d3de96d41d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-28  Markus Rost  <rost@math.ohio-state.edu>
+
+        * net/ange-ftp.el (ange-ftp-passive-host-alist) 
+        (ange-ftp-bs2000-additional-pubsets):  Fix custom type.
+
+        * files.el (small-temporary-file-directory): Fix custom type.
+
 2002-04-28  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * progmodes/f90.el (f90-xemacs-flag): New variable.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 7e4daa2c735..3e12c7ee647 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1009,9 +1009,9 @@ HOSTNAME is a regular expression to match the FTP server host name(s).
 SETTING is \"on\" to turn passive mode on, \"off\" to turn it off,
 or nil meaning don't change it."
   :group 'ange-ftp
-  :type '(list (cons regex (choice (const :tag "On" "on")
-                                   (const :tag "Off" "off")
-                                   (const :tag "Don't change" nil))))
+  :type '(repeat (cons regexp (choice (const :tag "On" "on")
+                                      (const :tag "Off" "off")
+                                      (const :tag "Don't change" nil))))
   :version 21.3)
 
 ;;;; ------------------------------------------------------------
@@ -6111,7 +6111,7 @@ Other orders of $ and _ seem to all work just fine.")
   nil
   "*List of additional pubsets available to all users."
   :group 'ange-ftp
-  :type 'string)
+  :type '(repeat string))
 
 ;; These parsing functions are as general as possible because the syntax
 ;; of ftp listings from BS2000 hosts is a bit erratic. What saves us is that