summaryrefslogtreecommitdiff
path: root/lisp/ange-ftp.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-10-20 20:03:30 +0000
committerRichard M. Stallman <rms@gnu.org>1994-10-20 20:03:30 +0000
commite6a242e623fa5d42004ae033c7008e79cebf80cd (patch)
treeb5835c1e1a28b9d9c9bdf58b3e6d44fa3b6bcf34 /lisp/ange-ftp.el
parentc05c27b992cbdc1985944e6f01b4f61b2b3b3979 (diff)
downloademacs-e6a242e623fa5d42004ae033c7008e79cebf80cd.tar.gz
(ange-ftp-get-passwd): Use user-mail-address.
(ange-ftp-generate-anonymous-password): Doc fix.
Diffstat (limited to 'lisp/ange-ftp.el')
-rw-r--r--lisp/ange-ftp.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index e9d079a5f76..ecb56f2072f 100644
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -699,9 +699,9 @@ If non-nil but not a string, the user is prompted for the name.")
"*Account password to use when the user is the same as ange-ftp-default-user.")
(defvar ange-ftp-generate-anonymous-password t
- "*If t, use a password of user@host when logging in as the anonymous user.
-If a string then use that as the password.
-If nil then prompt the user for a password.")
+ "*If t, use value of `user-mail-address' as password for anonymous ftp.
+If a string, then use that string as the password.
+If nil, prompt the user for a password.")
(defvar ange-ftp-dumb-unix-host-regexp nil
"*If non-nil, regexp matching hosts on which `dir' command lists directory.")
@@ -860,7 +860,7 @@ SIZE, if supplied, should be a prime number."
;;;; Internal variables.
;;;; ------------------------------------------------------------
-(defconst ange-ftp-version "$Revision: 1.56 $")
+(defconst ange-ftp-version "$Revision: 1.57 $")
(defvar ange-ftp-data-buffer-name " *ftp data*"
"Buffer name to hold directory listing data received from ftp process.")
@@ -1081,7 +1081,7 @@ Optional DEFAULT is password to start with."
ange-ftp-generate-anonymous-password)
(if (stringp ange-ftp-generate-anonymous-password)
ange-ftp-generate-anonymous-password
- (concat (user-login-name) "@" (system-name))))
+ user-mail-address))
;; see if same user has logged in to other hosts; if so then prompt
;; with the password that was used there.