Commit 4cf1b2e5 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(ange-ftp-read-passwd): Let first input override

default, and let RET use the default value.
(ange-ftp-get-passwd): Make prompt clearer.
parent e0e0205b
...@@ -1008,7 +1008,7 @@ only return the directory part of FILE." ...@@ -1008,7 +1008,7 @@ only return the directory part of FILE."
"Read a password, echoing `.' for each character typed. "Read a password, echoing `.' for each character typed.
End with RET, LFD, or ESC. DEL or C-h rubs out. C-u kills line. End with RET, LFD, or ESC. DEL or C-h rubs out. C-u kills line.
Optional DEFAULT is password to start with." Optional DEFAULT is password to start with."
(let ((pass (if default default "")) (let ((pass nil)
(c 0) (c 0)
(echo-keystrokes 0) (echo-keystrokes 0)
(cursor-in-echo-area t)) (cursor-in-echo-area t))
...@@ -1025,7 +1025,7 @@ Optional DEFAULT is password to start with." ...@@ -1025,7 +1025,7 @@ Optional DEFAULT is password to start with."
(setq pass (substring pass 0 -1)))))) (setq pass (substring pass 0 -1))))))
(message "") (message "")
(ange-ftp-repaint-minibuffer) (ange-ftp-repaint-minibuffer)
pass)) (or pass default "")))
(defmacro ange-ftp-generate-passwd-key (host user) (defmacro ange-ftp-generate-passwd-key (host user)
(` (concat (, host) "/" (, user)))) (` (concat (, host) "/" (, user))))
...@@ -1102,7 +1102,7 @@ Optional DEFAULT is password to start with." ...@@ -1102,7 +1102,7 @@ Optional DEFAULT is password to start with."
;; found another machine with the same user. ;; found another machine with the same user.
;; Try that account. ;; Try that account.
(ange-ftp-read-passwd (ange-ftp-read-passwd
(format "passwd for %s@%s (same as %s@%s): " (format "passwd for %s@%s (default same as %s@%s): "
user host user other) user host user other)
(ange-ftp-lookup-passwd other user)) (ange-ftp-lookup-passwd other user))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment