[Emacs-diffs] Changes to emacs/lisp/url/url.el [lexbind]

[Miles Bader]

Index: emacs/lisp/url/url.el
diff -c emacs/lisp/url/url.el:1.3.2.4 emacs/lisp/url/url.el:1.3.2.5
*** emacs/lisp/url/url.el:1.3.2.4       Mon Oct 25 04:19:35 2004
--- emacs/lisp/url/url.el       Mon Oct 25 04:22:24 2004
***************
*** 113,138 ****
                                     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)))
--- 113,118 ----