From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 16 Oct 2004 15:02:46 +0000 (+0000)
Subject: (url-do-setup): Don't set url-passwd-entry-func.
X-Git-Tag: ttn-vms-21-2-B4~4554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8127ed7ac372f070c09f2058c329ecc351d4a7e5;p=emacs.git

(url-do-setup): Don't set url-passwd-entry-func.
---

diff --git a/lisp/url/url.el b/lisp/url/url.el
index f7b1b717681..75ddfdc3a2f 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -113,26 +113,6 @@ Emacs."
 				     noproxy "") "\\)"))
 		      url-proxy-services))))
 
-    ;; Set the password entry funtion based on user defaults or guess
-    ;; based on which remote-file-access package they are using.
-    (cond
-     (url-passwd-entry-func nil)	; Already been set
-     ((fboundp 'read-passwd)		; Use secure password if available
-      (setq url-passwd-entry-func 'read-passwd))
-     ((or (featurep 'efs)		; Using EFS
-	  (featurep 'efs-auto))		; or autoloading efs
-      (if (not (fboundp 'read-passwd))
-	  (autoload 'read-passwd "passwd" "Read in a password" nil))
-      (setq url-passwd-entry-func 'read-passwd))
-     ((or (featurep 'ange-ftp)		; Using ange-ftp
-	  (and (boundp 'file-name-handler-alist)
-	       (not (featurep 'xemacs)))) ; ??
-      (setq url-passwd-entry-func 'ange-ftp-read-passwd))
-     (t
-      (url-warn
-       'security
-       "(url-setup): Can't determine how to read passwords, winging it.")))
-  
     (url-setup-privacy-info)
     (run-hooks 'url-load-hook)
     (setq url-setup-done t)))