diff options
| author | Glenn Morris | 2008-06-07 02:41:06 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-06-07 02:41:06 +0000 |
| commit | 20e43520ef541793dfdde9bab112a1bb12bf33eb (patch) | |
| tree | 4f491b24d900a58b7581e73b3db94136eb943e44 | |
| parent | c2457e543be5d38c5ddbe28767cddd7781030f9c (diff) | |
| download | emacs-20e43520ef541793dfdde9bab112a1bb12bf33eb.tar.gz emacs-20e43520ef541793dfdde9bab112a1bb12bf33eb.zip | |
Remove unnecessary eval-and-compile.
| -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 @@ | |||
| 1 | ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail | 1 | ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, | 3 | ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
| 4 | ;; 2006, 2007, 2008 Free Software Foundation, Inc. | 4 | ;; 2008 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> | 6 | ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp> |
| 7 | ;; Maintainer: Simon Josefsson <simon@josefsson.org> | 7 | ;; Maintainer: Simon Josefsson <simon@josefsson.org> |
| @@ -77,9 +77,7 @@ | |||
| 77 | (autoload 'netrc-machine "netrc") | 77 | (autoload 'netrc-machine "netrc") |
| 78 | (autoload 'netrc-get "netrc") | 78 | (autoload 'netrc-get "netrc") |
| 79 | (autoload 'password-read "password-cache") | 79 | (autoload 'password-read "password-cache") |
| 80 | 80 | (autoload 'auth-source-user-or-password "auth-source") | |
| 81 | (eval-and-compile | ||
| 82 | (autoload 'auth-source-user-or-password "auth-source")) | ||
| 83 | 81 | ||
| 84 | ;;; | 82 | ;;; |
| 85 | (defgroup smtpmail nil | 83 | (defgroup smtpmail nil |
| @@ -542,9 +540,9 @@ This is relative to `smtpmail-queue-dir'." | |||
| 542 | (defun smtpmail-try-auth-methods (process supported-extensions host port) | 540 | (defun smtpmail-try-auth-methods (process supported-extensions host port) |
| 543 | (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) | 541 | (let* ((mechs (cdr-safe (assoc 'auth supported-extensions))) |
| 544 | (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) | 542 | (mech (car (smtpmail-intersection smtpmail-auth-supported mechs))) |
| 545 | (auth-user (auth-source-user-or-password | 543 | (auth-user (auth-source-user-or-password |
| 546 | "login" host (or port "smtp"))) | 544 | "login" host (or port "smtp"))) |
| 547 | (auth-pass (auth-source-user-or-password | 545 | (auth-pass (auth-source-user-or-password |
| 548 | "password" host (or port "smtp"))) | 546 | "password" host (or port "smtp"))) |
| 549 | (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-* | 547 | (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-* |
| 550 | (list host port auth-user auth-pass) | 548 | (list host port auth-user auth-pass) |