# HG changeset patch
# User Simon Josefsson <jas@extundo.com>
# Date 1236097697 0
# Node ID b83a02b58e7f3dfd71a55143b215d72e2b0bf5fd
# Parent  36437490ed93965ceda3290442b53e9b2e4208c6
(smtpmail-auth-supported): Mention that list is
in preference order.
(smtpmail-try-auth-methods): Improve which authentication
mechanism to use, so that the locally most preferred and mutually
supported mechanism is used.

diff -r 36437490ed93 -r b83a02b58e7f lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Mar 03 16:12:02 2009 +0000
+++ b/lisp/ChangeLog	Tue Mar 03 16:28:17 2009 +0000
@@ -1,3 +1,11 @@
+2009-03-03  Simon Josefsson  <simon@josefsson.org>
+
+	* mail/smtpmail.el (smtpmail-auth-supported): Mention that list is
+	in preference order.
+	(smtpmail-try-auth-methods): Improve which authentication
+	mechanism to use, so that the locally most preferred and mutually
+	supported mechanism is used.
+
 2009-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/lisp.el (end-of-defun-function): Make it more clear that
diff -r 36437490ed93 -r b83a02b58e7f lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Tue Mar 03 16:12:02 2009 +0000
+++ b/lisp/mail/smtpmail.el	Tue Mar 03 16:28:17 2009 +0000
@@ -218,7 +218,8 @@
 (defvar smtpmail-read-point)
 
 (defconst smtpmail-auth-supported '(cram-md5 plain login)
-  "List of supported SMTP AUTH mechanisms.")
+  "List of supported SMTP AUTH mechanisms.
+The list is in preference order.")
 
 (defvar smtpmail-mail-address nil
   "Value to use for envelope-from address for mail from ambient buffer.")
@@ -534,7 +535,7 @@
 
 (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)))
+	 (mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
 	 (auth-user (auth-source-user-or-password
 		     "login" host (or port "smtp")))
 	 (auth-pass (auth-source-user-or-password