Implement an optional user parameter for the multi-smtp setup

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8bce975..4e4d894 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-multi-smtp-send-mail): Also allow specifying the
+       SMTP user name.
+
 2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-show-thread):

diff --git a/lisp/message.el b/lisp/message.el
index e925e8c..77b23cb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4717,7 +4717,8 @@ that instead."
        (message-send-mail-with-sendmail))
        ((equal (car method) "smtp")
        (let ((smtpmail-smtp-server (nth 1 method))
-             (smtpmail-smtp-service (nth 2 method)))
+             (smtpmail-smtp-service (nth 2 method))
+             (smtpmail-smtp-user (or (nth 3 method) smtpmail-smtp-user)))
          (message-smtpmail-send-it)))
        (t
        (error "Unknown method %s" method))))))

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 38c7580..2771ecd 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * message.texi (Mail Variables): Mention the optional user parameter
+       for X-Message-SMTP-Method.
+
 2012-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Posting Styles): Mention X-Message-SMTP-Method.

diff --git a/texi/message.texi b/texi/message.texi
index cc3cadf..5fc109c 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1656,6 +1656,14 @@ X-Message-SMTP-Method: smtp smtp.fsf.org 587
 
 This will send the message via @samp{smtp.fsf.org}, using port 587.
 
+@example
+X-Message-SMTP-Method: smtp smtp.fsf.org 587 other-user
+@end example
+
+This is the same as the above, but uses @samp{other-user} as the user
+name when authenticating.  This is handy if you have several
+@acronym{SMTP} accounts on the same server.
+
 @item sendmail
 
 @example