aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-04-29 03:58:31 +0000
committerRichard M. Stallman2002-04-29 03:58:31 +0000
commit33ceea4f0e295fe3c831a2e36728e9976ce3ce1b (patch)
tree316aed0f369089df3cc2b28f3b61296be888ad00
parentbab6eadbfb51a79bf8a32b5f6eae8b3330f3216a (diff)
downloademacs-33ceea4f0e295fe3c831a2e36728e9976ce3ce1b.tar.gz
emacs-33ceea4f0e295fe3c831a2e36728e9976ce3ce1b.zip
(ange-ftp-passive-host-alist)
(ange-ftp-bs2000-additional-pubsets): Fix custom type.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/net/ange-ftp.el8
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 @@
12002-04-28 Markus Rost <rost@math.ohio-state.edu>
2
3 * net/ange-ftp.el (ange-ftp-passive-host-alist)
4 (ange-ftp-bs2000-additional-pubsets): Fix custom type.
5
6 * files.el (small-temporary-file-directory): Fix custom type.
7
12002-04-28 Glenn Morris <gmorris@ast.cam.ac.uk> 82002-04-28 Glenn Morris <gmorris@ast.cam.ac.uk>
2 9
3 * progmodes/f90.el (f90-xemacs-flag): New variable. 10 * 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).
1009SETTING is \"on\" to turn passive mode on, \"off\" to turn it off, 1009SETTING is \"on\" to turn passive mode on, \"off\" to turn it off,
1010or nil meaning don't change it." 1010or nil meaning don't change it."
1011 :group 'ange-ftp 1011 :group 'ange-ftp
1012 :type '(list (cons regex (choice (const :tag "On" "on") 1012 :type '(repeat (cons regexp (choice (const :tag "On" "on")
1013 (const :tag "Off" "off") 1013 (const :tag "Off" "off")
1014 (const :tag "Don't change" nil)))) 1014 (const :tag "Don't change" nil))))
1015 :version 21.3) 1015 :version 21.3)
1016 1016
1017;;;; ------------------------------------------------------------ 1017;;;; ------------------------------------------------------------
@@ -6111,7 +6111,7 @@ Other orders of $ and _ seem to all work just fine.")
6111 nil 6111 nil
6112 "*List of additional pubsets available to all users." 6112 "*List of additional pubsets available to all users."
6113 :group 'ange-ftp 6113 :group 'ange-ftp
6114 :type 'string) 6114 :type '(repeat string))
6115 6115
6116;; These parsing functions are as general as possible because the syntax 6116;; These parsing functions are as general as possible because the syntax
6117;; of ftp listings from BS2000 hosts is a bit erratic. What saves us is that 6117;; of ftp listings from BS2000 hosts is a bit erratic. What saves us is that