diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-06-07 02:41:06 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-06-07 02:41:06 +0000 |
| commit | 20e43520ef541793dfdde9bab112a1bb12bf33eb (patch) | |
| tree | 4f491b24d900a58b7581e73b3db94136eb943e44 /lisp/mail/smtpmail.el | |
| parent | c2457e543be5d38c5ddbe28767cddd7781030f9c (diff) | |
| download | emacs-20e43520ef541793dfdde9bab112a1bb12bf33eb.tar.gz | |
Remove unnecessary eval-and-compile.
Diffstat (limited to 'lisp/mail/smtpmail.el')
| -rw-r--r-- | lisp/mail/smtpmail.el | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 3a5e8528c5f..debb85dd52c 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -1,7 +1,7 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail -;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> ;; Maintainer: Simon Josefsson <simon@josefsson.org> @@ -77,9 +77,7 @@ (autoload 'netrc-machine "netrc") (autoload 'netrc-get "netrc") (autoload 'password-read "password-cache") - -(eval-and-compile - (autoload 'auth-source-user-or-password "auth-source")) +(autoload 'auth-source-user-or-password "auth-source") ;;; (defgroup smtpmail nil @@ -542,9 +540,9 @@ This is relative to `smtpmail-queue-dir'." (defun smtpmail-try-auth-methods (process supported-extensions host port) (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) - (auth-user (auth-source-user-or-password + (auth-user (auth-source-user-or-password "login" host (or port "smtp"))) - (auth-pass (auth-source-user-or-password + (auth-pass (auth-source-user-or-password "password" host (or port "smtp"))) (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-* (list host port auth-user auth-pass) |