(telnet-initial-filter, read-password): Don't unnecessarily duplicate comint

functionality.

diff --git a/lisp/telnet.el b/lisp/telnet.el
index 6a4a1f3..19cac0f 100644 (file)
--- a/lisp/telnet.el
+++ b/lisp/telnet.el
@@ -127,10 +127,9 @@ rejecting one login and prompting again for a username and password.")
         (error "No such host."))
        ((string-match "passw" string)
         (telnet-filter proc string)
-        (let* ((echo-keystrokes 0)
-               (password (read-password)))
-          (setq telnet-count 0)
-          (send-string proc (concat password telnet-new-line))))
+        (setq telnet-count 0)
+        (send-string proc (concat (comint-read-noecho "Password: " t)
+                                  telnet-new-line)))
        (t (telnet-check-software-type-initialize string)
           (telnet-filter proc string)
           (cond ((> telnet-count telnet-maximum-count)
@@ -228,14 +227,6 @@ Normally input is edited in Emacs and sent a line at a time."
     (telnet-mode)
     (setq telnet-count -16)))
 
-(defun read-password ()
-  (let ((answ "") tem)
-    (message "Reading password...")
-    (while (prog1 (not (memq (setq tem (read-char)) '(?\C-m ?\n ?\C-g)))
-            (setq quit-flag nil))
-      (setq answ (concat answ (char-to-string tem))))
-    answ))
-
 (provide 'telnet)
 
 ;;; telnet.el ends here