diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-06-07 02:34:01 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-06-07 02:34:01 +0000 |
| commit | 8705576eab3b61c6521a773de35434add31b3927 (patch) | |
| tree | c9524da92808930fedf27f3248a6cd04bbbcd432 /lisp/url/url-auth.el | |
| parent | 408b8ab461dfde69178709940832ba0ce5f86ab6 (diff) | |
| download | emacs-8705576eab3b61c6521a773de35434add31b3927.tar.gz | |
(auth-source-user-or-password): Remove unnecessary eval-and-compile.
Diffstat (limited to 'lisp/url/url-auth.el')
| -rw-r--r-- | lisp/url/url-auth.el | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index 91a3a49d2e5..ebd5c54ce14 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -1,7 +1,7 @@ ;;; url-auth.el --- Uniform Resource Locator authorization modules -;; Copyright (C) 1996, 1997, 1998, 1999, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -25,9 +25,7 @@ (require 'url-vars) (require 'url-parse) (autoload 'url-warn "url") - -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source")) +(autoload 'auth-source-user-or-password "auth-source") (defsubst url-auth-user-prompt (url realm) "String to usefully prompt for a username." @@ -83,11 +81,11 @@ instead of the filename inheritance method." (symbol-value url-basic-auth-storage)))) (cond ((and prompt (not byserv)) - (setq user (or + (setq user (or (auth-source-user-or-password "login" server type) (read-string (url-auth-user-prompt url realm) (or user (user-real-login-name)))) - pass (or + pass (or (auth-source-user-or-password "password" server type) (read-passwd "Password: " nil (or pass "")))) (set url-basic-auth-storage @@ -111,11 +109,11 @@ instead of the filename inheritance method." (setq byserv (cdr byserv)))) (if (or (and (not retval) prompt) overwrite) (progn - (setq user (or + (setq user (or (auth-source-user-or-password "login" server type) (read-string (url-auth-user-prompt url realm) (user-real-login-name))) - pass (or + pass (or (auth-source-user-or-password "password" server type) (read-passwd "Password: ")) retval (base64-encode-string (format "%s:%s" user pass)) @@ -205,11 +203,11 @@ instead of hostname:portnum." (setq byserv (cdr byserv)))) (if overwrite (if (and (not retval) prompt) - (setq user (or + (setq user (or (auth-source-user-or-password "login" server type) (read-string (url-auth-user-prompt url realm) (user-real-login-name))) - pass (or + pass (or (auth-source-user-or-password "password" server type) (read-passwd "Password: ")) retval (setq retval |